Skip to content

Make images smaller using best-in-class codecs, right in the browser.

JavaScript

Fix PNG decoder returning Rust-owned ImageData

Ingvar Stepanyan5758e5db9ae6
diff --git a/codecs/png/package.json b/codecs/png/package.json
index 5e22d088..552448fd 100644
--- a/codecs/png/package.json
+++ b/codecs/png/package.json
@@ -1,6 +1,6 @@
{
"name": "oxipng",
"scripts": {
- "build": "../build-rust.sh rm -rf pkg && wasm-pack build --target web -- --verbose --locked && rm pkg/.gitignore"
+ "build": "../build-rust.sh"
}
}
diff --git a/codecs/png/pkg/squoosh_png.d.ts b/codecs/png/pkg/squoosh_png.d.ts
index 46614316..5670650b 100644
--- a/codecs/png/pkg/squoosh_png.d.ts
+++ b/codecs/png/pkg/squoosh_png.d.ts
@@ -19,10 +19,8 @@ export interface InitOutput {
readonly memory: WebAssembly.Memory;
readonly encode: (a: number, b: number, c: number, d: number, e: number) => void;
readonly decode: (a: number, b: number) => number;
- readonly __wbindgen_malloc: (a: number) => number;
- readonly __wbindgen_realloc: (a: number, b: number, c: number) => number;
readonly __wbindgen_free: (a: number, b: number) => void;
- readonly __wbindgen_exn_store: (a: number) => void;
+ readonly __wbindgen_malloc: (a: number) => number;
}
/**
diff --git a/codecs/png/pkg/squoosh_png.js b/codecs/png/pkg/squoosh_png.js
index 651ae14d..1a9ef331 100644
--- a/codecs/png/pkg/squoosh_png.js
+++ b/codecs/png/pkg/squoosh_png.js
@@ -1,93 +1,33 @@
let wasm;
+let cachegetUint8ClampedMemory0 = null;
+function getUint8ClampedMemory0() {
+ if (cachegetUint8ClampedMemory0 === null || cachegetUint8ClampedMemory0.buffer !== wasm.memory.buffer) {
+ cachegetUint8ClampedMemory0 = new Uint8ClampedArray(wasm.memory.buffer);
+ }
+ return cachegetUint8ClampedMemory0;
+}
+
+function getClampedArrayU8FromWasm0(ptr, len) {
+ return getUint8ClampedMemory0().subarray(ptr / 1, ptr / 1 + len);
+}
+
const heap = new Array(32).fill(undefined);
heap.push(undefined, null, true, false);
-function getObject(idx) { return heap[idx]; }
-
let heap_next = heap.length;
-function dropObject(idx) {
- if (idx < 36) return;
- heap[idx] = heap_next;
- heap_next = idx;
-}
-
-function takeObject(idx) {
- const ret = getObject(idx);
- dropObject(idx);
- return ret;
-}
+function addHeapObject(obj) {
+ if (heap_next === heap.length) heap.push(heap.length + 1);
+ const idx = heap_next;
+ heap_next = heap[idx];
-function debugString(val) {
- // primitive types
- const type = typeof val;
- if (type == 'number' || type == 'boolean' || val == null) {
- return `${val}`;
- }
- if (type == 'string') {
- return `"${val}"`;
- }
- if (type == 'symbol') {
- const description = val.description;
- if (description == null) {
- return 'Symbol';
- } else {
- return `Symbol(${description})`;
- }
- }
- if (type == 'function') {
- const name = val.name;
- if (typeof name == 'string' && name.length > 0) {
- return `Function(${name})`;
- } else {
- return 'Function';
- }
- }
- // objects
- if (Array.isArray(val)) {
- const length = val.length;
- let debug = '[';
- if (length > 0) {
- debug += debugString(val[0]);
- }
- for(let i = 1; i < length; i++) {
- debug += ', ' + debugString(val[i]);
- }
- debug += ']';
- return debug;
- }
- // Test for built-in
- const builtInMatches = /\[object ([^\]]+)\]/.exec(toString.call(val));
- let className;
- if (builtInMatches.length > 1) {
- className = builtInMatches[1];
- } else {
- // Failed to match the standard '[object ClassName]'
- return toString.call(val);
- }
- if (className == 'Object') {
- // we're a user defined class or Object
- // JSON.stringify avoids problems with cycles, and is generally much
- // easier than looping through ownProperties of `val`.
- try {
- return 'Object(' + JSON.stringify(val) + ')';
- } catch (_) {
- return 'Object';
- }
- }
- // errors
- if (val instanceof Error) {
- return `${val.name}: ${val.message}\n${val.stack}`;
- }
- // TODO we could test for more things here, like `Set`s and `Map`s.
- return className;
+ heap[idx] = obj;
+ return idx;
}
-let WASM_VECTOR_LEN = 0;
-
let cachegetUint8Memory0 = null;
function getUint8Memory0() {
if (cachegetUint8Memory0 === null || cachegetUint8Memory0.buffer !== wasm.memory.buffer) {
@@ -96,56 +36,12 @@ function getUint8Memory0() {
return cachegetUint8Memory0;
}
-let cachedTextEncoder = new TextEncoder('utf-8');
-
-const encodeString = (typeof cachedTextEncoder.encodeInto === 'function'
- ? function (arg, view) {
- return cachedTextEncoder.encodeInto(arg, view);
-}
- : function (arg, view) {
- const buf = cachedTextEncoder.encode(arg);
- view.set(buf);
- return {
- read: arg.length,
- written: buf.length
- };
-});
-
-function passStringToWasm0(arg, malloc, realloc) {
-
- if (realloc === undefined) {
- const buf = cachedTextEncoder.encode(arg);
- const ptr = malloc(buf.length);
- getUint8Memory0().subarray(ptr, ptr + buf.length).set(buf);
- WASM_VECTOR_LEN = buf.length;
- return ptr;
- }
-
- let len = arg.length;
- let ptr = malloc(len);
-
- const mem = getUint8Memory0();
-
- let offset = 0;
-
- for (; offset < len; offset++) {
- const code = arg.charCodeAt(offset);
- if (code > 0x7F) break;
- mem[ptr + offset] = code;
- }
-
- if (offset !== len) {
- if (offset !== 0) {
- arg = arg.slice(offset);
- }
- ptr = realloc(ptr, len, len = offset + arg.length * 3);
- const view = getUint8Memory0().subarray(ptr + offset, ptr + len);
- const ret = encodeString(arg, view);
-
- offset += ret.written;
- }
+let WASM_VECTOR_LEN = 0;
- WASM_VECTOR_LEN = offset;
+function passArray8ToWasm0(arg, malloc) {
+ const ptr = malloc(arg.length * 1);
+ getUint8Memory0().set(arg, ptr / 1);
+ WASM_VECTOR_LEN = arg.length;
return ptr;
}
@@ -157,21 +53,6 @@ function getInt32Memory0() {
return cachegetInt32Memory0;
}
-let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
-
-cachedTextDecoder.decode();
-
-function getStringFromWasm0(ptr, len) {
- return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
-}
-
-function passArray8ToWasm0(arg, malloc) {
- const ptr = malloc(arg.length * 1);
- getUint8Memory0().set(arg, ptr / 1);
- WASM_VECTOR_LEN = arg.length;
- return ptr;
-}
-
function getArrayU8FromWasm0(ptr, len) {
return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
}
@@ -183,8 +64,8 @@ function getArrayU8FromWasm0(ptr, len) {
*/
export function encode(data, width, height) {
try {
- const retptr = wasm.__wbindgen_export_2.value - 16;
- wasm.__wbindgen_export_2.value = retptr;
+ const retptr = wasm.__wbindgen_export_1.value - 16;
+ wasm.__wbindgen_export_1.value = retptr;
var ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
var len0 = WASM_VECTOR_LEN;
wasm.encode(retptr, ptr0, len0, width, height);
@@ -194,10 +75,23 @@ export function encode(data, width, height) {
wasm.__wbindgen_free(r0, r1 * 1);
return v1;
} finally {
- wasm.__wbindgen_export_2.value += 16;
+ wasm.__wbindgen_export_1.value += 16;
}
}
+function getObject(idx) { return heap[idx]; }
+
+function dropObject(idx) {
+ if (idx < 36) return;
+ heap[idx] = heap_next;
+ heap_next = idx;
+}
+
+function takeObject(idx) {
+ const ret = getObject(idx);
+ dropObject(idx);
+ return ret;
+}
/**
* @param {Uint8Array} data
* @returns {ImageData}
@@ -209,38 +103,6 @@ export function decode(data) {
return takeObject(ret);
}
-let cachegetUint8ClampedMemory0 = null;
-function getUint8ClampedMemory0() {
- if (cachegetUint8ClampedMemory0 === null || cachegetUint8ClampedMemory0.buffer !== wasm.memory.buffer) {
- cachegetUint8ClampedMemory0 = new Uint8ClampedArray(wasm.memory.buffer);
- }
- return cachegetUint8ClampedMemory0;
-}
-
-function getClampedArrayU8FromWasm0(ptr, len) {
- return getUint8ClampedMemory0().subarray(ptr / 1, ptr / 1 + len);
-}
-
-function addHeapObject(obj) {
- if (heap_next === heap.length) heap.push(heap.length + 1);
- const idx = heap_next;
- heap_next = heap[idx];
-
- heap[idx] = obj;
- return idx;
-}
-
-function handleError(f) {
- return function () {
- try {
- return f.apply(this, arguments);
-
- } catch (e) {
- wasm.__wbindgen_exn_store(addHeapObject(e));
- }
- };
-}
-
async function load(module, imports) {
if (typeof Response === 'function' && module instanceof Response) {
@@ -280,22 +142,11 @@ async function init(input) {
}
const imports = {};
imports.wbg = {};
- imports.wbg.__wbg_newwithu8clampedarrayandsh_104cc36644cfc313 = handleError(function(arg0, arg1, arg2, arg3) {
- var ret = new ImageData(getClampedArrayU8FromWasm0(arg0, arg1), arg2 >>> 0, arg3 >>> 0);
+ imports.wbg.__wbg_newwithownedu8clampedarrayandsh_787b2db8ea6bfd62 = function(arg0, arg1, arg2, arg3) {
+ var v0 = getClampedArrayU8FromWasm0(arg0, arg1).slice();
+ wasm.__wbindgen_free(arg0, arg1 * 1);
+ var ret = new ImageData(v0, arg2 >>> 0, arg3 >>> 0);
return addHeapObject(ret);
- });
- imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
- takeObject(arg0);
- };
- imports.wbg.__wbindgen_debug_string = function(arg0, arg1) {
- var ret = debugString(getObject(arg1));
- var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
- var len0 = WASM_VECTOR_LEN;
- getInt32Memory0()[arg0 / 4 + 1] = len0;
- getInt32Memory0()[arg0 / 4 + 0] = ptr0;
- };
- imports.wbg.__wbindgen_throw = function(arg0, arg1) {
- throw new Error(getStringFromWasm0(arg0, arg1));
};
if (typeof input === 'string' || (typeof Request === 'function' && input instanceof Request) || (typeof URL === 'function' && input instanceof URL)) {
diff --git a/codecs/png/pkg/squoosh_png_bg.wasm b/codecs/png/pkg/squoosh_png_bg.wasm
index a0ad39c3..65f76eaa 100644
Binary files a/codecs/png/pkg/squoosh_png_bg.wasm and b/codecs/png/pkg/squoosh_png_bg.wasm differ
diff --git a/codecs/png/pkg/squoosh_png_bg.wasm.d.ts b/codecs/png/pkg/squoosh_png_bg.wasm.d.ts
index 87b40bef..dda8850f 100644
--- a/codecs/png/pkg/squoosh_png_bg.wasm.d.ts
+++ b/codecs/png/pkg/squoosh_png_bg.wasm.d.ts
@@ -3,7 +3,5 @@
export const memory: WebAssembly.Memory;
export function encode(a: number, b: number, c: number, d: number, e: number): void;
export function decode(a: number, b: number): number;
-export function __wbindgen_malloc(a: number): number;
-export function __wbindgen_realloc(a: number, b: number, c: number): number;
export function __wbindgen_free(a: number, b: number): void;
-export function __wbindgen_exn_store(a: number): void;
+export function __wbindgen_malloc(a: number): number;
diff --git a/codecs/png/src/lib.rs b/codecs/png/src/lib.rs
index 11f05476..4dccd08b 100644
--- a/codecs/png/src/lib.rs
+++ b/codecs/png/src/lib.rs
@@ -1,7 +1,22 @@
use std::io::Cursor;
use wasm_bindgen::prelude::*;
-use web_sys::ImageData;
+use wasm_bindgen::Clamped;
+
+// Custom ImageData bindings to allow construction with
+// a JS-owned copy of the data.
+#[wasm_bindgen]
+extern "C" {
+ #[wasm_bindgen(typescript_type = ImageData)]
+ pub type ImageData;
+
+ #[wasm_bindgen(constructor)]
+ fn new_with_owned_u8_clamped_array_and_sh(
+ data: Clamped<Vec<u8>>,
+ sw: u32,
+ sh: u32,
+ ) -> ImageData;
+}
#[wasm_bindgen(catch)]
pub fn encode(data: &[u8], width: u32, height: u32) -> Vec<u8> {
@@ -38,10 +53,9 @@ pub fn decode(data: &[u8]) -> ImageData {
}
}
- ImageData::new_with_u8_clamped_array_and_sh(
- wasm_bindgen::Clamped(&mut buf),
+ ImageData::new_with_owned_u8_clamped_array_and_sh(
+ wasm_bindgen::Clamped(buf),
info.width,
info.height,
)
- .unwrap()
}