@capgo/camera-preview 7.16.2 → 7.16.4

package/android/src/main/java/app/capgo/capacitor/camera/preview/CameraXView.java

@@ -1314,13 +1314,7 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
             if (transformedPixels) {
               Integer fW = (finalWidthOut > 0) ? finalWidthOut : null;
               Integer fH = (finalHeightOut > 0) ? finalHeightOut : null;
-              bytes = injectExifInMemory(
-                bytes,
-                originalCaptureBytes,
-                fW,
-                fH,
-                /*normalizeOrientation*/true
-              );
+              bytes = injectExifInMemory(bytes, originalCaptureBytes, fW, fH);
             }
 
             // Save to gallery asynchronously if requested, copy EXIF to file
@@ -1495,8 +1489,7 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
     byte[] targetJpeg,
     byte[] sourceJpegWithExif,
     Integer finalWidth,
-    Integer finalHeight,
-    boolean normalizeOrientation
+    Integer finalHeight
   ) {
     try {
       // Quick signature check for JPEG (FF D8 FF)
@@ -1524,19 +1517,27 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
           : new org.apache.commons.imaging.formats.tiff.write.TiffOutputSet();
 
       // Update orientation if requested (normalize to 1)
-      if (normalizeOrientation) {
-        org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory rootDir =
-          outputSet.getOrCreateRootDirectory();
-        rootDir.removeField(
-          org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants.TIFF_TAG_ORIENTATION
-        );
-        rootDir.add(
-          org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants.TIFF_TAG_ORIENTATION,
-          (short) 1
-        );
-      }
+      org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory rootDir =
+        outputSet.getOrCreateRootDirectory();
+      rootDir.removeField(
+        org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants.TIFF_TAG_ORIENTATION
+      );
+      rootDir.add(
+        org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants.TIFF_TAG_ORIENTATION,
+        (short) 1
+      );
 
-      // Optionally update dimensions here. Skipped to maximize compatibility with Commons Imaging 1.0-alpha3.
+      if (finalWidth != null || finalHeight != null) {
+        try {
+          updateResizedDimensions(outputSet, finalWidth, finalHeight);
+        } catch (Exception dimensionUpdateError) {
+          Log.w(
+            TAG,
+            "injectExifInMemory: Failed to update resized dimensions",
+            dimensionUpdateError
+          );
+        }
+      }
 
       java.io.ByteArrayOutputStream out = new java.io.ByteArrayOutputStream();
       new org.apache.commons.imaging.formats.jpeg.exif.ExifRewriter()
@@ -1552,6 +1553,65 @@ public class CameraXView implements LifecycleOwner, LifecycleObserver {
     }
   }
 
+  private void updateResizedDimensions(
+    org.apache.commons.imaging.formats.tiff.write.TiffOutputSet outputSet,
+    Integer finalWidth,
+    Integer finalHeight
+  ) throws org.apache.commons.imaging.ImagingException {
+    org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory rootDir =
+      outputSet.getOrCreateRootDirectory();
+    if (finalWidth != null) {
+      replaceShortOrLongTag(
+        rootDir,
+        org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants.TIFF_TAG_IMAGE_WIDTH,
+        finalWidth
+      );
+    }
+    if (finalHeight != null) {
+      replaceShortOrLongTag(
+        rootDir,
+        org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants.TIFF_TAG_IMAGE_LENGTH,
+        finalHeight
+      );
+    }
+
+    org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory exifDir =
+      outputSet.getOrCreateExifDirectory();
+    if (finalWidth != null) {
+      replaceShortTag(
+        exifDir,
+        org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants.EXIF_TAG_EXIF_IMAGE_WIDTH,
+        finalWidth
+      );
+    }
+    if (finalHeight != null) {
+      replaceShortTag(
+        exifDir,
+        org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants.EXIF_TAG_EXIF_IMAGE_LENGTH,
+        finalHeight
+      );
+    }
+  }
+
+  private void replaceShortOrLongTag(
+    org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory directory,
+    org.apache.commons.imaging.formats.tiff.taginfos.TagInfoShortOrLong tagInfo,
+    int value
+  ) throws org.apache.commons.imaging.ImagingException {
+    directory.removeField(tagInfo);
+    directory.add(tagInfo, value);
+  }
+
+  private void replaceShortTag(
+    org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory directory,
+    org.apache.commons.imaging.formats.tiff.taginfos.TagInfoShort tagInfo,
+    int value
+  ) throws org.apache.commons.imaging.ImagingException {
+    int sanitizedValue = Math.max(0, Math.min(value, 0xFFFF));
+    directory.removeField(tagInfo);
+    directory.add(tagInfo, (short) sanitizedValue);
+  }
+
   private static final String[][] EXIF_TAGS = new String[][] {
     { ExifInterface.TAG_APERTURE_VALUE, "ApertureValue" },
     { ExifInterface.TAG_ARTIST, "Artist" },

package/ios/Sources/CapgoCameraPreviewPlugin/CameraController.swift

@@ -393,7 +393,6 @@ extension CameraController {
                     fileVideoOutput.connections.forEach { $0.videoOrientation = videoOrientation }
                 }
 
-
                 // Set up preview layer session in the same configuration block
                 if let layer = self.previewLayer {
                     layer.session = captureSession
@@ -716,7 +715,6 @@ extension CameraController {
         gridOverlayView = nil
     }
 
-
     func updateVideoOrientation() {
         // Get orientation in a thread-safe way
         let videoOrientation = self.getVideoOrientation()
@@ -771,14 +769,14 @@ extension CameraController {
             if device.supportsSessionPreset(.hd4K3840x2160) { return .hd4K3840x2160 }
             if device.supportsSessionPreset(.hd1920x1080) { return .hd1920x1080 }
             if device.supportsSessionPreset(.hd1280x720) { return .hd1280x720 }
-            if device.supportsSessionPreset(.high)       { return .high }
-            if device.supportsSessionPreset(.photo)      { return .photo } // safe, though 4:3
+            if device.supportsSessionPreset(.high) { return .high }
+            if device.supportsSessionPreset(.photo) { return .photo } // safe, though 4:3
             return .vga640x480
         } else {
             // 4:3 or unknown: prefer photo → high → 1080p → 720p → vga
-            if device.supportsSessionPreset(.photo)      { return .photo }
-            if device.supportsSessionPreset(.high)       { return .high }
-            if device.supportsSessionPreset(.hd1920x1080){ return .hd1920x1080 }
+            if device.supportsSessionPreset(.photo) { return .photo }
+            if device.supportsSessionPreset(.high) { return .high }
+            if device.supportsSessionPreset(.hd1920x1080) { return .hd1920x1080 }
             if device.supportsSessionPreset(.hd1280x720) { return .hd1280x720 }
             return .vga640x480
         }
@@ -1097,7 +1095,7 @@ extension CameraController {
 
         // Validate crop rect is within image bounds
         if cropRect.minX < 0 || cropRect.minY < 0 ||
-           cropRect.maxX > imageSize.width || cropRect.maxY > imageSize.height {
+            cropRect.maxX > imageSize.width || cropRect.maxY > imageSize.height {
             print("[CameraPreview] cropImageToAspectRatio - Warning: Crop rect \(cropRect) exceeds image bounds \(imageSize)")
             // Adjust crop rect to fit within image bounds
             cropRect = cropRect.intersection(CGRect(origin: .zero, size: imageSize))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/camera-preview",
-  "version": "7.16.2",
+  "version": "7.16.4",
   "description": "Camera preview",
   "license": "MIT",
   "repository": {