@eris/image - npm Package Compare versions

Comparing version 0.1.1-alpha.13 to 0.1.1-alpha.14

dist/transforms/resize.js

@@ -139,24 +139,45 @@ "use strict";
         for (var j = 0; j < targetHeight; j++) {
+            // Find the ideal X,Y coordinates we'd pull from
             var srcX = i * widthScaleFactor;
             var srcY = j * heightScaleFactor;
-            var outPos = (j * targetWidth + i) * imageData.channels;
-            var srcXOffset = Math.floor(srcX);
-            var srcYOffset = Math.floor(srcY) * imageData.width;
-            var srcPosA = (srcYOffset + srcXOffset) * imageData.channels;
-            var srcPosB = srcPosA + imageData.channels;
-            var srcPosC = (srcYOffset + imageData.width + srcXOffset) * imageData.channels;
-            var srcPosD = srcPosC + imageData.channels;
-            var xWeight = Math.max(1 - Math.abs(Math.floor(srcX) - srcX), 0);
-            var yWeight = Math.max(1 - Math.abs(Math.floor(srcY) - srcY), 0);
-            var weightPosA = xWeight * yWeight;
-            var weightPosB = (1 - xWeight) * yWeight;
-            var weightPosC = xWeight * (1 - yWeight);
-            var weightPosD = (1 - xWeight) * (1 - yWeight);
-            var totalWeight = weightPosA + weightPosB + weightPosC + weightPosD;
+            var srcXFloor = Math.floor(srcX);
+            var srcYFloor = Math.floor(srcY);
+            // Compute the source indexes we'll pull from
+            // We're trying to pull from the 4 closest pixels
+            // A = floor(X), floor(Y)
+            // D = ceil(X), ceil(Y)
+            // - - A B - -
+            // - - C D - -
+            var srcXOffset = srcXFloor;
+            var srcRowIndexOffset = Math.floor(srcY) * imageData.width;
+            var srcIndexA = (srcRowIndexOffset + srcXOffset) * imageData.channels;
+            var srcIndexB = srcIndexA + imageData.channels;
+            var srcIndexC = (srcRowIndexOffset + imageData.width + srcXOffset) * imageData.channels;
+            var srcIndexD = srcIndexC + imageData.channels;
+            // Make sure the edges don't fly off the image data
+            if (srcXFloor === imageData.width - 1) {
+                srcIndexB = srcIndexA;
+                srcIndexD = srcIndexC;
+            }
+            if (srcYFloor === imageData.height - 1) {
+                srcIndexC = srcIndexA;
+                srcIndexD = srcIndexB;
+            }
+            // Compute the weights each pixel will have using the distance
+            var xDistanceA = srcX - srcXFloor;
+            var yDistanceA = srcY - srcYFloor;
+            var xWeightA = 1 - xDistanceA;
+            var yWeightB = 1 - yDistanceA;
+            var weightA = xWeightA * yWeightB;
+            var weightB = (1 - xWeightA) * yWeightB;
+            var weightC = xWeightA * (1 - yWeightB);
+            var weightD = (1 - xWeightA) * (1 - yWeightB);
+            var totalWeight = weightA + weightB + weightC + weightD;
+            var outIndex = (j * targetWidth + i) * imageData.channels;
             for (var channel = 0; channel < imageData.channels; channel++) {
-                var value = (imageData.data[srcPosA + channel] * weightPosA) / totalWeight +
-                    (imageData.data[srcPosB + channel] * weightPosB) / totalWeight +
-                    (imageData.data[srcPosC + channel] * weightPosC) / totalWeight +
-                    (imageData.data[srcPosD + channel] * weightPosD) / totalWeight;
-                outPixels[outPos + channel] = Math.round(value);
+                var value = (imageData.data[srcIndexA + channel] * weightA) / totalWeight +
+                    (imageData.data[srcIndexB + channel] * weightB) / totalWeight +
+                    (imageData.data[srcIndexC + channel] * weightC) / totalWeight +
+                    (imageData.data[srcIndexD + channel] * weightD) / totalWeight;
+                outPixels[outIndex + channel] = Math.round(value);
             }
@@ -163,0 +184,0 @@ }

lib/transforms/resize.ts

@@ -165,30 +165,52 @@ /* tslint:disable */
     for (var j = 0; j < targetHeight; j++) {
+      // Find the ideal X,Y coordinates we'd pull from
       var srcX = i * widthScaleFactor
       var srcY = j * heightScaleFactor
+      var srcXFloor = Math.floor(srcX)
+      var srcYFloor = Math.floor(srcY)
 
-      var outPos = (j * targetWidth + i) * imageData.channels
+      // Compute the source indexes we'll pull from
+      // We're trying to pull from the 4 closest pixels
+      // A = floor(X), floor(Y)
+      // D = ceil(X), ceil(Y)
+      // - - A B - -
+      // - - C D - -
+      var srcXOffset = srcXFloor
+      var srcRowIndexOffset = Math.floor(srcY) * imageData.width
+      var srcIndexA = (srcRowIndexOffset + srcXOffset) * imageData.channels
+      var srcIndexB = srcIndexA + imageData.channels
+      var srcIndexC = (srcRowIndexOffset + imageData.width + srcXOffset) * imageData.channels
+      var srcIndexD = srcIndexC + imageData.channels
 
-      var srcXOffset = Math.floor(srcX)
-      var srcYOffset = Math.floor(srcY) * imageData.width
+      // Make sure the edges don't fly off the image data
+      if (srcXFloor === imageData.width - 1) {
+        srcIndexB = srcIndexA
+        srcIndexD = srcIndexC
+      }
 
-      var srcPosA = (srcYOffset + srcXOffset) * imageData.channels
-      var srcPosB = srcPosA + imageData.channels
-      var srcPosC = (srcYOffset + imageData.width + srcXOffset) * imageData.channels
-      var srcPosD = srcPosC + imageData.channels
+      if (srcYFloor === imageData.height - 1) {
+        srcIndexC = srcIndexA
+        srcIndexD = srcIndexB
+      }
 
-      var xWeight = Math.max(1 - Math.abs(Math.floor(srcX) - srcX), 0)
-      var yWeight = Math.max(1 - Math.abs(Math.floor(srcY) - srcY), 0)
-      var weightPosA = xWeight * yWeight
-      var weightPosB = (1 - xWeight) * yWeight
-      var weightPosC = xWeight * (1 - yWeight)
-      var weightPosD = (1 - xWeight) * (1 - yWeight)
-      var totalWeight = weightPosA + weightPosB + weightPosC + weightPosD
+      // Compute the weights each pixel will have using the distance
+      var xDistanceA = srcX - srcXFloor
+      var yDistanceA = srcY - srcYFloor
+      var xWeightA = 1 - xDistanceA
+      var yWeightB = 1 - yDistanceA
+      var weightA = xWeightA * yWeightB
+      var weightB = (1 - xWeightA) * yWeightB
+      var weightC = xWeightA * (1 - yWeightB)
+      var weightD = (1 - xWeightA) * (1 - yWeightB)
+      var totalWeight = weightA + weightB + weightC + weightD
 
+      var outIndex = (j * targetWidth + i) * imageData.channels
+
       for (var channel = 0; channel < imageData.channels; channel++) {
         var value =
-          (imageData.data[srcPosA + channel] * weightPosA) / totalWeight +
-          (imageData.data[srcPosB + channel] * weightPosB) / totalWeight +
-          (imageData.data[srcPosC + channel] * weightPosC) / totalWeight +
-          (imageData.data[srcPosD + channel] * weightPosD) / totalWeight
-        outPixels[outPos + channel] = Math.round(value)
+          (imageData.data[srcIndexA + channel] * weightA) / totalWeight +
+          (imageData.data[srcIndexB + channel] * weightB) / totalWeight +
+          (imageData.data[srcIndexC + channel] * weightC) / totalWeight +
+          (imageData.data[srcIndexD + channel] * weightD) / totalWeight
+        outPixels[outIndex + channel] = Math.round(value)
       }
@@ -195,0 +217,0 @@ }

package.json

 {
   "name": "@eris/image",
-  "version": "0.1.1-alpha.13",
+  "version": "0.1.1-alpha.14",
   "description": "Collection of image manipulation libraries for node and the browser.",
@@ -38,3 +38,3 @@ "main": "./dist/node-index.js",
   "dependencies": {
-    "@eris/exif": "0.1.1-alpha.13",
+    "@eris/exif": "0.1.1-alpha.14",
     "buffer": "^5.2.0",
@@ -71,3 +71,3 @@ "file-type": "^7.0.1",
   },
-  "gitHead": "cff4b73263e5709c1ccd742433f4636e88ea85c3"
+  "gitHead": "43b19b474d70b41096e2bcd2ab4546c4e6026aff"
 }

No alert changes

Improved metrics

Total package byte prevSize

1617040

increased by0.29%

Lines of code

13781

increased by0.47%

Dependency changes

• + Added@eris/exif@0.1.1-alpha.14(transitive)

• - Removed@eris/exif@0.1.1-alpha.13(transitive)

• Updated@eris/exif@0.1.1-alpha.14