Normalize original width+height dimensions.

blueimp · blueimp · commit 61761388e0b9 · 2020-04-21T23:45:39.000+09:00
Switch reported original dimensions for browsers with automatic image orientation.
diff --git a/js/load-image-orientation.js b/js/load-image-orientation.js
@@ -43,6 +43,7 @@ Exif orientation values to correctly display the letter F:
 })(function (loadImage) {
   'use strict'
 
+  var originalTransform = loadImage.transform
   var originalHasCanvasOption = loadImage.hasCanvasOption
   var originalHasMetaOption = loadImage.hasMetaOption
   var originalTransformCoordinates = loadImage.transformCoordinates
@@ -66,6 +67,33 @@ Exif orientation values to correctly display the letter F:
     img.src = testImageURL
   })()
 
+  loadImage.transform = function (img, options, callback, file, data) {
+    originalTransform.call(
+      loadImage,
+      img,
+      options,
+      function (img, data) {
+        if (data) {
+          var exifOrientation = data.exif && data.exif.get('Orientation')
+          if (
+            loadImage.orientation &&
+            exifOrientation > 4 &&
+            exifOrientation < 9
+          ) {
+            // Automatic image orientation switched image dimensions
+            var originalWidth = data.originalWidth
+            var originalHeight = data.originalHeight
+            data.originalWidth = originalHeight
+            data.originalHeight = originalWidth
+          }
+        }
+        callback(img, data)
+      },
+      file,
+      data
+    )
+  }
+
   // Determines if the target image should be a canvas element:
   loadImage.hasCanvasOption = function (options) {
     return (
diff --git a/test/test.js b/test/test.js
@@ -932,6 +932,20 @@
       ).to.be.ok
     })
 
+    it('Provide original image width+height from before orientation', function (done) {
+      expect(
+        loadImage(
+          blobJPEG,
+          function (img, data) {
+            expect(data.originalWidth).to.equal(3)
+            expect(data.originalHeight).to.equal(2)
+            done()
+          },
+          { meta: true, minWidth: 20, minHeight: 30 }
+        )
+      ).to.be.ok
+    })
+
     describe('from-image', function () {
       if (!loadImage.orientation) return
 
