@thi.ng/pixel-dither 1.1.88 → 1.1.90

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2023-12-03T12:13:31Z
+- **Last updated**: 2023-12-11T10:07:09Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.

package/api.js

@@ -1 +0,0 @@
-export {};

package/atkinson.js

@@ -1,14 +1,9 @@
-/**
- * (Bill) Atkinson dither kernel
- *
- * @remarks
- * References:
- * - https://beyondloom.com/blog/dither.html
- * - https://tannerhelland.com/2012/12/28/dithering-eleven-algorithms-source-code.html
- */
-export const ATKINSON = {
-    ox: [1, 2, -1, 0, 1, 0],
-    oy: [0, 0, 1, 1, 1, 2],
-    weights: [1, 1, 1, 1, 1, 1],
-    shift: 3,
+const ATKINSON = {
+  ox: [1, 2, -1, 0, 1, 0],
+  oy: [0, 0, 1, 1, 1, 2],
+  weights: [1, 1, 1, 1, 1, 1],
+  shift: 3
+};
+export {
+  ATKINSON
 };

package/burkes.js

@@ -1,13 +1,9 @@
-/**
- * Burkes dither kernel (similar/improved version of {@link STUCKI}).
- *
- * @remarks
- * References:
- * - https://tannerhelland.com/2012/12/28/dithering-eleven-algorithms-source-code.html
- */
-export const BURKES = {
-    ox: [1, 2, -2, -1, 0, 1, 2],
-    oy: [0, 0, 1, 1, 1, 1, 1],
-    weights: [8, 4, 2, 4, 8, 4, 2],
-    shift: 5,
+const BURKES = {
+  ox: [1, 2, -2, -1, 0, 1, 2],
+  oy: [0, 0, 1, 1, 1, 1, 1],
+  weights: [8, 4, 2, 4, 8, 4, 2],
+  shift: 5
+};
+export {
+  BURKES
 };

package/diffusion.js

@@ -1,28 +1,24 @@
-/**
- * Basic 1D (row-based) error diffusion.
- */
-export const DIFFUSION_ROW = {
-    ox: [1],
-    oy: [0],
-    weights: [1],
-    shift: 0,
-    // x2: width - 1,
+const DIFFUSION_ROW = {
+  ox: [1],
+  oy: [0],
+  weights: [1],
+  shift: 0
+  // x2: width - 1,
 };
-/**
- * Basic 1D (column-based) error diffusion.
- */
-export const DIFFUSION_COLUMN = {
-    ox: [0],
-    oy: [1],
-    weights: [1],
-    shift: 0,
+const DIFFUSION_COLUMN = {
+  ox: [0],
+  oy: [1],
+  weights: [1],
+  shift: 0
 };
-/**
- * Basic 2D error diffusion
- */
-export const DIFFUSION_2D = {
-    ox: [1, 0],
-    oy: [0, 1],
-    weights: [1, 1],
-    shift: 1,
+const DIFFUSION_2D = {
+  ox: [1, 0],
+  oy: [0, 1],
+  weights: [1, 1],
+  shift: 1
+};
+export {
+  DIFFUSION_2D,
+  DIFFUSION_COLUMN,
+  DIFFUSION_ROW
 };

package/dither.js

@@ -1,47 +1,40 @@
 import { range } from "@thi.ng/pixel/range";
-/**
- * Generic kernel-based dithering. Takes a {@link DitherKernelFactory} and
- * integer pixel buffer (multiple channels supported). Applies dithering to all
- * (or configured) channels using provided options. Returns modified pixel
- * buffer.
- *
- * @param kernel -
- * @param img -
- * @param opts -
- */
-export const ditherWith = (kernel, img, opts) => {
-    const { channels, bleed, threshold } = {
-        bleed: 1,
-        threshold: 0.5,
-        ...opts,
-    };
-    const { format, width, height } = img;
-    const { ox, oy, weights, shift } = kernel;
-    let p, err;
-    for (let cid of channels || range(format.channels.length)) {
-        const cimg = img.getChannel(cid);
-        const chan = format.channels[cid];
-        const $thresh = chan.num * threshold;
-        const $max = chan.mask0;
-        const data = new Int32Array(cimg.data);
-        for (let y = 0; y < height; y++) {
-            for (let x = 0, i = x + y * width; x < width; x++, i++) {
-                p = data[i] < $thresh ? 0 : $max;
-                err = (data[i] - p) * bleed;
-                data[i] = p;
-                if (!err)
-                    continue;
-                for (let j = ox.length; j-- > 0;) {
-                    const xx = x + ox[j];
-                    const yy = y + oy[j];
-                    if (yy >= 0 && yy < height && xx >= 0 && xx < width) {
-                        data[yy * width + xx] += (err * weights[j]) >> shift;
-                    }
-                }
-            }
+const ditherWith = (kernel, img, opts) => {
+  const { channels, bleed, threshold } = {
+    bleed: 1,
+    threshold: 0.5,
+    ...opts
+  };
+  const { format, width, height } = img;
+  const { ox, oy, weights, shift } = kernel;
+  let p, err;
+  for (let cid of channels || range(format.channels.length)) {
+    const cimg = img.getChannel(cid);
+    const chan = format.channels[cid];
+    const $thresh = chan.num * threshold;
+    const $max = chan.mask0;
+    const data = new Int32Array(cimg.data);
+    for (let y = 0; y < height; y++) {
+      for (let x = 0, i = x + y * width; x < width; x++, i++) {
+        p = data[i] < $thresh ? 0 : $max;
+        err = (data[i] - p) * bleed;
+        data[i] = p;
+        if (!err)
+          continue;
+        for (let j = ox.length; j-- > 0; ) {
+          const xx = x + ox[j];
+          const yy = y + oy[j];
+          if (yy >= 0 && yy < height && xx >= 0 && xx < width) {
+            data[yy * width + xx] += err * weights[j] >> shift;
+          }
         }
-        cimg.data.set(data);
-        img.setChannel(cid, cimg);
+      }
     }
-    return img;
+    cimg.data.set(data);
+    img.setChannel(cid, cimg);
+  }
+  return img;
+};
+export {
+  ditherWith
 };

package/floyd-steinberg.js

@@ -1,14 +1,9 @@
-/**
- * Floyd-Steinberg dither kernel.
- *
- * @remarks
- * References:
- * - https://en.wikipedia.org/wiki/Floyd%E2%80%93Steinberg_dithering
- * - https://tannerhelland.com/2012/12/28/dithering-eleven-algorithms-source-code.html
- */
-export const FLOYD_STEINBERG = {
-    ox: [1, -1, 0, 1],
-    oy: [0, 1, 1, 1],
-    weights: [7, 3, 5, 1],
-    shift: 4,
+const FLOYD_STEINBERG = {
+  ox: [1, -1, 0, 1],
+  oy: [0, 1, 1, 1],
+  weights: [7, 3, 5, 1],
+  shift: 4
+};
+export {
+  FLOYD_STEINBERG
 };

package/jarvis.js

@@ -2,17 +2,12 @@ const A = 64 / 48;
 const B = 3 * A;
 const C = 5 * A;
 const D = 7 * A;
-/**
- * Jarvis-Judice-Ninke dither kernel.
- *
- * @remarks
- * References:
- * - https://en.wikipedia.org/wiki/Error_diffusion#minimized_average_error
- * - https://tannerhelland.com/2012/12/28/dithering-eleven-algorithms-source-code.html
- */
-export const JARVIS_JUDICE_NINKE = {
-    ox: [1, 2, -2, -1, 0, 1, 2, -2, -1, 0, 1, 2],
-    oy: [0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2],
-    weights: [D, C, B, C, D, C, B, A, B, C, B, A],
-    shift: 6,
+const JARVIS_JUDICE_NINKE = {
+  ox: [1, 2, -2, -1, 0, 1, 2, -2, -1, 0, 1, 2],
+  oy: [0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2],
+  weights: [D, C, B, C, D, C, B, A, B, C, B, A],
+  shift: 6
+};
+export {
+  JARVIS_JUDICE_NINKE
 };

package/ordered.js

@@ -1,91 +1,53 @@
 import { isNumber } from "@thi.ng/checks/is-number";
 import { clamp } from "@thi.ng/math/interval";
 const init = (x, y, size, val, step, mat) => {
-    if (size === 1) {
-        !mat[y] && (mat[y] = []);
-        mat[y][x] = val;
-        return mat;
-    }
-    size >>= 1;
-    const step4 = step << 2;
-    init(x, y, size, val, step4, mat);
-    init(x + size, y + size, size, val + step, step4, mat);
-    init(x + size, y, size, val + step * 2, step4, mat);
-    init(x, y + size, size, val + step * 3, step4, mat);
+  if (size === 1) {
+    !mat[y] && (mat[y] = []);
+    mat[y][x] = val;
     return mat;
+  }
+  size >>= 1;
+  const step4 = step << 2;
+  init(x, y, size, val, step4, mat);
+  init(x + size, y + size, size, val + step, step4, mat);
+  init(x + size, y, size, val + step * 2, step4, mat);
+  init(x, y + size, size, val + step * 3, step4, mat);
+  return mat;
 };
-/**
- * Creates a Bayer matrix of given kernel size (power of 2) for ordered
- * dithering and use with {@link ditherPixels}
- *
- * @remarks
- * Reference:
- * - https://en.wikipedia.org/wiki/Ordered_dithering
- *
- * @param size -
- */
-export const defBayer = (size) => ({
-    mat: init(0, 0, size, 0, 1, []),
-    invSize: 1 / (size * size),
-    mask: size - 1,
+const defBayer = (size) => ({
+  mat: init(0, 0, size, 0, 1, []),
+  invSize: 1 / (size * size),
+  mask: size - 1
 });
-/**
- * Single-channel/value ordered dither using provided Bayer matrix.
- *
- * @param mat -  matrix
- * @param dsteps - number of dest colors
- * @param drange - dest color range
- * @param srange - src color range
- * @param x - x pos
- * @param y - y pos
- * @param val - src value
- *
- * @internal
- */
 const orderedDither1 = ({ mat, mask, invSize }, dsteps, drange, srange, x, y, val) => {
-    val =
-        (dsteps * (val / srange) + mat[y & mask][x & mask] * invSize - 0.5) | 0;
-    dsteps--;
-    return clamp(val, 0, dsteps) * ((drange - 1) / dsteps);
+  val = dsteps * (val / srange) + mat[y & mask][x & mask] * invSize - 0.5 | 0;
+  dsteps--;
+  return clamp(val, 0, dsteps) * ((drange - 1) / dsteps);
 };
-/**
- * Applies in-place, ordered dithering using provided dither matrix
- * (or matrix size) and desired number of dither levels, optionally
- * specified individually (per channel). Each channel is be
- * processed independently. Channels can be excluded from dithering
- * by setting their target colors to zero or negative numbers.
- *
- * @remarks
- * A `size` of 1 will result in simple posterization of each
- * channel. The `numColors` value(s) MUST be in the `[0 ..
- * numColorsInChannel]` interval.
- *
- * Also see: {@link defBayer}
- *
- * @param img - pixel buffer
- * @param size - bayer dither matrix/size
- * @param numColors - num target colors/steps
- */
-export const orderedDither = (img, size, numColors) => {
-    const { data, format, width } = img;
-    const steps = isNumber(numColors)
-        ? new Array(format.channels.length).fill(numColors)
-        : numColors;
-    const mat = isNumber(size) ? defBayer(size) : size;
-    for (let i = 0, n = data.length, nc = format.channels.length, x = 0, y = 0; i < n; i++) {
-        let col = data[i];
-        for (let j = 0; j < nc; j++) {
-            const ch = format.channels[j];
-            const num = ch.num;
-            const cs = steps[j];
-            cs > 0 &&
-                (col = ch.setInt(col, orderedDither1(mat, cs, num, num, x, y, ch.int(col))));
-        }
-        data[i] = col;
-        if (++x === width) {
-            x = 0;
-            y++;
-        }
+const orderedDither = (img, size, numColors) => {
+  const { data, format, width } = img;
+  const steps = isNumber(numColors) ? new Array(format.channels.length).fill(numColors) : numColors;
+  const mat = isNumber(size) ? defBayer(size) : size;
+  for (let i = 0, n = data.length, nc = format.channels.length, x = 0, y = 0; i < n; i++) {
+    let col = data[i];
+    for (let j = 0; j < nc; j++) {
+      const ch = format.channels[j];
+      const num = ch.num;
+      const cs = steps[j];
+      cs > 0 && (col = ch.setInt(
+        col,
+        orderedDither1(mat, cs, num, num, x, y, ch.int(col))
+      ));
+    }
+    data[i] = col;
+    if (++x === width) {
+      x = 0;
+      y++;
     }
-    return img;
+  }
+  return img;
+};
+export {
+  defBayer,
+  orderedDither
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/pixel-dither",
-  "version": "1.1.88",
+  "version": "1.1.90",
   "description": "Extensible image dithering w/ various algorithm presets",
   "type": "module",
   "module": "./index.js",
@@ -24,7 +24,9 @@
   "author": "Karsten Schmidt (https://thi.ng)",
   "license": "Apache-2.0",
   "scripts": {
-    "build": "yarn clean && tsc --declaration",
+    "build": "yarn build:esbuild && yarn build:decl",
+    "build:decl": "tsc --declaration --emitDeclarationOnly",
+    "build:esbuild": "esbuild --format=esm --platform=neutral --target=es2022 --tsconfig=tsconfig.json --outdir=. src/**/*.ts",
     "clean": "rimraf --glob '*.js' '*.d.ts' '*.map' doc",
     "doc": "typedoc --excludePrivate --excludeInternal --out doc src/index.ts",
     "doc:ae": "mkdir -p .ae/doc .ae/temp && api-extractor run --local --verbose",
@@ -33,13 +35,13 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@thi.ng/checks": "^3.4.10",
-    "@thi.ng/math": "^5.7.5",
-    "@thi.ng/pixel": "^5.0.2"
+    "@thi.ng/checks": "^3.4.12",
+    "@thi.ng/math": "^5.7.7",
+    "@thi.ng/pixel": "^5.0.4"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.38.3",
-    "@thi.ng/testament": "^0.4.3",
+    "esbuild": "^0.19.8",
     "rimraf": "^5.0.5",
     "tools": "^0.0.1",
     "typedoc": "^0.25.4",
@@ -104,5 +106,5 @@
     "parent": "@thi.ng/pixel",
     "year": 2021
   },
-  "gitHead": "04d1de79f256d7a53c6b5fd157b37f49bc88e11d\n"
+  "gitHead": "5e7bafedfc3d53bc131469a28de31dd8e5b4a3ff\n"
 }

package/sierra2.js

@@ -1,13 +1,9 @@
-/**
- * (Frankie) Sierra's 2-row dither kernel.
- *
- * @remarks
- * References:
- * - https://tannerhelland.com/2012/12/28/dithering-eleven-algorithms-source-code.html
- */
-export const SIERRA2 = {
-    ox: [1, 2, -2, -1, 0, 1, 2],
-    oy: [0, 0, 1, 1, 1, 1, 1],
-    weights: [4, 3, 1, 2, 3, 2, 1],
-    shift: 4,
+const SIERRA2 = {
+  ox: [1, 2, -2, -1, 0, 1, 2],
+  oy: [0, 0, 1, 1, 1, 1, 1],
+  weights: [4, 3, 1, 2, 3, 2, 1],
+  shift: 4
+};
+export {
+  SIERRA2
 };

package/stucki.js

@@ -2,16 +2,12 @@ const A = 64 / 42;
 const B = 2 * A;
 const C = 4 * A;
 const D = 8 * A;
-/**
- * Stucki dither kernel (similar/improved version of {@link JARVIS_JUDICE_NINKE}).
- *
- * @remarks
- * References:
- * - https://tannerhelland.com/2012/12/28/dithering-eleven-algorithms-source-code.html
- */
-export const STUCKI = {
-    ox: [1, 2, -2, -1, 0, 1, 2, -2, -1, 0, 1, 2],
-    oy: [0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2],
-    weights: [D, C, B, C, D, C, B, A, B, C, B, A],
-    shift: C,
+const STUCKI = {
+  ox: [1, 2, -2, -1, 0, 1, 2, -2, -1, 0, 1, 2],
+  oy: [0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2],
+  weights: [D, C, B, C, D, C, B, A, B, C, B, A],
+  shift: C
+};
+export {
+  STUCKI
 };

package/threshold.js

@@ -1,9 +1,9 @@
-/**
- * Basic 1x1 thresold dither kernel
- */
-export const THRESHOLD = {
-    ox: [],
-    oy: [],
-    weights: [],
-    shift: 0,
+const THRESHOLD = {
+  ox: [],
+  oy: [],
+  weights: [],
+  shift: 0
+};
+export {
+  THRESHOLD
 };