Merge pull request #125 from what3words/app/staging

App/staging to main

Author: khaidow3w

Package.swift

@@ -7,7 +7,7 @@ let package = Package(
     name: "w3w-swift-components-ocr",
     defaultLocalization: "en",
     platforms: [
-      .macOS(.v10_13), .iOS(.v12), .tvOS(.v11), .watchOS(.v4)
+      .macOS(.v10_13), .iOS(.v13), .tvOS(.v13), .watchOS(.v6)
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
@@ -17,17 +17,25 @@ let package = Package(
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-      .package(url: "https://github.com/what3words/w3w-swift-wrapper.git", "4.0.0"..<"5.0.0"),
-      .package(url: "https://github.com/what3words/w3w-swift-design.git", "1.0.0" ..< "2.0.0")
+      //.package(url: "https://github.com/what3words/w3w-swift-wrapper.git", "4.0.0"..<"5.0.0"),
+      .package(url: "https://github.com/what3words/w3w-swift-core.git", "1.0.0"..<"2.0.0"),
+      .package(url: "https://github.com/what3words/w3w-swift-design.git", "1.0.0" ..< "2.0.0"),
+      .package(url: "git@github.com:what3words/w3w-swift-design-swiftui.git", "1.0.0" ..< "2.0.0"),
+      .package(url: "git@github.com:w3w-internal/w3w-swift-app-events.git", "5.0.0" ..< "6.0.0"),
+      .package(url: "https://github.com/what3words/w3w-swift-presenters.git", branch: "staging")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
             name: "W3WSwiftComponentsOcr",
             dependencies: [
-              .product(name: "W3WSwiftApi", package: "w3w-swift-wrapper"),
-              .product(name: "W3WSwiftDesign", package: "w3w-swift-design")
+              //.product(name: "W3WSwiftApi", package: "w3w-swift-wrapper"),
+              .product(name: "W3WSwiftCore", package: "w3w-swift-core"),
+              .product(name: "W3WSwiftDesign", package: "w3w-swift-design"),
+              .product(name: "W3WSwiftDesignSwiftUI", package: "w3w-swift-design-swiftui"),
+              .product(name: "W3WSwiftPresenters", package: "w3w-swift-presenters"),
+              .product(name: "W3WSwiftAppEvents", package: "w3w-swift-app-events")
             ],
             resources: [.process("Resources")]
         ),

Sources/W3WSwiftComponentsOcr/Export.swift

@@ -7,5 +7,4 @@
 //
 
 // Expose types and the api wrapper to whomever imports this module
-@_exported import W3WSwiftApi
 @_exported import W3WSwiftCore

Sources/W3WSwiftComponentsOcr/Extensions/W3WViewPosition+.swift

@@ -19,35 +19,15 @@ import W3WOcrSdk
 class W3WCameraImageProcessor: NSObject, AVCaptureVideoDataOutputSampleBufferDelegate {
 
   // MARK: Vars
-
+  
   /// callback for any new images
   var onNewImage: (CGImage) -> () = { _ in }
-  //var onNewVideoBuffer: (CMSampleBuffer) -> () = { _ in }
-  
-  /// orientaion of the camera
-  var orientation: AVCaptureVideoOrientation = .portrait
-  
-  /// this monitors device orientation
-  lazy var orientationObserver = W3WOcrOrientationObserver()
-  
+
   /// resultution of the camera
   var resolution: CGSize?
 
   /// region to crop output images to
-  var crop: CGRect?
-  
-  
-  // MARK: Init
-
-  override init() {
-    super.init()
-
-    self.orientation = orientationObserver.currentOrientationForCamera()
-    
-    orientationObserver.onNewOrientation = { [weak self] orientation in
-      self?.orientation = orientation
-    }
-  }
+  var crop: CGRect = .zero
 
 
   /// sets a crop for all returning images in camera coordinates
@@ -63,43 +43,25 @@ class W3WCameraImageProcessor: NSObject, AVCaptureVideoDataOutputSampleBufferDel
 
   /// called when a new image is aviaable from the camera
   public func captureOutput(_ output: AVCaptureOutput, didOutput sampleBuffer: CMSampleBuffer, from connection: AVCaptureConnection) {
-
-    // make sure the orientation is correct
-    connection.videoOrientation = orientation
-
-    // crop the incoming image, and send to whomever is interested
-    if let i = image(from: sampleBuffer, crop: crop) {
-      onNewImage(i)
-    }
-  }
-  
-
-  // MARK: Util
-  
-  /// crop an image and return it as a CGImage
-  /// - Parameters:
-  ///     - buffer: image buffer from the camera
-  ///     - crop: region to crop to
-  /// - Returns: CGImage of the crop
-  private func image(from buffer: CMSampleBuffer, crop: CGRect?) -> CGImage? {
-    var image: CGImage?
+    guard let pixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer) else { return }
+    let width = CVPixelBufferGetWidth(pixelBuffer)
+    let height = CVPixelBufferGetHeight(pixelBuffer)
+
+    let cropRect = CGRect(
+        x: crop.origin.x * CGFloat(width),
+        y: crop.origin.y * CGFloat(height),
+        width: crop.width * CGFloat(width),
+        height: crop.height * CGFloat(height)
+    )
 
-    if let imageBuffer = CMSampleBufferGetImageBuffer(buffer) {
-      var ciimage = CIImage(cvPixelBuffer: imageBuffer)
-      resolution = CGSize(width: ciimage.extent.size.width, height: ciimage.extent.size.height)
-      if let c = crop?.intersection(CGRect(origin: CGPoint.zero, size: resolution!)) {
-        ciimage = ciimage.cropped(to: c)
-      }
-      
-      if let cgImage = CIContext.init(options: nil).createCGImage(ciimage, from: ciimage.extent) {
-        image = cgImage
-      }
+    let ciImage = CIImage(cvPixelBuffer: pixelBuffer)
+    let cropped = ciImage.cropped(to: cropRect)
+
+    if let cgImage = CIContext().createCGImage(cropped, from: cropped.extent) {
+      onNewImage(cgImage)
     }
-    
-    return image
   }
 
-  
   // this makes the OCR work even under the iOS simulator
   #if targetEnvironment(simulator)
   var fakeImages = W3WOcrFakeImages()