pica 7.0.0 → 9.0.0

package/lib/mm_resize/resize_wasm.js

@@ -4,6 +4,16 @@
 const createFilters = require('./resize_filter_gen');
 
 
+function hasAlpha(src, width, height) {
+  let ptr = 3, len = (width * height * 4)|0;
+  while (ptr < len) {
+    if (src[ptr] !== 255) return true;
+    ptr = (ptr + 4)|0;
+  }
+  return false;
+}
+
+
 function resetAlpha(dst, width, height) {
   let ptr = 3, len = (width * height * 4)|0;
   while (ptr < len) { dst[ptr] = 0xFF; ptr = (ptr + 4)|0; }
@@ -46,17 +56,19 @@ module.exports = function resize_wasm(options) {
   const offsetX = options.offsetX || 0.0;
   const offsetY = options.offsetY || 0.0;
   const dest    = options.dest || new Uint8Array(destW * destH * 4);
-  const quality = typeof options.quality === 'undefined' ? 3 : options.quality;
-  const alpha   = options.alpha || false;
 
-  const filtersX = createFilters(quality, srcW, destW, scaleX, offsetX),
-        filtersY = createFilters(quality, srcH, destH, scaleY, offsetY);
+  const filter = typeof options.filter === 'undefined' ? 'mks2013' : options.filter;
+  const filtersX = createFilters(filter, srcW, destW, scaleX, offsetX),
+        filtersY = createFilters(filter, srcH, destH, scaleY, offsetY);
 
   // destination is 0 too.
   const src_offset      = 0;
+  const src_size        = Math.max(src.byteLength, dest.byteLength);
   // buffer between convolve passes
-  const tmp_offset      = this.__align(src_offset + Math.max(src.byteLength, dest.byteLength));
-  const filtersX_offset = this.__align(tmp_offset + srcH * destW * 4);
+  const tmp_offset      = this.__align(src_offset + src_size);
+  const tmp_size        = srcH * destW * 4 * 2; // 2 bytes per channel
+
+  const filtersX_offset = this.__align(tmp_offset + tmp_size);
   const filtersY_offset = this.__align(filtersX_offset + filtersX.byteLength);
   const alloc_bytes     = filtersY_offset + filtersY.byteLength;
 
@@ -78,12 +90,16 @@ module.exports = function resize_wasm(options) {
   copyInt16asLE(filtersX, mem, filtersX_offset);
   copyInt16asLE(filtersY, mem, filtersY_offset);
 
-  //
   // Now call webassembly method
   // emsdk does method names with '_'
   const fn = instance.exports.convolveHV || instance.exports._convolveHV;
 
-  fn(filtersX_offset, filtersY_offset, tmp_offset, srcW, srcH, destW, destH);
+  if (hasAlpha(src, srcW, srcH)) {
+    fn(filtersX_offset, filtersY_offset, tmp_offset, srcW, srcH, destW, destH, 1);
+  } else {
+    fn(filtersX_offset, filtersY_offset, tmp_offset, srcW, srcH, destW, destH, 0);
+    resetAlpha(dest, destW, destH);
+  }
 
   //
   // Copy data back to typed array
@@ -93,11 +109,5 @@ module.exports = function resize_wasm(options) {
   const dest32 = new Uint32Array(dest.buffer);
   dest32.set(new Uint32Array(this.__memory.buffer, 0, destH * destW));
 
-  // That's faster than doing checks in convolver.
-  // !!! Note, canvas data is not premultipled. We don't need other
-  // alpha corrections.
-
-  if (!alpha) resetAlpha(dest, destW, destH);
-
   return dest;
 };

package/lib/utils.js

@@ -101,7 +101,18 @@ module.exports.cib_support = function cib_support(createCanvas) {
 
 module.exports.worker_offscreen_canvas_support = function worker_offscreen_canvas_support() {
   return new Promise((resolve, reject) => {
+    if (typeof OffscreenCanvas === 'undefined') {
+      // if OffscreenCanvas is present, we assume browser supports Worker and built-in Promise as well
+      resolve(false);
+      return;
+    }
+
     function workerPayload(self) {
+      if (typeof createImageBitmap === 'undefined') {
+        self.postMessage(false);
+        return;
+      }
+
       Promise.resolve()
         .then(() => {
           let canvas = new OffscreenCanvas(10, 10);
@@ -119,7 +130,74 @@ module.exports.worker_offscreen_canvas_support = function worker_offscreen_canva
 
     let code = btoa(`(${workerPayload.toString()})(self);`);
     let w = new Worker(`data:text/javascript;base64,${code}`);
-    w.onmessage = ev => (ev.data ? resolve() : reject());
+    w.onmessage = ev => resolve(ev.data);
     w.onerror = reject;
+  }).then(result => result, () => false);
+};
+
+
+// Check if canvas.getContext('2d').getImageData can be used,
+// FireFox randomizes the output of that function in `privacy.resistFingerprinting` mode
+module.exports.can_use_canvas = function can_use_canvas(createCanvas) {
+  let usable = false;
+  try {
+    let canvas = createCanvas(2, 1);
+    let ctx = canvas.getContext('2d');
+
+    let d = ctx.createImageData(2, 1);
+    d.data[0] = 12; d.data[1] = 23; d.data[2] = 34; d.data[3] = 255;
+    d.data[4] = 45; d.data[5] = 56; d.data[6] = 67; d.data[7] = 255;
+    ctx.putImageData(d, 0, 0);
+    d = null;
+
+    d = ctx.getImageData(0, 0, 2, 1);
+
+    if (d.data[0] === 12 && d.data[1] === 23 && d.data[2] === 34 && d.data[3] === 255 &&
+        d.data[4] === 45 && d.data[5] === 56 && d.data[6] === 67 && d.data[7] === 255) {
+      usable = true;
+    }
+  } catch (err) {}
+
+  return usable;
+};
+
+
+// Check if createImageBitmap(img, sx, sy, sw, sh) signature works correctly
+// with JPEG images oriented with Exif;
+// https://bugs.chromium.org/p/chromium/issues/detail?id=1220671
+// TODO: remove after it's fixed in chrome for at least 2 releases
+module.exports.cib_can_use_region = function cib_can_use_region() {
+  return new Promise(resolve => {
+    if (typeof createImageBitmap === 'undefined') {
+      resolve(false);
+      return;
+    }
+
+    let image = new Image();
+    image.src = 'data:image/jpeg;base64,' +
+      '/9j/4QBiRXhpZgAATU0AKgAAAAgABQESAAMAAAABAAYAAAEaAAUAAAABAAAASgEbAAUAA' +
+      'AABAAAAUgEoAAMAAAABAAIAAAITAAMAAAABAAEAAAAAAAAAAABIAAAAAQAAAEgAAAAB/9' +
+      'sAQwAEAwMEAwMEBAMEBQQEBQYKBwYGBgYNCQoICg8NEBAPDQ8OERMYFBESFxIODxUcFRc' +
+      'ZGRsbGxAUHR8dGh8YGhsa/9sAQwEEBQUGBQYMBwcMGhEPERoaGhoaGhoaGhoaGhoaGhoa' +
+      'GhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoa/8IAEQgAAQACAwERAAIRAQMRA' +
+      'f/EABQAAQAAAAAAAAAAAAAAAAAAAAf/xAAUAQEAAAAAAAAAAAAAAAAAAAAA/9oADAMBAA' +
+      'IQAxAAAAF/P//EABQQAQAAAAAAAAAAAAAAAAAAAAD/2gAIAQEAAQUCf//EABQRAQAAAAA' +
+      'AAAAAAAAAAAAAAAD/2gAIAQMBAT8Bf//EABQRAQAAAAAAAAAAAAAAAAAAAAD/2gAIAQIB' +
+      'AT8Bf//EABQQAQAAAAAAAAAAAAAAAAAAAAD/2gAIAQEABj8Cf//EABQQAQAAAAAAAAAAA' +
+      'AAAAAAAAAD/2gAIAQEAAT8hf//aAAwDAQACAAMAAAAQH//EABQRAQAAAAAAAAAAAAAAAA' +
+      'AAAAD/2gAIAQMBAT8Qf//EABQRAQAAAAAAAAAAAAAAAAAAAAD/2gAIAQIBAT8Qf//EABQ' +
+      'QAQAAAAAAAAAAAAAAAAAAAAD/2gAIAQEAAT8Qf//Z';
+
+    image.onload = () => {
+      createImageBitmap(image, 0, 0, image.width, image.height).then(bitmap => {
+        if (bitmap.width === image.width && bitmap.height === image.height) {
+          resolve(true);
+        } else {
+          resolve(false);
+        }
+      }, () => resolve(false));
+    };
+
+    image.onerror = () => resolve(false);
   });
 };

package/lib/worker.js

@@ -14,14 +14,16 @@ module.exports = function () {
 
     if (!tileOpts.src && tileOpts.srcBitmap) {
       let canvas = new OffscreenCanvas(tileOpts.width, tileOpts.height);
-      let ctx = canvas.getContext('2d', { alpha: Boolean(tileOpts.alpha) });
+      let ctx = canvas.getContext('2d');
       ctx.drawImage(tileOpts.srcBitmap, 0, 0);
       tileOpts.src = ctx.getImageData(0, 0, tileOpts.width, tileOpts.height).data;
       canvas.width = canvas.height = 0;
       canvas = null;
       tileOpts.srcBitmap.close();
       tileOpts.srcBitmap = null;
-      returnBitmap = true;
+      // Temporary force out data to typed array, because Chrome have artefacts
+      // https://github.com/nodeca/pica/issues/223
+      // returnBitmap = true;
     }
 
     if (!mathLib) mathLib = new MathLib(ev.data.features);
@@ -33,7 +35,7 @@ module.exports = function () {
     if (returnBitmap) {
       let toImageData = new ImageData(new Uint8ClampedArray(data), tileOpts.toWidth, tileOpts.toHeight);
       let canvas = new OffscreenCanvas(tileOpts.toWidth, tileOpts.toHeight);
-      let ctx = canvas.getContext('2d', { alpha: Boolean(tileOpts.alpha) });
+      let ctx = canvas.getContext('2d');
 
       ctx.putImageData(toImageData, 0, 0);
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pica",
   "description": "High quality image resize in browser.",
-  "version": "7.0.0",
+  "version": "9.0.0",
   "keywords": [
     "resize",
     "scale",
@@ -30,7 +30,6 @@
   ],
   "dependencies": {
     "glur": "^1.1.2",
-    "inherits": "^2.0.3",
     "multimath": "^2.0.0",
     "object-assign": "^4.1.1",
     "webworkify": "^1.5.0"
@@ -40,15 +39,15 @@
     "@babel/preset-env": "^7.1.0",
     "babelify": "^10.0.0",
     "benchmark": "^2.1.0",
-    "browserify": "^16.2.3",
+    "browserify": "^17.0.0",
     "browserify-header": "^1.0.1",
     "derequire": "^2.1.0",
-    "electron": "^12.0.9",
-    "electron-mocha": "^10.0.0",
-    "eslint": "^7.0.0",
+    "electron": "^16.0.4",
+    "electron-mocha": "^11.0.2",
+    "eslint": "^8.3.0",
     "gh-pages": "^3.1.0",
-    "mocha": "^8.0.1",
+    "mocha": "^9.1.3",
     "pixelmatch": "^5.0.2",
-    "terser": "^4.8.0"
+    "terser": "^5.10.0"
   }
 }

package/CHANGELOG.md

@@ -1,334 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-
-## [7.0.0] - 2021-05-23
-### Changed
-- [BREAKING] Rewrite unsharp mask, use `V` channel of HSV instead of `L` channel
-  of HSL, to reduce color shift (#209).
-- [BREAKING] Unsharp mask options are now more close to Photoshop (`unsharpAmount`
-  should be multiplied by 2 and `unsharpThreshold` should be divided by 2
-  if you switch from v6.x).
-- Splitted big `Pica` methods to smaller ones.
-- Use docker to build webassembly modules.
-
-### Added
-- Use `OffscreenCanvas` when possible (extract image bitmap in webworker).
-
-
-## [6.1.1] - 2020-08-20
-### Fixed
-- Aded Safari canvas GC workaround, #199.
-
-
-## [6.1.0] - 2020-07-10
-### Added
-- Aded OffscreenCanvas support, #195.
-
-
-## [6.0.0] - 2020-06-25
-### Changed
-- Use `dist/pica.js` as main entry. No more workarounds needed for webpack.
-- Avoid babelify dependency in dependent packages if browserify used.
-- Rewrite build scripts.
-
-### Added
-- Added `ImageBitmap` input support.
-
-
-## [5.3.0] - 2020-06-09
-### Changed
-- Use `derequire` to allow nested `browserify` for `/dist/pica.js`.
-
-
-## [5.2.0] - 2020-05-25
-### Added
-- Aded OffscreenCanvas support, #195.
-
-
-## [5.1.1] - 2020-05-18
-### Fixed
-- Suppress `createImageBitmap` errors to use fallback, #190.
-
-
-## [5.1.0] - 2019-07-15
-### Changed
-- Bump multimath dependency.
-
-### Fixed
-- Avoid possible CSP warnings, caused by WASM check, when feature not requested
-  in options.
-
-
-## [5.0.1] - 2019-07-12
-### Fixed
-- Fix unsharp crash when CIB enabled (from 4.0.0), #160.
-
-### Changed
-- Dev deps bump.
-
-
-## [5.0.0] - 2018-11-02
-### Changed
-- Maintenance, babelify upgrade: switch to @babel/core and @babel/preset-env.
-
-
-## [4.2.0] - 2018-10-25
-### Fixed
-- Added bounds check for invalid output canvas size (#155).
-
-### Changed
-- Maintenance: dev deps bump.
-
-
-## [4.1.1] - 2018-03-31
-### Changed
-- Should return result via promise (regression), fix #139.
-
-
-## [4.1.0] - 2018-03-27
-### Changed
-- Resize in multiple steps for big scales, fix #135.
-
-
-## [4.0.2] - 2018-03-05
-### Fixed
-- Multimath bump, should fix issue with broken WebAssembly engine in IOS 11.2.x
-  Webkit (Safary/Chrome).
-
-
-## [4.0.1] - 2017-10-13
-### Fixed
-- Attempt to fix failure when WebAssembly disabled via CSP.
-
-
-## [4.0.0] - 2017-09-30
-### Changed
-- Internals rewritten to use `multimath` library.
-- WebAssembly implementation for `unsharp mask`, as bonus.
-
-
-## [3.0.6] - 2017-07-13
-### Fixed
-- More constrains for `createImageBitmap()` use. Filter out browsers
-  without `ImageBitmap.prototype.close()` method (Chrome 51 etc).
-
-
-## [3.0.5] - 2017-06-30
-### Fixed
-- Avoid Promise use in webworker. Should help with IE11, which suddently
-  fixed creating of webworkers from data URI.
-
-
-## [3.0.4] - 2017-04-20
-### Fixed
-- IE fix.
-
-
-## [3.0.3] - 2017-04-18
-### Fixed
-- Fixed non working `.createImageBitmap()` resize, but disabled
-  by default due bad quality.
-
-### Added
-- Added debug messages.
-
-
-## [3.0.2] - 2017-04-16
-### Fixed
-- Fix wasm crash on upscale, #87.
-
-
-## [3.0.1] - 2017-04-14
-### Fixed
-- Add missed `.set()` fallback for ancient browsers.
-
-
-## [3.0.0] - 2017-04-11
-### Added
-- Add WebAssembly resizer.
-- Add createImageBitmap() resizer.
-- Add .toBlob() method.
-
-### Changed
-- Major rewrite. New API, promise-based.
-- Add async image decode via createImageBitmap().
-
-### Removed
-- Drop WebGL resizer.
-
-
-## [2.0.8] - 2016-10-01
-### Changed
-- Set default number of CPUs (workers) to 1 if `navigator.hardwareConcurrency`
-  not supported (ancient browsers).
-
-
-## [2.0.7] - 2016-10-01
-### Fixed
-- Fix Safary bug (grid could appear on downscaled image).
-
-### Changed
-- WEBGL shaders rework (still buggy, not for production).
-
-
-## [2.0.6] - 2016-08-04
-### Fixed
-- Fix tiler math: bad rounding could produce tiles out of src area, #61.
-
-
-## [2.0.5] - 2016-07-19
-### Fixed
-- Fix mem leak: release objectURL, used to create Web Workers.
-
-
-## [2.0.4] - 2016-06-24
-### Changed
-- Deps bump (`webworkify`). Previous version had problems with IE Edge, #56.
-
-
-## [2.0.3] - 2016-06-07
-### Changed
-- Deps bump. Use fresh `webworkify` with proper ObjectURL release, #55.
-
-
-## [2.0.2] - 2016-03-30
-### Changed
-- Optimised previous fix.
-
-
-## [2.0.1] - 2016-03-30
-### Fixed
-- Fixed garbage on image edge tiles when alpha exists.
-
-
-## [2.0.0] - 2016-03-12
-### Added
-- Support `Image()` as input src.
-
-### Changed
-- Architecture rework: images are now splitted to tiles to restrict memory use
-  and allow parallel processing.
-- Built-in WebWorkers manager to use all available CPU cores.
-- Feature flags (WW, WEBGL) are forced to `false` after resize call,
-  if feature not supported or disabled due fatal error.
-- `unsharpRadius` range restricted to 0.5..2.0.
-- Experimental code for WebGL support (noisy & buggy, disabled by default).
-- `.resizeBuffer()` is no longer recommended for use. It does not use webworkers
-  anymore (and option `transferable` is not used too).
-
-
-## [1.1.1] - 2015-11-10
-### Changed
-- Bumped `glur` version to fix bug in unsharp mask with vertical images.
-
-
-## [1.1.0] - 2015-11-09
-### Changed
-- Unsharp mask now useable.
-
-
-## [1.0.8] - 2015-10-28
-### Fixed
-- Fixed brightness loss due missed value rounding in convolvers.
-
-
-## [1.0.7] - 2014-11-18
-### Fixed
-- Fixed alpha reset for images without alpha channel (regression in 1.0.5).
-
-
-## [1.0.6] - 2014-11-08
-### Changed
-- Removed alpha correction, because canvas data is not premultipled (#13).
-  Thanks to @devongovett.
-
-
-## [1.0.5] - 2014-11-03
-### Changed
-- Expose WebWorker on pica call, to allow early termination of task.
-- Minor speed opts.
-
-
-## [1.0.4] - 2014-10-04
-### Added
-- Added transferable objects support.
-
-### Fixed
-- Fixed demo to fork over ssl too.
-
-
-## [1.0.3] - 2014-09-29
-### Added
-- Added unsharp mask implementation (very naive). Need futher work.
-
-### Changed
-- ~25% speed boost (thanks to @mraleph for advice).
-
-
-## [1.0.2] - 2014-09-27
-### Fixed
-- Improved capabilities detection.
-- `.WW` now shows if pica can use Web Workers or not.
-
-
-## [1.0.1] - 2014-09-25
-### Added
-- Enchanced API to allow pass destination buffer by reference.
-
-### Fixed
-- Added IE workarounds. Thanks to @noomorph.
-
-
-## [1.0.0] - 2014-09-24
-### Changed
-- First release.
-
-
-[7.0.0]: https://github.com/nodeca/pica/compare/6.1.1...7.0.0
-[6.1.1]: https://github.com/nodeca/pica/compare/6.1.0...6.1.1
-[6.1.0]: https://github.com/nodeca/pica/compare/6.0.0...6.1.0
-[6.0.0]: https://github.com/nodeca/pica/compare/5.3.0...6.0.0
-[5.3.0]: https://github.com/nodeca/pica/compare/5.2.0...5.3.0
-[5.2.0]: https://github.com/nodeca/pica/compare/5.1.1...5.2.0
-[5.1.1]: https://github.com/nodeca/pica/compare/5.1.0...5.1.1
-[5.1.0]: https://github.com/nodeca/pica/compare/5.0.1...5.1.0
-[5.0.1]: https://github.com/nodeca/pica/compare/5.0.0...5.0.1
-[5.0.0]: https://github.com/nodeca/pica/compare/4.2.0...5.0.0
-[4.2.0]: https://github.com/nodeca/pica/compare/4.1.1...4.2.0
-[4.1.1]: https://github.com/nodeca/pica/compare/4.1.0...4.1.1
-[4.1.0]: https://github.com/nodeca/pica/compare/4.0.2...4.1.0
-[4.0.2]: https://github.com/nodeca/pica/compare/4.0.1...4.0.2
-[4.0.1]: https://github.com/nodeca/pica/compare/4.0.0...4.0.1
-[4.0.0]: https://github.com/nodeca/pica/compare/3.0.6...4.0.0
-[3.0.6]: https://github.com/nodeca/pica/compare/3.0.5...3.0.6
-[3.0.5]: https://github.com/nodeca/pica/compare/3.0.4...3.0.5
-[3.0.4]: https://github.com/nodeca/pica/compare/3.0.3...3.0.4
-[3.0.3]: https://github.com/nodeca/pica/compare/3.0.2...3.0.3
-[3.0.2]: https://github.com/nodeca/pica/compare/3.0.1...3.0.2
-[3.0.1]: https://github.com/nodeca/pica/compare/3.0.0...3.0.1
-[3.0.0]: https://github.com/nodeca/pica/compare/2.0.8...3.0.0
-[2.0.8]: https://github.com/nodeca/pica/compare/2.0.7...2.0.8
-[2.0.7]: https://github.com/nodeca/pica/compare/2.0.6...2.0.7
-[2.0.6]: https://github.com/nodeca/pica/compare/2.0.5...2.0.6
-[2.0.5]: https://github.com/nodeca/pica/compare/2.0.4...2.0.5
-[2.0.4]: https://github.com/nodeca/pica/compare/2.0.3...2.0.4
-[2.0.3]: https://github.com/nodeca/pica/compare/2.0.2...2.0.3
-[2.0.2]: https://github.com/nodeca/pica/compare/2.0.1...2.0.2
-[2.0.1]: https://github.com/nodeca/pica/compare/2.0.0...2.0.1
-[2.0.0]: https://github.com/nodeca/pica/compare/1.1.1...2.0.0
-[1.1.1]: https://github.com/nodeca/pica/compare/1.1.0...1.1.1
-[1.1.0]: https://github.com/nodeca/pica/compare/1.0.8...1.1.0
-[1.0.8]: https://github.com/nodeca/pica/compare/1.0.7...1.0.8
-[1.0.7]: https://github.com/nodeca/pica/compare/1.0.6...1.0.7
-[1.0.6]: https://github.com/nodeca/pica/compare/1.0.5...1.0.6
-[1.0.5]: https://github.com/nodeca/pica/compare/1.0.4...1.0.5
-[1.0.4]: https://github.com/nodeca/pica/compare/1.0.3...1.0.4
-[1.0.3]: https://github.com/nodeca/pica/compare/1.0.2...1.0.3
-[1.0.2]: https://github.com/nodeca/pica/compare/1.0.1...1.0.2
-[1.0.1]: https://github.com/nodeca/pica/compare/1.0.0...1.0.1
-[1.0.0]: https://github.com/nodeca/pica/releases/tag/1.0.0