From 253c2fc0c3541a5b5f4a0cd97f2b169351b1a59b Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Sun, 28 Jun 2020 19:22:59 +0200 Subject: [PATCH 01/24] Create Package.swift --- Package.swift | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 Package.swift diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..c50f7eb --- /dev/null +++ b/Package.swift @@ -0,0 +1,29 @@ + +// swift-tools-version:5.1 +import PackageDescription + +let package = Package( + name: "RxVision", + platforms: [ + .macOS(.v10_10), .iOS(.v8), .tvOS(.v9), .watchOS(.v3) + ], + products: [ + .library( + name: "RxVision", + targets: ["RxVision"]), + ], + dependencies: [ + .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0") + ], + targets: [ + .target( + name: "RxVision", + dependencies: ["RxSwift"], // "RxRelay"], + path: "Sources"), +// .testTarget( +// name: "RxVisionTests", +// dependencies: ["RxVision"], +// path: "Tests" +// ) + ] +) From 4d443ad969f50fd31c5b406962a9e17643a4451e Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Sun, 28 Jun 2020 19:31:55 +0200 Subject: [PATCH 02/24] Update Package.swift --- Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index c50f7eb..53560d7 100644 --- a/Package.swift +++ b/Package.swift @@ -1,11 +1,11 @@ - // swift-tools-version:5.1 + import PackageDescription let package = Package( name: "RxVision", platforms: [ - .macOS(.v10_10), .iOS(.v8), .tvOS(.v9), .watchOS(.v3) + .macOS(.v10_10), .iOS(.v8), // .tvOS(.v9), .watchOS(.v3) ], products: [ .library( From da1cad13a0a1b0bd2db426dd74e8c38b9be3944e Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Sun, 28 Jun 2020 19:33:55 +0200 Subject: [PATCH 03/24] Update Package.swift --- Package.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 53560d7..8fd2218 100644 --- a/Package.swift +++ b/Package.swift @@ -19,7 +19,8 @@ let package = Package( .target( name: "RxVision", dependencies: ["RxSwift"], // "RxRelay"], - path: "Sources"), +// path: "Sources" + ), // .testTarget( // name: "RxVisionTests", // dependencies: ["RxVision"], From 1a128d8ae2cde9d4b489ad563b0b6f755d5a72de Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Sun, 28 Jun 2020 19:35:39 +0200 Subject: [PATCH 04/24] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 8fd2218..9c179de 100644 --- a/Package.swift +++ b/Package.swift @@ -18,7 +18,7 @@ let package = Package( targets: [ .target( name: "RxVision", - dependencies: ["RxSwift"], // "RxRelay"], + dependencies: ["RxSwift"] //, "RxRelay"], // path: "Sources" ), // .testTarget( From 44fcf2fc9249b81f7320dbe0015d64bdb8b0fdd9 Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Sun, 28 Jun 2020 19:37:15 +0200 Subject: [PATCH 05/24] Update Package.swift --- Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 9c179de..30df20d 100644 --- a/Package.swift +++ b/Package.swift @@ -18,8 +18,8 @@ let package = Package( targets: [ .target( name: "RxVision", - dependencies: ["RxSwift"] //, "RxRelay"], -// path: "Sources" + dependencies: ["RxSwift"], // "RxRelay"], + path: "." // Sources ), // .testTarget( // name: "RxVisionTests", From 9b3e85b2af2bec8d201efb60e4000c5a8386b192 Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:23:49 +0200 Subject: [PATCH 06/24] Update VNSequenceRequestHandler+Rx.swift --- Vision/VNSequenceRequestHandler+Rx.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Vision/VNSequenceRequestHandler+Rx.swift b/Vision/VNSequenceRequestHandler+Rx.swift index 5dfcde0..1afc9cb 100644 --- a/Vision/VNSequenceRequestHandler+Rx.swift +++ b/Vision/VNSequenceRequestHandler+Rx.swift @@ -8,7 +8,9 @@ import Vision import RxSwift +import CoreImage +@available(iOS 11.0, *) extension Reactive where Base: VNSequenceRequestHandler { // MARK: - CGImage From 47167340afe008ec65431d7c8b225d4e8ea7fcf1 Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:24:34 +0200 Subject: [PATCH 07/24] Update RxVNDetectBarcodesRequest.swift --- Detect/RxVNDetectBarcodesRequest.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Detect/RxVNDetectBarcodesRequest.swift b/Detect/RxVNDetectBarcodesRequest.swift index 2ade640..fd68630 100644 --- a/Detect/RxVNDetectBarcodesRequest.swift +++ b/Detect/RxVNDetectBarcodesRequest.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) public final class RxVNDetectBarcodesRequest: RxVNRequest { public init(symbologies: [VNBarcodeSymbology]) { From f6378218740831fccc421cc6e3dce9374bdb7355 Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:24:54 +0200 Subject: [PATCH 08/24] Update RxVNDetectFaceLandmarksRequest.swift --- Detect/RxVNDetectFaceLandmarksRequest.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Detect/RxVNDetectFaceLandmarksRequest.swift b/Detect/RxVNDetectFaceLandmarksRequest.swift index f3ef63c..efcc6ce 100644 --- a/Detect/RxVNDetectFaceLandmarksRequest.swift +++ b/Detect/RxVNDetectFaceLandmarksRequest.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) public final class RxVNDetectFaceLandmarksRequest: RxVNRequest { public init() { From 203703642db1c6151c3af128bf58476251e08cbc Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:25:13 +0200 Subject: [PATCH 09/24] Update VNDetectTextRectanglesRequest+Rx.swift --- Detect/VNDetectTextRectanglesRequest+Rx.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Detect/VNDetectTextRectanglesRequest+Rx.swift b/Detect/VNDetectTextRectanglesRequest+Rx.swift index cd6941a..50f609e 100644 --- a/Detect/VNDetectTextRectanglesRequest+Rx.swift +++ b/Detect/VNDetectTextRectanglesRequest+Rx.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) extension Reactive where Base: VNDetectTextRectanglesRequest { public static func request(reportCharacterBoxes: Bool) -> RxVNDetectTextRectanglesRequest { From afaf7e333eb9e6474b88ceec59a00ceaccb48e62 Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:26:04 +0200 Subject: [PATCH 10/24] Update RxVNTrackObjectRequest.swift --- Track/RxVNTrackObjectRequest.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Track/RxVNTrackObjectRequest.swift b/Track/RxVNTrackObjectRequest.swift index 746e3bb..5800a48 100644 --- a/Track/RxVNTrackObjectRequest.swift +++ b/Track/RxVNTrackObjectRequest.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) public final class RxVNTrackObjectRequest: RxVNRequest { public init(detectedObjectObservation observation: VNDetectedObjectObservation) { From 5649b140815e634daf11cdff3066d6c7bbe7b131 Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:26:22 +0200 Subject: [PATCH 11/24] Update VNTrackRectangleRequest+Rx.swift --- Track/VNTrackRectangleRequest+Rx.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Track/VNTrackRectangleRequest+Rx.swift b/Track/VNTrackRectangleRequest+Rx.swift index bce127a..5624abd 100644 --- a/Track/VNTrackRectangleRequest+Rx.swift +++ b/Track/VNTrackRectangleRequest+Rx.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) extension Reactive where Base: VNTrackRectangleRequest { public static func request(rectangleObservation observation: VNRectangleObservation) -> RxVNTrackRectangleRequest { From 9ffda89e012322f5b764e9c9ee026819cdcd6f0a Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:27:14 +0200 Subject: [PATCH 12/24] Update RxVNCoreMLRequest.swift --- Vision/RxVNCoreMLRequest.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Vision/RxVNCoreMLRequest.swift b/Vision/RxVNCoreMLRequest.swift index 4517dd4..3fa35cc 100644 --- a/Vision/RxVNCoreMLRequest.swift +++ b/Vision/RxVNCoreMLRequest.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) public final class RxVNCoreMLRequest: RxVNRequest { public init(model: VNCoreMLModel, imageCropAndScaleOption: VNImageCropAndScaleOption) { From 6b8c461b203ac6b438f2a9c0fe0829a4b2964ed2 Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:27:31 +0200 Subject: [PATCH 13/24] Update VNCoreMLRequest+Rx.swift --- Vision/VNCoreMLRequest+Rx.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Vision/VNCoreMLRequest+Rx.swift b/Vision/VNCoreMLRequest+Rx.swift index 8ad6517..e2b54e4 100644 --- a/Vision/VNCoreMLRequest+Rx.swift +++ b/Vision/VNCoreMLRequest+Rx.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) extension Reactive where Base: VNCoreMLRequest { public static func request(model: VNCoreMLModel, imageCropAndScaleOption: VNImageCropAndScaleOption) -> RxVNCoreMLRequest { From 8b636c5a46e77a7fcb032bb8ccf868c765077ce5 Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:29:42 +0200 Subject: [PATCH 14/24] Update RxVNRequestCompletionHandler.swift --- Vision/RxVNRequestCompletionHandler.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Vision/RxVNRequestCompletionHandler.swift b/Vision/RxVNRequestCompletionHandler.swift index 762e0de..562dd61 100644 --- a/Vision/RxVNRequestCompletionHandler.swift +++ b/Vision/RxVNRequestCompletionHandler.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) final class RxVNRequestCompletionHandler { typealias Observer = AnyObserver<_RequestCompletion> From 16df7a286810a191c9ee4748cd2efc570a9fc97a Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:29:57 +0200 Subject: [PATCH 15/24] Update VNImageRequestHandler+Rx.swift --- Vision/VNImageRequestHandler+Rx.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Vision/VNImageRequestHandler+Rx.swift b/Vision/VNImageRequestHandler+Rx.swift index 3fd909a..2d2f472 100644 --- a/Vision/VNImageRequestHandler+Rx.swift +++ b/Vision/VNImageRequestHandler+Rx.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) extension Reactive where Base: VNImageRequestHandler { public func perform(_ requests: [RxVNRequest], on value: T) throws { From c4423e87545e40c9aa8bc30848ad75d96de5bbc6 Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:30:15 +0200 Subject: [PATCH 16/24] Update RxVNRequest.swift --- Vision/RxVNRequest.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Vision/RxVNRequest.swift b/Vision/RxVNRequest.swift index 5e85c0d..f2480d0 100644 --- a/Vision/RxVNRequest.swift +++ b/Vision/RxVNRequest.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) public class RxVNRequest { private let valueSubject: PublishSubject = PublishSubject() From e3de38e9ba06bf11125859b0ebe3476cc31c8e74 Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:31:07 +0200 Subject: [PATCH 17/24] Update RequestCompletion.swift --- Vision/RequestCompletion.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Vision/RequestCompletion.swift b/Vision/RequestCompletion.swift index 0da01bc..39ff2c2 100644 --- a/Vision/RequestCompletion.swift +++ b/Vision/RequestCompletion.swift @@ -8,7 +8,9 @@ import Vision +@available(iOS 11.0, *) typealias _RequestCompletion = (request: VNRequest, error: Error?) +@available(iOS 11.0, *) public typealias RequestCompletion = (value: T?, request: VNRequest, error: Error?) From 8ad1dc2cff347471ad4c05ea3f18f38dd6a5dfe7 Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:31:39 +0200 Subject: [PATCH 18/24] Update VNTrackObjectRequest+Rx.swift --- Track/VNTrackObjectRequest+Rx.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Track/VNTrackObjectRequest+Rx.swift b/Track/VNTrackObjectRequest+Rx.swift index e908874..5700947 100644 --- a/Track/VNTrackObjectRequest+Rx.swift +++ b/Track/VNTrackObjectRequest+Rx.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) extension Reactive where Base: VNTrackObjectRequest { public static func request(detectedObjectObservation observation: VNDetectedObjectObservation) -> RxVNTrackObjectRequest { From f40e88e511fbc866f492d566c47e5e5be8523bfa Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:33:41 +0200 Subject: [PATCH 19/24] Update VNDetectBarcodesRequest+Rx.swift --- Detect/VNDetectBarcodesRequest+Rx.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Detect/VNDetectBarcodesRequest+Rx.swift b/Detect/VNDetectBarcodesRequest+Rx.swift index d0f1024..fb64e51 100644 --- a/Detect/VNDetectBarcodesRequest+Rx.swift +++ b/Detect/VNDetectBarcodesRequest+Rx.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) extension Reactive where Base: VNDetectBarcodesRequest { public static func request(symbologies: [VNBarcodeSymbology]) -> RxVNDetectBarcodesRequest { From 0f2dbdf99f953c30a98aacebb190edf88c927f48 Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:34:17 +0200 Subject: [PATCH 20/24] Update VNDetectFaceLandmarksRequest+Rx.swift --- Detect/VNDetectFaceLandmarksRequest+Rx.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Detect/VNDetectFaceLandmarksRequest+Rx.swift b/Detect/VNDetectFaceLandmarksRequest+Rx.swift index 3930acf..29e194d 100644 --- a/Detect/VNDetectFaceLandmarksRequest+Rx.swift +++ b/Detect/VNDetectFaceLandmarksRequest+Rx.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) extension Reactive where Base: VNDetectFaceLandmarksRequest { public static func request() -> RxVNDetectFaceLandmarksRequest { From 8858c34b62a8321b9bcb316993ef2652bd433485 Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:34:50 +0200 Subject: [PATCH 21/24] Update VNDetectRectanglesRequest+Rx.swift --- Detect/VNDetectRectanglesRequest+Rx.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Detect/VNDetectRectanglesRequest+Rx.swift b/Detect/VNDetectRectanglesRequest+Rx.swift index bc8a98c..e0045de 100644 --- a/Detect/VNDetectRectanglesRequest+Rx.swift +++ b/Detect/VNDetectRectanglesRequest+Rx.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) extension Reactive where Base: VNDetectRectanglesRequest { public static func request() -> RxVNDetectRectanglesRequest { From 21a6703784fd210d29acbb8fef007f02bd13e729 Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:36:11 +0200 Subject: [PATCH 22/24] Update RxVNDetectRectanglesRequest.swift --- Detect/RxVNDetectRectanglesRequest.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Detect/RxVNDetectRectanglesRequest.swift b/Detect/RxVNDetectRectanglesRequest.swift index 289a98b..a4fc523 100644 --- a/Detect/RxVNDetectRectanglesRequest.swift +++ b/Detect/RxVNDetectRectanglesRequest.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) public final class RxVNDetectRectanglesRequest: RxVNRequest { public init() { From e946ebf166647d320eb69d57a4faece7cd64d22b Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:36:37 +0200 Subject: [PATCH 23/24] Update RxVNDetectTextRectanglesRequest.swift --- Detect/RxVNDetectTextRectanglesRequest.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Detect/RxVNDetectTextRectanglesRequest.swift b/Detect/RxVNDetectTextRectanglesRequest.swift index 987e7b8..eb06d5c 100644 --- a/Detect/RxVNDetectTextRectanglesRequest.swift +++ b/Detect/RxVNDetectTextRectanglesRequest.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) public final class RxVNDetectTextRectanglesRequest: RxVNRequest { public init(reportCharacterBoxes: Bool) { From 5aa03c7f5c929465a19b5519443efbd70ccbda1f Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Wed, 1 Jul 2020 06:36:57 +0200 Subject: [PATCH 24/24] Update RxVNTrackRectangleRequest.swift --- Track/RxVNTrackRectangleRequest.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Track/RxVNTrackRectangleRequest.swift b/Track/RxVNTrackRectangleRequest.swift index d875c2d..77b6bec 100644 --- a/Track/RxVNTrackRectangleRequest.swift +++ b/Track/RxVNTrackRectangleRequest.swift @@ -9,6 +9,7 @@ import Vision import RxSwift +@available(iOS 11.0, *) public final class RxVNTrackRectangleRequest: RxVNRequest { public init(rectangleObservation observation: VNRectangleObservation) {