depixel 1.0.0 → 1.0.2

package/README.md

@@ -2,10 +2,14 @@ Kopf-Lischinski "Depixelizing Pixel Art" for Node.js
 ====================================================
 
 Based on the following paper:
-* [Depixelizing Pixel Art](https://johanneskopf.de/publications/pixelart/)
+* [Depixelizing Pixel Art](https://johanneskopf.de/publications/pixelart/) by Johannes Kopf & Dani Lischinski
 
 And the [source code](https://github.com/falichs/Depixelizing-Pixel-Art-on-GPUs) included with this paper:
-* [Depixelizing Pixel Art on GPUs](https://www.cg.tuwien.ac.at/research/publications/2014/KREUZER-2014-DPA/)
+* [Depixelizing Pixel Art on GPUs](https://www.cg.tuwien.ac.at/research/publications/2014/KREUZER-2014-DPA/) by Felix Kreuzer
+
+Improvements upon original
+* Add a threshold parameter to adjust how close two colors need to be to be consider similar
+* Better handle alpha channels (treat as dissimilar from non-transparent pixels)
 
 Notes
 * Original GPU code is MIT licensed, the same license may apply here, all original code in this project is additionally released under the MIT License

package/lib.js

@@ -88,10 +88,17 @@ function isSimilar(a, b, threshold) {
   const uB = 0.493 * (b[2] - yB);
   const vB = 0.877 * (b[0] - yB);
   const t = Math.max(0, Math.min(255, threshold | 0)) / 255.0;
-  if (Math.abs(yA - yB) <= (48.0 / 255.0) * t) {
-    if (Math.abs(uA - uB) <= (7.0 / 255.0) * t) {
-      if (Math.abs(vA - vB) <= (6.0 / 255.0) * t) {
-        return true;
+  if (Math.abs(a[3] - b[3]) <= (32.0/255) * t) {
+    if (a[3] + b[3] <= (32.0/255) * t) {
+      // treat all alpha=0 pixels as similar, regardless of color
+      // note: need an option for this if processing images with masks or premultiplied alpha
+      return true;
+    }
+    if (Math.abs(yA - yB) <= (48.0 / 255.0) * t) {
+      if (Math.abs(uA - uB) <= (7.0 / 255.0) * t) {
+        if (Math.abs(vA - vB) <= (6.0 / 255.0) * t) {
+          return true;
+        }
       }
     }
   }
@@ -1813,17 +1820,23 @@ function scaleImage(src, opts) {
 
   const borderPx = Math.max(0, Math.round(opts.borderPx || 0));
   if (borderPx > 0) {
+    const doInvisBorder = Math.min(
+      src.data[3],
+      src.data[(inW - 1) * 4 + 3],
+      src.data[(inH - 1) * inW * 4 + 3],
+      src.data[((inH - 1) * inW + (inW - 1)) * 4 + 3],
+    ) < 255;
     const padW = inW + 2 * borderPx;
     const padH = inH + 2 * borderPx;
     const padData = new Uint8Array(padW * padH * 4);
-    // fill magenta border
+    // fill magenta border (invisible if original image appears to have invisible edges)
     for (let y = 0; y < padH; y++) {
       for (let x = 0; x < padW; x++) {
         const idx = (y * padW + x) * 4;
-        padData[idx] = 255;
+        padData[idx] = doInvisBorder ? 0 : 255;
         padData[idx + 1] = 0;
-        padData[idx + 2] = 255;
-        padData[idx + 3] = 255;
+        padData[idx + 2] = doInvisBorder ? 0 : 255;
+        padData[idx + 3] = doInvisBorder ? 0 : 255;
       }
     }
     // copy src into center

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "depixel",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Depixelizing Pixel Art by Kopf-Lischinski and Felix Kreuzer for Node.js",
   "main": "lib.js",
   "keywords": [
@@ -9,7 +9,7 @@
     "upscale"
   ],
   "author": "Jimb Esser (https://github.com/Jimbly)",
-  "homepage": "https://github.com/Jimbly/depixel-js",
+  "homepage": "https://github.com/Jimbly/depixel-js#readme",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Jimbly/npm-publish.git"