Fixed scaling algorithm for cases with both max and min settings.

blueimp · blueimp · commit ccb467f4e716 · 2011-12-14T13:10:33.000+09:00
diff --git a/load-image.js b/load-image.js
@@ -1,5 +1,5 @@
 /*
- * JavaScript Load Image 1.1
+ * JavaScript Load Image 1.1.1
  * https://github.com/blueimp/JavaScript-Load-Image
  *
  * Copyright 2011, Sebastian Tschan
@@ -53,16 +53,16 @@
     loadImage.scale = function (img, options) {
         options = options || {};
         var canvas = document.createElement('canvas'),
-            scale = Math.min(
-                (options.maxWidth || img.width) / img.width,
-                (options.maxHeight || img.height) / img.height
-            );
-        if (scale >= 1) {
             scale = Math.max(
                 (options.minWidth || img.width) / img.width,
                 (options.minHeight || img.height) / img.height
             );
-        }
+        img.width = parseInt(img.width * scale, 10);
+        img.height = parseInt(img.height * scale, 10);
+        scale = Math.min(
+            (options.maxWidth || img.width) / img.width,
+            (options.maxHeight || img.height) / img.height
+        );
         img.width = parseInt(img.width * scale, 10);
         img.height = parseInt(img.height * scale, 10);
         if (!options.canvas || !canvas.getContext) {
diff --git a/load-image.min.js b/load-image.min.js
diff --git a/package.json b/package.json
@@ -12,5 +12,5 @@
     },
     "bugs": "https://github.com/blueimp/JavaScript-Load-Image/issues",
     "main": "load-image",
-    "version": "1.1.0"
+    "version": "1.1.1"
 }
diff --git a/test/test.js b/test/test.js
@@ -1,5 +1,5 @@
 /*
- * JavaScript Load Image Test 1.1
+ * JavaScript Load Image Test 1.1.1
  * https://github.com/blueimp/JavaScript-Load-Image
  *
  * Copyright 2011, Sebastian Tschan
@@ -88,6 +88,38 @@
         }, {minHeight: 240}));
     });
 
+    $.asyncTest('Scale to options.minWidth but respect options.maxWidth', function () {
+        $.ok($.loadImage(blob, function (img) {
+            $.start();
+            $.strictEqual(img.width, 160);
+            $.strictEqual(img.height, 120);
+        }, {minWidth: 240, maxWidth: 160}));
+    });
+
+    $.asyncTest('Scale to options.minHeight but respect options.maxHeight', function () {
+        $.ok($.loadImage(blob, function (img) {
+            $.start();
+            $.strictEqual(img.width, 160);
+            $.strictEqual(img.height, 120);
+        }, {minHeight: 180, maxHeight: 120}));
+    });
+
+    $.asyncTest('Scale to options.minWidth but respect options.maxHeight', function () {
+        $.ok($.loadImage(blob, function (img) {
+            $.start();
+            $.strictEqual(img.width, 160);
+            $.strictEqual(img.height, 120);
+        }, {minWidth: 240, maxHeight: 120}));
+    });
+
+    $.asyncTest('Scale to options.minHeight but respect options.maxWidth', function () {
+        $.ok($.loadImage(blob, function (img) {
+            $.start();
+            $.strictEqual(img.width, 160);
+            $.strictEqual(img.height, 120);
+        }, {minHeight: 180, maxWidth: 160}));
+    });
+
     $.module('Canvas');
 
     $.asyncTest('Return img element to callback if options.canvas is not true', function () {

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,5 @@`
`12`	`12`	`},`
`13`	`13`	`"bugs": "https://github.com/blueimp/JavaScript-Load-Image/issues",`
`14`	`14`	`"main": "load-image",`
`15`		`- "version": "1.1.0"`
	`15`	`+ "version": "1.1.1"`
`16`	`16`	`}`