imagescript 1.2.9 → 1.2.15

package/v2/index.js

@@ -1,7 +1,7 @@
 const mem = require('./util/mem.js');
 const png = require('../png/node.js');
 const magic = require('./codecs/magic.js');
-const codecs = require('../node/index.js');
+const codecs = require('../codecs/node/index.js');
 const { Color, default: framebuffer } = require('./framebuffer.js');
 
 const wasm = {

package/v2/ops/index.mjs

@@ -0,0 +1,9 @@
+export * as flip from './flip.mjs';
+export * as fill from './fill.mjs';
+export * as blur from './blur.mjs';
+export * as crop from './crop.mjs';
+export * as color from './color.mjs';
+export * as resize from './resize.mjs';
+export * as rotate from './rotate.mjs';
+export * as overlay from './overlay.mjs';
+export * as iterator from './iterator.mjs';

package/v2/ops/{iterator.js → iterator.mjs}

@@ -2,8 +2,8 @@ export function* cords(framebuffer) {
   const width = framebuffer.width | 0;
   const height = framebuffer.height | 0;
 
-  for (let y = 1 | 0; y <= height; y++) {
-    for (let x = 1 | 0; x <= width; x++) yield [x, y];
+  for (let y = 0 | 0; y < height; y++) {
+    for (let x = 0 | 0; x < width; x++) yield [x, y];
   }
 }
 
@@ -13,8 +13,8 @@ export function* rgba(framebuffer) {
   const width = framebuffer.width | 0;
   const height = framebuffer.height | 0;
 
-  for (let y = 1 | 0; y <= height; y++) {
-    for (let x = 1 | 0; x <= width; x++) {
+  for (let y = 0 | 0; y < height; y++) {
+    for (let x = 0 | 0; x < width; x++) {
       yield [x, y, u8.subarray(offset, offset += 4)];
     }
   }
@@ -26,8 +26,8 @@ export function* u32(framebuffer) {
   const width = framebuffer.width | 0;
   const height = framebuffer.height | 0;
 
-  for (let y = 1 | 0; y <= height; y++) {
-    for (let x = 1 | 0; x <= width; x++) {
+  for (let y = 0 | 0; y < height; y++) {
+    for (let x = 0 | 0; x < width; x++) {
       yield [x, y, view.getUint32(offset, false)]; offset += 4;
     }
   }

package/v2/ops/overlay.mjs

@@ -0,0 +1,63 @@
+export function replace(bg, fg, x, y) {
+  const b32 = bg.u32;
+  const f32 = fg.u32;
+  const fw = fg.width | 0;
+  const bw = bg.width | 0;
+  const fh = fg.height | 0;
+  const bh = bg.height | 0;
+  const ox = (x > 0 ? 0 : -x) | 0;
+  const oy = (y > 0 ? 0 : -y) | 0;
+  const top = (y > 0 ? y : 0) | 0;
+  const left = (x > 0 ? x : 0) | 0;
+  const width = (Math.min(bw, x + fw) - left) | 0;
+  const height = (Math.min(bh, y + fh) - top) | 0;
+
+  if (0 >= width || 0 >= height) return;
+
+  for (let yy = 0 | 0; yy < height; yy++) {
+    const yyoffset = ox + fw * (yy + oy);
+    const yoffset = left + bw * (yy + top);
+    b32.subarray(yoffset, width + yoffset).set(f32.subarray(yyoffset, width + yyoffset));
+  }
+}
+
+export function blend(bg, fg, x, y) {
+  const b32 = bg.u32;
+  const f32 = fg.u32;
+  const fw = fg.width | 0;
+  const bw = bg.width | 0;
+  const fh = fg.height | 0;
+  const bh = bg.height | 0;
+  const ox = (x > 0 ? 0 : -x) | 0;
+  const oy = (y > 0 ? 0 : -y) | 0;
+  const top = (y > 0 ? y : 0) | 0;
+  const left = (x > 0 ? x : 0) | 0;
+  const width = (Math.min(bw, x + fw) - left) | 0;
+  const height = (Math.min(bh, y + fh) - top) | 0;
+
+  if (0 >= width || 0 >= height) return;
+
+  for (let yy = 0 | 0; yy < height; yy++) {
+    const yyoffset = ox + fw * (yy + oy);
+    const yoffset = left + bw * (yy + top);
+
+    for (let xx = 0 | 0; xx < width; xx++) {
+      const F = f32[xx + yyoffset];
+
+      // todo: be?
+      const fa = F >> 24 & 0xff;
+      if (fa === 0x00) continue;
+      else if (fa === 0xff) b32[xx + yoffset] = F;
+
+      else {
+        const alpha = 1 + fa;
+        const inv_alpha = 256 - fa;
+        const B = b32[xx + yoffset];
+        const r = (alpha * (F & 0xff) + inv_alpha * (B & 0xff)) >> 8;
+        const g = (alpha * ((F >> 8) & 0xff) + inv_alpha * ((B >> 8) & 0xff)) >> 8;
+        const b = (alpha * ((F >> 16) & 0xff) + inv_alpha * ((B >> 16) & 0xff)) >> 8;
+        b32[xx + yoffset] = (Math.max(fa, (B >> 24) & 0xff) << 24) | ((b & 0xff) << 16) | ((g & 0xff) << 8) | r;
+      }
+    }
+  }
+}

package/v2/ops/{resize.js → resize.mjs}

@@ -11,9 +11,9 @@ function clamped(x, y, width, height) {
 }
 
 function hermite(A, B, C, D, t) {
-  const c = (C / 2) + (-A / 2);
-  const b = A + (2 * C) - (D / 2) - ((5 * B) / 2);
-  const a = (D / 2) + (-A / 2) + ((3 * B) / 2) - ((3 * C) / 2);
+  const c = (C / 2) + (A / -2);
+  const b = A + (C * 2) - (D / 2) - (B * 2.5);
+  const a = (D / 2) + (A / -2) + (B * 1.5) - (C * 1.5);
 
   const t2 = t * t;
   return B + (c * t) + (b * t2) + (a * t * t2);

package/v2/ops/{rotate.js → rotate.mjs}

@@ -11,12 +11,12 @@ export function rotate90(framebuffer) {
   framebuffer.width = height;
   framebuffer.height = width;
 
-  for (let y = 0 | 0; y < width; y++) {
+  for (let y = 0 | 0; y < height; y++) {
     const yoffset = y * width;
-    const height1y = height - 1 - y;
+    const heighty1 = height - 1 - y;
 
-    for (let x = 0 | 0; x < height; x++) {
-      u32[height1y + x * width] = old[x + yoffset];
+    for (let x = 0 | 0; x < width; x++) {
+      u32[heighty1 + x * height] = old[x + yoffset];
     }
   }
 }
@@ -30,12 +30,11 @@ export function rotate270(framebuffer) {
   framebuffer.width = height;
   framebuffer.height = width;
 
-  for (let y = 0 | 0; y < width; y++) {
-    const yoffset = y * width | 0;
-    const soffset = (y + width * (width - 1)) | 0;
+  for (let y = 0 | 0; y < height; y++) {
+    const yoffset = y * width;
 
-    for (let x = 0 | 0; x < height; x++) {
-      u32[soffset - x * width] = old[x + yoffset];
+    for (let x = 0 | 0; x < width; x++) {
+      u32[y + height * (width - 1 - x)] = old[x + yoffset];
     }
   }
 }

package/v2/util/{mem.js → mem.mjs}

@@ -1,4 +1,4 @@
-function view(buffer, shared = false) {
+export function view(buffer, shared = false) {
   if (buffer instanceof ArrayBuffer) return new Uint8Array(buffer);
   if (shared && buffer instanceof SharedArrayBuffer) return new Uint8Array(buffer);
   if (ArrayBuffer.isView(buffer)) return new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
@@ -6,7 +6,7 @@ function view(buffer, shared = false) {
   throw new TypeError("The provided value is not of type '(ArrayBuffer or ArrayBufferView)'");
 }
 
-function from_parts(buffers, shared = false) {
+export function from_parts(buffers, shared = false) {
   let length = 0;
   let offset = 0;
   buffers.forEach(buffer => length += (null == buffer.byteLength ? buffer.length : buffer.byteLength));
@@ -21,6 +21,4 @@ function from_parts(buffers, shared = false) {
   });
 
   return u8;
-}
-
-module.exports = { view, from_parts };
+}

package/wasm/node/png.js

@@ -0,0 +1,49 @@
+const wasm_name = 'png';
+const { join } = require('path');
+const { promises: { readFile } } = require('fs');
+const wasm_path = process.env.IMAGESCRIPT_WASM_SIMD ? 'simd' : 'any';
+
+let mod = null;
+module.exports = {
+  async init() {
+    if (!mod) mod = new WebAssembly.Module(await readFile(join(__dirname, `../${wasm_path}/${wasm_name}.wasm`)));
+
+    return this.new();
+  },
+
+  new() {
+    let u8;
+
+    const {
+      wfree, walloc, decode, memory,
+      width: wwidth, height: wheight,
+    } = new WebAssembly.Instance(mod, {
+      env: {
+        emscripten_notify_memory_growth() {
+          u8 = new Uint8Array(memory.buffer);
+        },
+      },
+    }).exports;
+  
+    u8 = new Uint8Array(memory.buffer);
+  
+    return {
+      decode(buffer) {
+        const ptr = walloc(buffer.length);
+  
+        u8.set(buffer, ptr);
+        const status = decode(ptr, buffer.length);
+  
+        wfree(ptr);
+        if (0 > status) throw new Error(`png: failed to decode (${status})`);
+  
+        const width = wwidth();
+        const height = wheight();
+        const framebuffer = u8.slice(status, status + 4 * width * height);
+  
+        wfree(status);
+        return { width, height, framebuffer };
+      },
+    };
+  }
+}

package/node/index.js

@@ -1,7 +0,0 @@
-const { arch, platform } = require('os');
-
-try {
-  module.exports = require(`./${arch()}-${platform()}.node`);
-} catch (err) {
-  throw new Error('unsupported arch/platform: ' + err.message);
-}

package/v2/ops/index.js

@@ -1,9 +0,0 @@
-export * as flip from './flip.js';
-export * as fill from './fill.js';
-export * as blur from './blur.js';
-export * as crop from './crop.js';
-export * as color from './color.js';
-export * as resize from './resize.js';
-export * as rotate from './rotate.js';
-export * as overlay from './overlay.js';
-export * as iterator from './iterator.js';

package/v2/ops/overlay.js

@@ -1,56 +0,0 @@
-import { blend } from './color.js';
-
-export function replace(bg, fg, x, y) {
-  const fwidth = fg.width | 0;
-  const bwidth = bg.width | 0;
-  const fheight = fg.height | 0;
-  const bheight = bg.height | 0;
-  let mw = Math.min(bwidth, fwidth) | 0;
-  let mh = Math.min(bheight, fheight) | 0;
-
-  const b32 = bg.u32;
-  const f32 = fg.u32;
-
-  // todo: range
-  // todo: negative speed
-  for (let yy = y | 0; yy < mh; yy++) {
-    const yoffset = yy * bwidth;
-    const yyoffset = fwidth * (yy - y);
-
-    for (let xx = x | 0; xx < mw; xx++) {
-      b32[xx + yoffset] = f32[xx - x + yyoffset];
-    }
-  }
-}
-
-export function overlay(background, foreground, x, y) {
-  x = x | 0;
-  y = y | 0;
-  const fwidth = foreground.width | 0;
-  const bwidth = background.width | 0;
-  const fheight = foreground.height | 0;
-  const bheight = background.height | 0;
-  const mw = Math.min(bwidth, fwidth) | 0;
-  const mh = Math.min(bheight, fheight) | 0;
-
-  const fview = foreground.view;
-  const bview = background.view;
-
-  // todo: fix range
-  // todo: negative perf
-  for (let yy = y | 0; yy < mh; yy++) {
-    const yoffset = yy * bwidth;
-    const yyoffset = fwidth * (yy - y);
-
-    for (let xx = x | 0; xx < mw; xx++) {
-      const offset = 4 * (xx + yoffset);
-      const fg = fview.getUint32(4 * (xx - x + yyoffset), false);
-
-      const bg = bview.getUint32(offset, false);
-      if ((fg & 0xff) === 0xff) bview.setUint32(offset, fg, false);
-      else if ((fg & 0xff) === 0x00) bview.setUint32(offset, bg, false);
-
-      else bview.setUint32(offset, blend(fg, bg), false);
-    }
-  }
-}

package/wasm/node.js

@@ -1,23 +0,0 @@
-let mod = async () => {
-  let t;
-
-  {
-    const simd = WebAssembly.validate(Uint8Array.of(0,97,115,109,1,0,0,0,1,4,1,96,0,0,3,2,1,0,10,9,1,7,0,65,0,253,15,26,11));
-    t = new WebAssembly.Module(await require('fs').promises.readFile(require('path').join(__dirname, `${simd ? 'simd' : 'unknown'}.wasm`)));
-  }
-
-  return (mod = () => t)();
-};
-
-module.exports = async function codecs() {
-  const wasm = new WebAssembly.Instance(await mod(), {});
-
-  return {
-    png: null,
-    gif: null,
-    svg: null,
-    webp: null,
-    jpeg: null,
-    tiff: null,
-  };
-}

package/wasm/web.js

@@ -1,10 +0,0 @@
-export default async function codecs() {
-  return {
-    png: null,
-    gif: null,
-    svg: null,
-    webp: null,
-    jpeg: null,
-    tiff: null,
-  };
-}