Fix oriented image preview (#233)

FluidGroup · Mar 29, 2024 · 1dcf0b8 · 1dcf0b8
1 parent 29815ac
commit 1dcf0b8
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/Dev/Sources/SharedForDemo/Mocks.swift b/Dev/Sources/SharedForDemo/Mocks.swift
@@ -27,7 +27,11 @@ enum Mocks {
   static func imageSuperSmall() -> UIImage {
     UIImage(named: "super-small")!
   }
-
+
+  static func imageOrientationLeft() -> UIImage {
+    UIImage(named: "orientation_left.HEIC")!
+  }
+
   static func makeEditingStack(image: UIImage) -> EditingStack {
     .init(
       imageProvider: .init(image: image)

diff --git a/Dev/Sources/SwiftUIDemo/ContentView.swift b/Dev/Sources/SwiftUIDemo/ContentView.swift
@@ -226,6 +226,19 @@ struct ContentView: View {
               }
             }
 
+            Button("PixelEditor left") {
+              fullScreenView = .init {
+                DemoPixelEditor(
+                  editingStack: {
+                    EditingStack.init(
+                      imageProvider: .init(image: Mocks.imageOrientationLeft())
+                    )
+                  },
+                  options: .init(croppingAspectRatio: nil)
+                )
+              }
+            }
+
           })
 
           Section("Lab") {

diff --git a/Sources/BrightroomEngine/Core/EditingStack.Edit.swift b/Sources/BrightroomEngine/Core/EditingStack.Edit.swift
@@ -32,6 +32,7 @@ extension EditingStack {
       crop.imageSize
     }
 
+    /// In orientation.up
     public var crop: EditingCrop
     public var filters: Filters = .init()
     public var drawings: Drawings = .init()

diff --git a/Sources/BrightroomEngine/Core/EditingStack.swift b/Sources/BrightroomEngine/Core/EditingStack.swift
@@ -412,19 +412,28 @@ open class EditingStack: Hashable, StoreComponentType {
   public func makeCroppedCIImage(loadedState: State.Loaded) -> CIImage {
 
     do {
+      let orientation = loadedState.metadata.orientation
       let crop = loadedState.currentEdit.crop
+
+      // orientation is not respected
       let image = loadedState.editingSourceCGImage
+
+      // orientation-respected
       let imageSize = image.size
+        .applying(cgOrientation: orientation)
 
       let scaledCrop = crop.scaledWithPixelPerfect(
         maxPixelSize: max(imageSize.width, imageSize.height)
       )
 
       return try image
+      // TODO: better to combine these operations - oriented and cropping
+        .oriented(orientation)
         .croppedWithColorspace(
-          to: scaledCrop.cropExtent, adjustmentAngleRadians: scaledCrop.aggregatedRotation.radians)
+          to: scaledCrop.cropExtent, adjustmentAngleRadians: scaledCrop.aggregatedRotation.radians
+        )
         ._makeCIImage(
-          orientation: loadedState.metadata.orientation,
+          orientation: .up,
           device: mtlDevice,
           usesMTLTexture: options.usesMTLTextureForEditingImage
         )