@jimp/plugin-blit - npm Package Compare versions

Comparing version 0.3.9 to 0.4.0

dist/index.js

@@ -70,6 +70,18 @@ "use strict";
           var dstIdx = baseImage.getPixelIndex(x + sx - srcx, y + sy - srcy);
-          baseImage.bitmap.data[dstIdx] = this.bitmap.data[idx];
-          baseImage.bitmap.data[dstIdx + 1] = this.bitmap.data[idx + 1];
-          baseImage.bitmap.data[dstIdx + 2] = this.bitmap.data[idx + 2];
-          baseImage.bitmap.data[dstIdx + 3] = this.bitmap.data[idx + 3];
+          var _src = {
+            r: this.bitmap.data[idx],
+            g: this.bitmap.data[idx + 1],
+            b: this.bitmap.data[idx + 2],
+            a: this.bitmap.data[idx + 3]
+          };
+          var dst = {
+            r: baseImage.bitmap.data[dstIdx],
+            g: baseImage.bitmap.data[dstIdx + 1],
+            b: baseImage.bitmap.data[dstIdx + 2],
+            a: baseImage.bitmap.data[dstIdx + 3]
+          };
+          baseImage.bitmap.data[dstIdx] = (_src.a * (_src.r - dst.r) - dst.r + 255 >> 8) + dst.r;
+          baseImage.bitmap.data[dstIdx + 1] = (_src.a * (_src.g - dst.g) - dst.g + 255 >> 8) + dst.g;
+          baseImage.bitmap.data[dstIdx + 2] = (_src.a * (_src.b - dst.b) - dst.b + 255 >> 8) + dst.b;
+          baseImage.bitmap.data[dstIdx + 3] = this.constructor.limit255(dst.a + _src.a);
         }
@@ -76,0 +88,0 @@ });

es/index.js

@@ -56,6 +56,18 @@ function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
           var dstIdx = baseImage.getPixelIndex(x + sx - srcx, y + sy - srcy);
-          baseImage.bitmap.data[dstIdx] = this.bitmap.data[idx];
-          baseImage.bitmap.data[dstIdx + 1] = this.bitmap.data[idx + 1];
-          baseImage.bitmap.data[dstIdx + 2] = this.bitmap.data[idx + 2];
-          baseImage.bitmap.data[dstIdx + 3] = this.bitmap.data[idx + 3];
+          var _src = {
+            r: this.bitmap.data[idx],
+            g: this.bitmap.data[idx + 1],
+            b: this.bitmap.data[idx + 2],
+            a: this.bitmap.data[idx + 3]
+          };
+          var dst = {
+            r: baseImage.bitmap.data[dstIdx],
+            g: baseImage.bitmap.data[dstIdx + 1],
+            b: baseImage.bitmap.data[dstIdx + 2],
+            a: baseImage.bitmap.data[dstIdx + 3]
+          };
+          baseImage.bitmap.data[dstIdx] = (_src.a * (_src.r - dst.r) - dst.r + 255 >> 8) + dst.r;
+          baseImage.bitmap.data[dstIdx + 1] = (_src.a * (_src.g - dst.g) - dst.g + 255 >> 8) + dst.g;
+          baseImage.bitmap.data[dstIdx + 2] = (_src.a * (_src.b - dst.b) - dst.b + 255 >> 8) + dst.b;
+          baseImage.bitmap.data[dstIdx + 3] = this.constructor.limit255(dst.a + _src.a);
         }
@@ -62,0 +74,0 @@ });

package.json

 {
   "name": "@jimp/plugin-blit",
-  "version": "0.3.9",
+  "version": "0.4.0",
   "description": "Blit an image.",
@@ -8,2 +8,5 @@ "main": "dist/index.js",
   "scripts": {
+    "test": "cross-env BABEL_ENV=test mocha --require @babel/register",
+    "test:watch": "npm run test -- --reporter min --watch",
+    "test:coverage": "nyc npm run test",
     "build": "npm run build:node:production && npm run build:module",
@@ -20,5 +23,10 @@ "build:watch": "npm run build:node:debug -- -- --watch --verbose",
   "dependencies": {
-    "@jimp/utils": "^0.3.9",
+    "@jimp/utils": "^0.4.0",
     "core-js": "^2.5.7"
   },
+  "devDependencies": {
+    "@jimp/custom": "^0.4.0",
+    "@jimp/jpeg": "^0.4.0",
+    "@jimp/test-utils": "^0.4.0"
+  },
   "peerDependencies": {
@@ -30,3 +38,3 @@ "@jimp/custom": ">=0.3.5"
   },
-  "gitHead": "cc0669daf5b35d7bb0cb9d2a07a3ab4215bbed79"
+  "gitHead": "4daa956fce81c656ffa10d814a08412ef09b7e69"
 }

src/index.js

@@ -70,6 +70,25 @@ import { throwError, isNodePattern } from '@jimp/utils';
         const dstIdx = baseImage.getPixelIndex(x + sx - srcx, y + sy - srcy);
-        baseImage.bitmap.data[dstIdx] = this.bitmap.data[idx];
-        baseImage.bitmap.data[dstIdx + 1] = this.bitmap.data[idx + 1];
-        baseImage.bitmap.data[dstIdx + 2] = this.bitmap.data[idx + 2];
-        baseImage.bitmap.data[dstIdx + 3] = this.bitmap.data[idx + 3];
+        const src = {
+          r: this.bitmap.data[idx],
+          g: this.bitmap.data[idx + 1],
+          b: this.bitmap.data[idx + 2],
+          a: this.bitmap.data[idx + 3]
+        };
+
+        const dst = {
+          r: baseImage.bitmap.data[dstIdx],
+          g: baseImage.bitmap.data[dstIdx + 1],
+          b: baseImage.bitmap.data[dstIdx + 2],
+          a: baseImage.bitmap.data[dstIdx + 3]
+        };
+
+        baseImage.bitmap.data[dstIdx] =
+          ((src.a * (src.r - dst.r) - dst.r + 255) >> 8) + dst.r;
+        baseImage.bitmap.data[dstIdx + 1] =
+          ((src.a * (src.g - dst.g) - dst.g + 255) >> 8) + dst.g;
+        baseImage.bitmap.data[dstIdx + 2] =
+          ((src.a * (src.b - dst.b) - dst.b + 255) >> 8) + dst.b;
+        baseImage.bitmap.data[dstIdx + 3] = this.constructor.limit255(
+          dst.a + src.a
+        );
       }
@@ -76,0 +95,0 @@ });

No alert changes

Improved metrics

Total package byte prevSize

700101

increased by103.83%

Number of package files

12

increased by33.33%

Lines of code

408

increased by94.29%

Worsened metrics

Dev dependency count

3

increased byInfinity%

Dependency changes

• + Added@jimp/utils@0.4.0(transitive)

• - Removed@jimp/utils@0.3.9(transitive)

• Updated@jimp/utils@^0.4.0