Limit pixel ratio handling to scaling library.

blueimp · blueimp · commit 8776ebe52bbe · 2020-04-26T18:22:33.000+09:00
diff --git a/js/load-image-orientation.js b/js/load-image-orientation.js
@@ -235,13 +235,9 @@ Exif orientation values to correctly display the letter F:
     var ctx = canvas.getContext('2d')
     var width = canvas.width
     var height = canvas.height
-    var styleWidth = canvas.style.width
-    var styleHeight = canvas.style.height
     if (orientation > 4) {
       canvas.width = height
       canvas.height = width
-      canvas.style.width = styleHeight
-      canvas.style.height = styleWidth
     }
     switch (orientation) {
       case 2:
diff --git a/js/load-image-scale.js b/js/load-image-scale.js
@@ -220,18 +220,14 @@
     }
     if (useCanvas) {
       pixelRatio = options.pixelRatio
-      if (pixelRatio > 1) {
-        if (parseInt(img.style.width, 10) === width / pixelRatio) {
-          // Source image is already scaled according to device pixel ratio
-          canvas.style.width = destWidth / pixelRatio + 'px'
-          canvas.style.height = destHeight / pixelRatio + 'px'
-        } else {
-          canvas.style.width = destWidth + 'px'
-          canvas.style.height = destHeight + 'px'
-          destWidth *= pixelRatio
-          destHeight *= pixelRatio
-          canvas.getContext('2d').scale(pixelRatio, pixelRatio)
-        }
+      if (
+        pixelRatio > 1 &&
+        // Check if image has not yet device pixel ratio applied:
+        parseInt(img.style.width, 10) !== width / pixelRatio
+      ) {
+        destWidth *= pixelRatio
+        destHeight *= pixelRatio
+        canvas.getContext('2d').scale(pixelRatio, pixelRatio)
       }
       downsamplingRatio = options.downsamplingRatio
       if (
@@ -278,6 +274,10 @@
       canvas.width = destWidth
       canvas.height = destHeight
       loadImage.transformCoordinates(canvas, options, data)
+      if (pixelRatio > 1) {
+        canvas.style.width = canvas.width / pixelRatio + 'px'
+        canvas.style.height = canvas.height / pixelRatio + 'px'
+      }
       return loadImage.renderImageToCanvas(
         canvas,
         img,
