lol this was meant to be 10 seconds.

.nvmrc

@@ -1 +0,0 @@
-10.16.2

.travis.yml

@@ -1,4 +1,7 @@
 language: node_js
+node_js:
+- node
+- 10
+- 8
 cache: npm
 script: npm run build
-after_success: npm run sizereport

_redirects.ejs

@@ -1,2 +0,0 @@
-/index.html / 301
-/* /index.html 301

codecs/hqx/.gitignore

@@ -1,5 +0,0 @@
-**/*.rs.bk
-target
-Cargo.lock
-bin/
-pkg/README.md

codecs/hqx/Cargo.toml

@@ -1,37 +0,0 @@
-[package]
-name = "squooshhqx"
-version = "0.1.0"
-authors = ["Surma <surma@surma.link>"]
-
-[lib]
-crate-type = ["cdylib"]
-
-[features]
-default = ["console_error_panic_hook", "wee_alloc"]
-
-[dependencies]
-cfg-if = "0.1.2"
-wasm-bindgen = "0.2.38"
-# lazy_static = "1.0.0"
-hqx = {git = "https://github.com/CryZe/wasmboy-rs", tag="v0.1.2"}
-
-# The `console_error_panic_hook` crate provides better debugging of panics by
-# logging them with `console.error`. This is great for development, but requires
-# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
-# code size when deploying.
-console_error_panic_hook = { version = "0.1.1", optional = true }
-
-# `wee_alloc` is a tiny allocator for wasm that is only ~1K in code size
-# compared to the default allocator's ~10K. It is slower than the default
-# allocator, however.
-#
-# Unfortunately, `wee_alloc` requires nightly Rust when targeting wasm for now.
-wee_alloc = { version = "0.4.2", optional = true }
-
-[dev-dependencies]
-wasm-bindgen-test = "0.2"
-
-[profile.release]
-# Tell `rustc` to optimize for small code size.
-opt-level = "s"
-lto = true

codecs/hqx/Dockerfile

@@ -1,12 +0,0 @@
-FROM rust
-RUN rustup target add wasm32-unknown-unknown
-RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-
-RUN mkdir /opt/binaryen && \
- curl -L https://github.com/WebAssembly/binaryen/releases/download/1.38.32/binaryen-1.38.32-x86-linux.tar.gz  | tar -xzf - -C /opt/binaryen --strip 1
-
-RUN mkdir /opt/wabt && \
- curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.11/wabt-1.0.11-linux.tar.gz  | tar -xzf - -C /opt/wabt --strip 1
-
-ENV PATH="/opt/binaryen:/opt/wabt:${PATH}"
-WORKDIR /src

codecs/hqx/build.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -e
-
-echo "============================================="
-echo "Compiling wasm"
-echo "============================================="
-(
-  wasm-pack build
-  wasm-strip pkg/squooshhqx_bg.wasm
-  echo "Optimising Wasm so it doesn't break Chrome (this takes like 10-15mins. get a cup of tea)"
-  echo "Once https://crbug.com/974804 is fixed, we can remove this step"
-  wasm-opt -Os --no-validation -o pkg/squooshhqx_bg.wasm pkg/squooshhqx_bg.wasm
-  rm pkg/.gitignore
-)
-echo "============================================="
-echo "Compiling wasm  done"
-echo "============================================="
-
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-echo "Did you update your docker image?"
-echo "Run \`docker pull ubuntu\`"
-echo "Run \`docker pull rust\`"
-echo "Run \`docker build -t squoosh-hqx .\`"
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/hqx/package-lock.json

@@ -1,4 +0,0 @@
-{
-  "name": "hqx",
-  "lockfileVersion": 1
-}

codecs/hqx/package.json

@@ -1,7 +0,0 @@
-{
-  "name": "hqx",
-  "scripts": {
-    "build:image": "docker build -t squoosh-hqx .",
-    "build": "docker run --rm -v $(pwd):/src squoosh-hqx ./build.sh"
-  }
-}

codecs/hqx/pkg/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "squooshhqx",
-  "collaborators": [
-    "Surma <surma@surma.link>"
-  ],
-  "version": "0.1.0",
-  "files": [
-    "squooshhqx_bg.wasm",
-    "squooshhqx.js",
-    "squooshhqx.d.ts"
-  ],
-  "module": "squooshhqx.js",
-  "types": "squooshhqx.d.ts",
-  "sideEffects": "false"
-}

codecs/hqx/pkg/squooshhqx.d.ts

@@ -1,9 +0,0 @@
-/* tslint:disable */
-/**
-* @param {Uint32Array} input_image 
-* @param {number} input_width 
-* @param {number} input_height 
-* @param {number} factor 
-* @returns {Uint32Array} 
-*/
-export function resize(input_image: Uint32Array, input_width: number, input_height: number, factor: number): Uint32Array;

codecs/hqx/pkg/squooshhqx.js

@@ -1,46 +0,0 @@
-import * as wasm from './squooshhqx_bg.wasm';
-
-let cachegetUint32Memory = null;
-function getUint32Memory() {
-    if (cachegetUint32Memory === null || cachegetUint32Memory.buffer !== wasm.memory.buffer) {
-        cachegetUint32Memory = new Uint32Array(wasm.memory.buffer);
-    }
-    return cachegetUint32Memory;
-}
-
-let WASM_VECTOR_LEN = 0;
-
-function passArray32ToWasm(arg) {
-    const ptr = wasm.__wbindgen_malloc(arg.length * 4);
-    getUint32Memory().set(arg, ptr / 4);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-}
-
-let cachegetInt32Memory = null;
-function getInt32Memory() {
-    if (cachegetInt32Memory === null || cachegetInt32Memory.buffer !== wasm.memory.buffer) {
-        cachegetInt32Memory = new Int32Array(wasm.memory.buffer);
-    }
-    return cachegetInt32Memory;
-}
-
-function getArrayU32FromWasm(ptr, len) {
-    return getUint32Memory().subarray(ptr / 4, ptr / 4 + len);
-}
-/**
-* @param {Uint32Array} input_image
-* @param {number} input_width
-* @param {number} input_height
-* @param {number} factor
-* @returns {Uint32Array}
-*/
-export function resize(input_image, input_width, input_height, factor) {
-    const retptr = 8;
-    const ret = wasm.resize(retptr, passArray32ToWasm(input_image), WASM_VECTOR_LEN, input_width, input_height, factor);
-    const memi32 = getInt32Memory();
-    const v0 = getArrayU32FromWasm(memi32[retptr / 4 + 0], memi32[retptr / 4 + 1]).slice();
-    wasm.__wbindgen_free(memi32[retptr / 4 + 0], memi32[retptr / 4 + 1] * 4);
-    return v0;
-}
-

codecs/hqx/pkg/squooshhqx_bg.d.ts

@@ -1,5 +0,0 @@
-/* tslint:disable */
-export const memory: WebAssembly.Memory;
-export function __wbindgen_malloc(a: number): number;
-export function __wbindgen_free(a: number, b: number): void;
-export function resize(a: number, b: number, c: number, d: number, e: number, f: number): void;

codecs/hqx/src/lib.rs

@@ -1,55 +0,0 @@
-extern crate cfg_if;
-extern crate hqx;
-extern crate wasm_bindgen;
-
-mod utils;
-
-use cfg_if::cfg_if;
-use wasm_bindgen::prelude::*;
-
-cfg_if! {
-    // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
-    // allocator.
-    if #[cfg(feature = "wee_alloc")] {
-        extern crate wee_alloc;
-        #[global_allocator]
-        static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
-    }
-}
-
-#[wasm_bindgen]
-#[no_mangle]
-pub fn resize(
-    input_image: Vec<u32>,
-    input_width: usize,
-    input_height: usize,
-    factor: usize,
-) -> Vec<u32> {
-    let num_output_pixels = input_width * input_height * factor * factor;
-    let mut output_image = Vec::<u32>::with_capacity(num_output_pixels * 4);
-    output_image.resize(num_output_pixels, 0);
-
-    match factor {
-        2 => hqx::hq2x(
-            input_image.as_slice(),
-            output_image.as_mut_slice(),
-            input_width,
-            input_height,
-        ),
-        3 => hqx::hq3x(
-            input_image.as_slice(),
-            output_image.as_mut_slice(),
-            input_width,
-            input_height,
-        ),
-        4 => hqx::hq4x(
-            input_image.as_slice(),
-            output_image.as_mut_slice(),
-            input_width,
-            input_height,
-        ),
-        _ => unreachable!(),
-    };
-
-    return output_image;
-}

codecs/hqx/src/utils.rs

@@ -1,17 +0,0 @@
-use cfg_if::cfg_if;
-
-cfg_if! {
-    // When the `console_error_panic_hook` feature is enabled, we can call the
-    // `set_panic_hook` function at least once during initialization, and then
-    // we will get better error messages if our code ever panics.
-    //
-    // For more details see
-    // https://github.com/rustwasm/console_error_panic_hook#readme
-    if #[cfg(feature = "console_error_panic_hook")] {
-        extern crate console_error_panic_hook;
-        pub use self::console_error_panic_hook::set_once as set_panic_hook;
-    } else {
-        #[inline]
-        pub fn set_panic_hook() {}
-    }
-}

codecs/imagequant/package.json

@@ -8,6 +8,6 @@
     "libimagequant": "ImageOptim/libimagequant#2.12.1"
   },
   "devDependencies": {
-    "napa": "3.0.0"
+    "napa": "^3.0.0"
   }
 }

codecs/mozjpeg_enc/package.json

@@ -8,6 +8,6 @@
     "mozjpeg": "mozilla/mozjpeg#v3.3.1"
   },
   "devDependencies": {
-    "napa": "3.0.0"
+    "napa": "^3.0.0"
   }
 }

codecs/optipng/.gitignore

@@ -0,0 +1,2 @@
+build/
+*.o

codecs/optipng/README.md

@@ -0,0 +1,26 @@
+# OptiPNG
+
+- Source: <https://sourceforge.net/project/optipng>
+- Version: v0.7.7
+
+## Dependencies
+
+- Docker
+
+## Example
+
+See `example.html`
+
+## API
+
+### `int version()`
+
+Returns the version of optipng as a number. va.b.c is encoded as 0x0a0b0c
+
+### `ArrayBuffer compress(std::string buffer, {level})`;
+
+`compress` will re-compress the given PNG image via `buffer`. `level` is a number between 0 and 7.
+
+### `void free_result()`
+
+Frees the result created by `compress()`.

codecs/optipng/build.sh

@@ -0,0 +1,87 @@
+#!/bin/bash
+
+set -e
+
+export OPTIMIZE="-Os"
+export PREFIX="/src/build"
+export CFLAGS="${OPTIMIZE} -I${PREFIX}/include/"
+export CPPFLAGS="${OPTIMIZE} -I${PREFIX}/include/"
+export LDFLAGS="${OPTIMIZE} -L${PREFIX}/lib/"
+
+apt-get update
+apt-get install -qqy autoconf libtool
+
+echo "============================================="
+echo "Compiling zlib"
+echo "============================================="
+test -n "$SKIP_ZLIB" || (
+  cd node_modules/zlib
+  emconfigure ./configure --prefix=${PREFIX}/
+  emmake make
+  emmake make install
+)
+echo "============================================="
+echo "Compiling zlib done"
+echo "============================================="
+
+echo "============================================="
+echo "Compiling libpng"
+echo "============================================="
+test -n "$SKIP_LIBPNG" || (
+  cd node_modules/libpng
+  autoreconf -i
+  emconfigure ./configure --with-zlib-prefix=${PREFIX}/ --prefix=${PREFIX}/
+  emmake make
+  emmake make install
+)
+echo "============================================="
+echo "Compiling libpng done"
+echo "============================================="
+
+echo "============================================="
+echo "Compiling optipng"
+echo "============================================="
+(
+  emcc \
+    ${OPTIMIZE} \
+    -Wno-implicit-function-declaration \
+    -I ${PREFIX}/include \
+    -I node_modules/optipng/src/opngreduc \
+    -I node_modules/optipng/src/pngxtern \
+    -I node_modules/optipng/src/cexcept \
+    -I node_modules/optipng/src/gifread \
+    -I node_modules/optipng/src/pnmio \
+    -I node_modules/optipng/src/minitiff \
+    --std=c99 -c \
+    node_modules/optipng/src/opngreduc/*.c \
+    node_modules/optipng/src/pngxtern/*.c \
+    node_modules/optipng/src/gifread/*.c \
+    node_modules/optipng/src/minitiff/*.c \
+    node_modules/optipng/src/pnmio/*.c \
+    node_modules/optipng/src/optipng/*.c
+
+  emcc \
+    --bind \
+    ${OPTIMIZE} \
+    -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=1 -s 'EXPORT_NAME="optipng"' \
+    -I ${PREFIX}/include \
+    -I node_modules/optipng/src/opngreduc \
+    -I node_modules/optipng/src/pngxtern \
+    -I node_modules/optipng/src/cexcept \
+    -I node_modules/optipng/src/gifread \
+    -I node_modules/optipng/src/pnmio \
+    -I node_modules/optipng/src/minitiff \
+    -o "optipng.js" \
+    --std=c++11 \
+    optipng.cpp \
+    *.o \
+    ${PREFIX}/lib/libz.so ${PREFIX}/lib/libpng.a
+)
+echo "============================================="
+echo "Compiling optipng done"
+echo "============================================="
+
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+echo "Did you update your docker image?"
+echo "Run \`docker pull trzeci/emscripten\`"
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/optipng/example.html

@@ -0,0 +1,19 @@
+<!doctype html>
+<script src='optipng.js'></script>
+<script>
+  const Module = optipng();
+
+  Module.onRuntimeInitialized = async _ => {
+    console.log('Version:', Module.version().toString(16));
+    const image = await fetch('../example_palette.png').then(r => r.arrayBuffer());
+    const newImage = Module.compress(image, {level: 3});
+    console.log('done');
+    Module.free_result();
+
+    console.log(`Old size: ${image.byteLength}, new size: ${newImage.byteLength} (${newImage.byteLength/image.byteLength*100}%)`);
+    const blobURL = URL.createObjectURL(new Blob([newImage], {type: 'image/png'}));
+    const img = document.createElement('img');
+    img.src = blobURL;
+    document.body.appendChild(img);
+  };
+</script>

codecs/optipng/optipng.cpp

@@ -0,0 +1,53 @@
+#include "emscripten/bind.h"
+#include "emscripten/val.h"
+
+#include <stdio.h>
+
+using namespace emscripten;
+
+extern "C" int main(int argc, char *argv[]);
+
+int version() {
+  // FIXME (@surma): Haven’t found a version in optipng :(
+  return 0;
+}
+
+struct OptiPngOpts {
+  int level;
+};
+
+uint8_t* result;
+val compress(std::string png, OptiPngOpts opts) {
+  remove("input.png");
+  remove("output.png");
+  FILE* infile = fopen("input.png", "wb");
+  fwrite(png.c_str(), png.length(), 1, infile);
+  fflush(infile);
+  fclose(infile);
+
+  char optlevel[8];
+  sprintf(&optlevel[0], "-o%d", opts.level);
+  char* args[] = {"optipng", optlevel, "-out", "output.png", "input.png"};
+  main(5, args);
+
+  FILE *outfile = fopen("output.png", "rb");
+  fseek(outfile, 0, SEEK_END);
+  int fsize = ftell(outfile);
+  result = (uint8_t*) malloc(fsize);
+  fseek(outfile, 0, SEEK_SET);
+  fread(result, fsize, 1, outfile);
+  return val(typed_memory_view(fsize, result));
+}
+
+void free_result() {
+  free(result);
+}
+
+EMSCRIPTEN_BINDINGS(my_module) {
+  value_object<OptiPngOpts>("OptiPngOpts")
+    .field("level", &OptiPngOpts::level);
+
+  function("version", &version);
+  function("compress", &compress);
+  function("free_result", &free_result);
+}

codecs/optipng/optipng.d.ts

@@ -0,0 +1,10 @@
+import {EncodeOptions} from "src/codecs/optipng/encoder";
+
+export interface OptiPngModule extends EmscriptenWasm.Module {
+  compress(data: BufferSource, opts: EncodeOptions): Uint8Array;
+  free_result(): void;
+}
+
+export default function(opts: EmscriptenWasm.ModuleOpts): OptiPngModule;
+
+

codecs/optipng/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "optipng",
+  "scripts": {
+    "install": "tar-dependency install && napa",
+    "build": "npm run build:wasm",
+    "build:wasm": "docker run --rm -v $(pwd):/src -e SKIP_ZLIB=\"${SKIP_ZLIB}\" -e SKIP_LIBPNG=\"${SKIP_LIBPNG}\" trzeci/emscripten ./build.sh"
+  },
+  "tarDependencies": {
+    "node_modules/optipng": {
+      "url": "https://netcologne.dl.sourceforge.net/project/optipng/OptiPNG/optipng-0.7.7/optipng-0.7.7.tar.gz",
+      "strip": 1
+    }
+  },
+  "napa": {
+    "libpng": "emscripten-ports/libpng",
+    "zlib": "emscripten-ports/zlib"
+  },
+  "dependencies": {
+    "napa": "^3.0.0",
+    "tar-dependency": "0.0.3"
+  }
+}

codecs/oxipng/.gitignore

@@ -1 +0,0 @@
-/target

codecs/oxipng/Cargo.lock

@@ -1,501 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "adler32"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "autocfg"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "bit-vec"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "build_const"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "bumpalo"
-version = "3.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "bytemuck"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "byteorder"
-version = "1.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "cc"
-version = "1.0.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "cloudflare-zlib"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cloudflare-zlib-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "cloudflare-zlib-sys"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crc"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memoffset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "deflate"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "either"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "image"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytemuck 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-iter 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-rational 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "png 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "inflate"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "itertools"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "libc"
-version = "0.2.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "libdeflater"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "log"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "memoffset"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "hermit-abi 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "oxipng"
-version = "0.1.0"
-dependencies = [
- "oxipng 2.3.0 (git+https://github.com/shssoichiro/oxipng.git)",
- "wasm-bindgen 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "oxipng"
-version = "2.3.0"
-source = "git+https://github.com/shssoichiro/oxipng.git#f74726915131ec7ff1df0514436aac34bc603cff"
-dependencies = [
- "bit-vec 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "cloudflare-zlib 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "image 0.23.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libdeflater 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rgb 0.8.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "zopfli 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "png"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "deflate 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rayon"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rgb"
-version = "0.8.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "syn"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "typed-arena"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bumpalo 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro-support 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-backend 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "zopfli"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "typed-arena 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[metadata]
-"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
-"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
-"checksum bit-vec 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a4523a10839ffae575fb08aa3423026c8cb4687eef43952afb956229d4f246f7"
-"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39"
-"checksum bumpalo 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "12ae9db68ad7fac5fe51304d20f016c911539251075a214f8e663babefa35187"
-"checksum bytemuck 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37fa13df2292ecb479ec23aa06f4507928bef07839be9ef15281411076629431"
-"checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
-"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
-"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-"checksum cloudflare-zlib 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f5ed63a019d55bacd15cadcbcb96bf41b16281417fff393bdb55fa84255fe4b9"
-"checksum cloudflare-zlib-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7e195cb274a0d6ee87e718838a09baecd7cbc9f6075dac256a84cb5842739c06"
-"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb"
-"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
-"checksum crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
-"checksum crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
-"checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db"
-"checksum crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-"checksum deflate 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "050ef6de42a33903b30a7497b76b40d3d58691d4d3eec355348c122444a388f0"
-"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
-"checksum hermit-abi 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "725cf19794cf90aa94e65050cb4191ff5d8fa87a498383774c47b332e3af952e"
-"checksum image 0.23.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9062b90712d25bc6bb165d110aa59c6b47c849246e341e7b86a98daff9d49f60"
-"checksum indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292"
-"checksum inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff"
-"checksum itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
-"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)" = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
-"checksum libdeflater 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "66dca08b13369865b2f6dca1dd05f833985cbe6c12a676b04d55f78b85e80246"
-"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-"checksum memoffset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8"
-"checksum miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5"
-"checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
-"checksum num-iter 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "dfb0800a0291891dd9f4fe7bd9c19384f98f7fbe0cd0f39a2c6b88b9868bbc00"
-"checksum num-rational 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
-"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
-"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6"
-"checksum oxipng 2.3.0 (git+https://github.com/shssoichiro/oxipng.git)" = "<none>"
-"checksum png 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)" = "46060468187c21c00ffa2a920690b29997d7fd543f5a4d400461e4a7d4fccde8"
-"checksum proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3"
-"checksum quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
-"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
-"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
-"checksum rgb 0.8.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5ec4ab2cf0b27e111e266e161cf7f9efd20125a161190da1c0945c4a4408fef3"
-"checksum scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-"checksum syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03"
-"checksum typed-arena 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9b2228007eba4120145f785df0f6c92ea538f5a3635a612ecf4e334c8c1446d"
-"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-"checksum wasm-bindgen 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "2cc57ce05287f8376e998cbddfb4c8cb43b84a7ec55cf4551d7c00eef317a47f"
-"checksum wasm-bindgen-backend 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "d967d37bf6c16cca2973ca3af071d0a2523392e4a594548155d89a678f4237cd"
-"checksum wasm-bindgen-macro 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "8bd151b63e1ea881bb742cd20e1d6127cef28399558f3b5d415289bc41eee3a4"
-"checksum wasm-bindgen-macro-support 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "d68a5b36eef1be7868f668632863292e37739656a80fc4b9acec7b0bd35a4931"
-"checksum wasm-bindgen-shared 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "daf76fe7d25ac79748a37538b7daeed1c7a6867c92d3245c12c6222e4a20d639"
-"checksum zopfli 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4079b79464426ade2a1b0177fb0ce8396ba6b4084267407e333573c666073964"

codecs/oxipng/Cargo.toml

@@ -1,20 +0,0 @@
-[package]
-name = "oxipng"
-version = "0.1.0"
-authors = ["Ingvar Stepanyan <me@rreverser.com>"]
-edition = "2018"
-publish = false
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-oxipng = { version = "2.3.0", default-features = false }
-wasm-bindgen = "0.2.48"
-
-[profile.release]
-lto = true
-opt-level = "s"
-
-[patch.crates-io]
-oxipng = { git = "https://github.com/shssoichiro/oxipng.git", branch = "master" }

codecs/oxipng/Dockerfile

@@ -1,12 +0,0 @@
-FROM rust
-RUN rustup target add wasm32-unknown-unknown
-RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-
-RUN mkdir /opt/wabt && \
- curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.11/wabt-1.0.11-linux.tar.gz  | tar -xzf - -C /opt/wabt --strip 1
-
-RUN mkdir /opt/wasi-sdk && \
-  curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-8/wasi-sdk-8.0-linux.tar.gz | tar -xzf - -C /opt/wasi-sdk --strip 1
-
-ENV PATH="/opt/wabt:/opt/wasi-sdk/bin:${PATH}"
-WORKDIR /src

codecs/oxipng/build.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -e
-
-echo "============================================="
-echo "Compiling wasm"
-echo "============================================="
-(
-  wasm-pack build
-  wasm-strip pkg/oxipng_bg.wasm
-  rm pkg/.gitignore
-)
-echo "============================================="
-echo "Compiling wasm  done"
-echo "============================================="
-
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-echo "Did you update your docker image?"
-echo "Run \`docker pull ubuntu\`"
-echo "Run \`docker pull rust\`"
-echo "Run \`docker build -t squoosh-oxipng .\`"
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/oxipng/package-lock.json

@@ -1,4 +0,0 @@
-{
-  "name": "oxipng",
-  "lockfileVersion": 1
-}

codecs/oxipng/package.json

@@ -1,7 +0,0 @@
-{
-  "name": "oxipng",
-  "scripts": {
-    "build:image": "docker build -t squoosh-oxipng .",
-    "build": "docker run --rm -v $(pwd):/src squoosh-oxipng ./build.sh"
-  }
-}

codecs/oxipng/pkg/oxipng.d.ts

@@ -1,8 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
-* @param {Uint8Array} data 
-* @param {number} level 
-* @returns {Uint8Array} 
-*/
-export function optimise(data: Uint8Array, level: number): Uint8Array;

codecs/oxipng/pkg/oxipng.js

@@ -1,60 +0,0 @@
-import * as wasm from './oxipng_bg.wasm';
-
-const lTextDecoder = typeof TextDecoder === 'undefined' ? require('util').TextDecoder : TextDecoder;
-
-let cachedTextDecoder = new lTextDecoder('utf-8', { ignoreBOM: true, fatal: true });
-
-cachedTextDecoder.decode();
-
-let cachegetUint8Memory0 = null;
-function getUint8Memory0() {
-    if (cachegetUint8Memory0 === null || cachegetUint8Memory0.buffer !== wasm.memory.buffer) {
-        cachegetUint8Memory0 = new Uint8Array(wasm.memory.buffer);
-    }
-    return cachegetUint8Memory0;
-}
-
-function getStringFromWasm0(ptr, len) {
-    return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
-}
-
-let WASM_VECTOR_LEN = 0;
-
-function passArray8ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 1);
-    getUint8Memory0().set(arg, ptr / 1);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-}
-
-let cachegetInt32Memory0 = null;
-function getInt32Memory0() {
-    if (cachegetInt32Memory0 === null || cachegetInt32Memory0.buffer !== wasm.memory.buffer) {
-        cachegetInt32Memory0 = new Int32Array(wasm.memory.buffer);
-    }
-    return cachegetInt32Memory0;
-}
-
-function getArrayU8FromWasm0(ptr, len) {
-    return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
-}
-/**
-* @param {Uint8Array} data
-* @param {number} level
-* @returns {Uint8Array}
-*/
-export function optimise(data, level) {
-    var ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
-    var len0 = WASM_VECTOR_LEN;
-    wasm.optimise(8, ptr0, len0, level);
-    var r0 = getInt32Memory0()[8 / 4 + 0];
-    var r1 = getInt32Memory0()[8 / 4 + 1];
-    var v1 = getArrayU8FromWasm0(r0, r1).slice();
-    wasm.__wbindgen_free(r0, r1 * 1);
-    return v1;
-}
-
-export const __wbindgen_throw = function(arg0, arg1) {
-    throw new Error(getStringFromWasm0(arg0, arg1));
-};
-

codecs/oxipng/pkg/oxipng_bg.d.ts

@@ -1,8 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-export const memory: WebAssembly.Memory;
-export function optimise(a: number, b: number, c: number, d: number): void;
-export function malloc(a: number): number;
-export function free(a: number): void;
-export function __wbindgen_malloc(a: number): number;
-export function __wbindgen_free(a: number, b: number): void;

codecs/oxipng/pkg/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "oxipng",
-  "collaborators": [
-    "Ingvar Stepanyan <me@rreverser.com>"
-  ],
-  "version": "0.1.0",
-  "files": [
-    "oxipng_bg.wasm",
-    "oxipng.js",
-    "oxipng.d.ts"
-  ],
-  "module": "oxipng.js",
-  "types": "oxipng.d.ts",
-  "sideEffects": false
-}

codecs/oxipng/src/lib.rs

@@ -1,10 +0,0 @@
-mod malloc_shim;
-
-use wasm_bindgen::prelude::*;
-
-#[wasm_bindgen(catch)]
-pub fn optimise(data: &[u8], level: u8) -> Vec<u8> {
-  let mut options = oxipng::Options::from_preset(level);
-  options.deflate = oxipng::Deflaters::Libdeflater;
-  oxipng::optimize_from_memory(data, &options).unwrap_throw()
-}

codecs/oxipng/src/malloc_shim.rs

@@ -1,27 +0,0 @@
-//! This is a module that provides `malloc` and `free` for `libdeflate`.
-//! These implementations are compatible with the standard signatures
-//! but use Rust allocator instead of including libc one as well.
-//!
-//! I've raised an upstream issue to hopefully make this easier in
-//! future: https://github.com/ebiggers/libdeflate/issues/62
-
-use std::alloc::*;
-use std::mem::{align_of, size_of};
-
-unsafe fn layout_for(size: usize) -> Layout {
-    Layout::from_size_align_unchecked(size_of::<usize>() + size, align_of::<usize>())
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn malloc(size: usize) -> *mut u8 {
-    let size_and_data_ptr = alloc(layout_for(size));
-    *(size_and_data_ptr as *mut usize) = size;
-    size_and_data_ptr.add(size_of::<usize>())
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn free(ptr: *mut u8) {
-    let size_and_data_ptr = ptr.sub(size_of::<usize>());
-    let size = *(size_and_data_ptr as *const usize);
-    dealloc(ptr, layout_for(size))
-}

codecs/resize/.gitignore

@@ -1,6 +0,0 @@
-**/*.rs.bk
-target
-Cargo.lock
-bin/
-pkg/README.md
-lut.inc

codecs/resize/Cargo.toml

@@ -1,37 +0,0 @@
-[package]
-name = "resize"
-version = "0.1.0"
-authors = ["Surma <surma@surma.link>"]
-
-[lib]
-#crate-type = ["cdylib", "rlib"]
-crate-type = ["cdylib"]
-
-[features]
-default = ["console_error_panic_hook", "wee_alloc"]
-
-[dependencies]
-cfg-if = "0.1.2"
-wasm-bindgen = "0.2.38"
-resize = "0.3.0"
-
-# The `console_error_panic_hook` crate provides better debugging of panics by
-# logging them with `console.error`. This is great for development, but requires
-# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
-# code size when deploying.
-console_error_panic_hook = { version = "0.1.1", optional = true }
-
-# `wee_alloc` is a tiny allocator for wasm that is only ~1K in code size
-# compared to the default allocator's ~10K. It is slower than the default
-# allocator, however.
-#
-# Unfortunately, `wee_alloc` requires nightly Rust when targeting wasm for now.
-wee_alloc = { version = "0.4.2", optional = true }
-
-[dev-dependencies]
-wasm-bindgen-test = "0.2"
-
-[profile.release]
-# Tell `rustc` to optimize for small code size.
-opt-level = "s"
-lto = true

codecs/resize/Dockerfile

@@ -1,9 +0,0 @@
-FROM rust
-RUN rustup target add wasm32-unknown-unknown
-RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-
-RUN mkdir /opt/wabt && \
- curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.11/wabt-1.0.11-linux.tar.gz  | tar -xzf - -C /opt/wabt --strip 1
-
-ENV PATH="/opt/wabt:${PATH}"
-WORKDIR /src

codecs/resize/build.rs

@@ -1,23 +0,0 @@
-include!("./src/srgb.rs");
-
-use std::io::Write;
-
-fn main() -> std::io::Result<()> {
-    let mut srgb_to_linear_lut = String::from("static SRGB_TO_LINEAR_LUT: [f32; 256] = [");
-    let mut linear_to_srgb_lut = String::from("static LINEAR_TO_SRGB_LUT: [f32; 256] = [");
-    for i in 0..256 {
-        srgb_to_linear_lut.push_str(&format!("{0:.7}", srgb_to_linear((i as f32) / 255.0)));
-        srgb_to_linear_lut.push_str(",");
-        linear_to_srgb_lut.push_str(&format!("{0:.7}", linear_to_srgb((i as f32) / 255.0)));
-        linear_to_srgb_lut.push_str(",");
-    }
-    srgb_to_linear_lut.pop().unwrap();
-    linear_to_srgb_lut.pop().unwrap();
-    srgb_to_linear_lut.push_str("];");
-    linear_to_srgb_lut.push_str("];");
-
-    let mut file = std::fs::File::create("src/lut.inc")?;
-    file.write_all(srgb_to_linear_lut.as_bytes())?;
-    file.write_all(linear_to_srgb_lut.as_bytes())?;
-    Ok(())
-}

codecs/resize/build.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -e
-
-echo "============================================="
-echo "Compiling wasm"
-echo "============================================="
-(
-  wasm-pack build
-  wasm-strip pkg/resize_bg.wasm
-  rm pkg/.gitignore
-)
-echo "============================================="
-echo "Compiling wasm  done"
-echo "============================================="
-
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-echo "Did you update your docker image?"
-echo "Run \`docker pull ubuntu\`"
-echo "Run \`docker pull rust\`"
-echo "Run \`docker build -t squoosh-resize .\`"
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/resize/package-lock.json

@@ -1,4 +0,0 @@
-{
-  "name": "resize",
-  "lockfileVersion": 1
-}

codecs/resize/package.json

@@ -1,7 +0,0 @@
-{
-  "name": "resize",
-  "scripts": {
-    "build:image": "docker build -t squoosh-resize .",
-    "build": "docker run --rm -v $(pwd):/src squoosh-resize ./build.sh"
-  }
-}

codecs/resize/pkg/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "resize",
-  "collaborators": [
-    "Surma <surma@surma.link>"
-  ],
-  "version": "0.1.0",
-  "files": [
-    "resize_bg.wasm",
-    "resize.js",
-    "resize.d.ts"
-  ],
-  "module": "resize.js",
-  "types": "resize.d.ts",
-  "sideEffects": "false"
-}

codecs/resize/pkg/resize.d.ts

@@ -1,13 +0,0 @@
-/* tslint:disable */
-/**
-* @param {Uint8Array} input_image 
-* @param {number} input_width 
-* @param {number} input_height 
-* @param {number} output_width 
-* @param {number} output_height 
-* @param {number} typ_idx 
-* @param {boolean} premultiply 
-* @param {boolean} color_space_conversion 
-* @returns {Uint8Array} 
-*/
-export function resize(input_image: Uint8Array, input_width: number, input_height: number, output_width: number, output_height: number, typ_idx: number, premultiply: boolean, color_space_conversion: boolean): Uint8Array;

codecs/resize/pkg/resize.js

@@ -1,50 +0,0 @@
-import * as wasm from './resize_bg.wasm';
-
-let cachegetUint8Memory = null;
-function getUint8Memory() {
-    if (cachegetUint8Memory === null || cachegetUint8Memory.buffer !== wasm.memory.buffer) {
-        cachegetUint8Memory = new Uint8Array(wasm.memory.buffer);
-    }
-    return cachegetUint8Memory;
-}
-
-let WASM_VECTOR_LEN = 0;
-
-function passArray8ToWasm(arg) {
-    const ptr = wasm.__wbindgen_malloc(arg.length * 1);
-    getUint8Memory().set(arg, ptr / 1);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-}
-
-let cachegetInt32Memory = null;
-function getInt32Memory() {
-    if (cachegetInt32Memory === null || cachegetInt32Memory.buffer !== wasm.memory.buffer) {
-        cachegetInt32Memory = new Int32Array(wasm.memory.buffer);
-    }
-    return cachegetInt32Memory;
-}
-
-function getArrayU8FromWasm(ptr, len) {
-    return getUint8Memory().subarray(ptr / 1, ptr / 1 + len);
-}
-/**
-* @param {Uint8Array} input_image
-* @param {number} input_width
-* @param {number} input_height
-* @param {number} output_width
-* @param {number} output_height
-* @param {number} typ_idx
-* @param {boolean} premultiply
-* @param {boolean} color_space_conversion
-* @returns {Uint8Array}
-*/
-export function resize(input_image, input_width, input_height, output_width, output_height, typ_idx, premultiply, color_space_conversion) {
-    const retptr = 8;
-    const ret = wasm.resize(retptr, passArray8ToWasm(input_image), WASM_VECTOR_LEN, input_width, input_height, output_width, output_height, typ_idx, premultiply, color_space_conversion);
-    const memi32 = getInt32Memory();
-    const v0 = getArrayU8FromWasm(memi32[retptr / 4 + 0], memi32[retptr / 4 + 1]).slice();
-    wasm.__wbindgen_free(memi32[retptr / 4 + 0], memi32[retptr / 4 + 1] * 1);
-    return v0;
-}
-

codecs/resize/pkg/resize_bg.d.ts

@@ -1,5 +0,0 @@
-/* tslint:disable */
-export const memory: WebAssembly.Memory;
-export function __wbindgen_malloc(a: number): number;
-export function __wbindgen_free(a: number, b: number): void;
-export function resize(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number): void;

codecs/resize/src/lib.rs

@@ -1,121 +0,0 @@
-extern crate cfg_if;
-extern crate resize;
-extern crate wasm_bindgen;
-
-mod utils;
-
-use cfg_if::cfg_if;
-use resize::Pixel::RGBA;
-use resize::Type;
-use wasm_bindgen::prelude::*;
-
-mod srgb;
-use srgb::Clamp;
-
-cfg_if! {
-    // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
-    // allocator.
-    if #[cfg(feature = "wee_alloc")] {
-        extern crate wee_alloc;
-        #[global_allocator]
-        static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
-    }
-}
-
-include!("./lut.inc");
-
-// If `with_space_conversion` is true, this function returns 2 functions that
-// convert from sRGB to linear RGB and vice versa. If `with_space_conversion` is
-// false, the 2 functions returned do nothing.
-fn converter_funcs(with_space_conversion: bool) -> ((fn(u8) -> f32), (fn(f32) -> u8)) {
-    if with_space_conversion {
-        (
-            |v| SRGB_TO_LINEAR_LUT[v as usize] * 255.0,
-            |v| (LINEAR_TO_SRGB_LUT[v as usize] * 255.0) as u8,
-        )
-    } else {
-        (|v| v as f32, |v| v as u8)
-    }
-}
-
-// If `with_alpha_premultiplication` is true, this function returns a function
-// that premultiply the alpha channel with the given channel value and another
-// function that reverses that process. If `with_alpha_premultiplication` is
-// false, the functions just return the channel value.
-fn alpha_multiplier_funcs(
-    with_alpha_premultiplication: bool,
-) -> ((fn(f32, u8) -> u8), (fn(u8, u8) -> f32)) {
-    if with_alpha_premultiplication {
-        (
-            |v, a| (v * (a as f32) / 255.0) as u8,
-            |v, a| (v as f32) * 255.0 / (a as f32).clamp(0.0, 255.0),
-        )
-    } else {
-        (|v, _a| v as u8, |v, _a| v as f32)
-    }
-}
-
-#[wasm_bindgen]
-#[no_mangle]
-pub fn resize(
-    mut input_image: Vec<u8>,
-    input_width: usize,
-    input_height: usize,
-    output_width: usize,
-    output_height: usize,
-    typ_idx: usize,
-    premultiply: bool,
-    color_space_conversion: bool,
-) -> Vec<u8> {
-    let typ = match typ_idx {
-        0 => Type::Triangle,
-        1 => Type::Catrom,
-        2 => Type::Mitchell,
-        3 => Type::Lanczos3,
-        _ => panic!("Nope"),
-    };
-    let num_input_pixels = input_width * input_height;
-    let num_output_pixels = output_width * output_height;
-
-    let (to_linear, to_color_space) = converter_funcs(color_space_conversion);
-    let (premultiplier, demultiplier) = alpha_multiplier_funcs(premultiply);
-
-    // If both options are false, there is no preprocessing on the pixel valus
-    // and we can skip the loop.
-    if premultiply || color_space_conversion {
-        for i in 0..num_input_pixels {
-            for j in 0..3 {
-                input_image[4 * i + j] =
-                    premultiplier(to_linear(input_image[4 * i + j]), input_image[4 * i + 3]);
-            }
-        }
-    }
-
-    let mut resizer = resize::new(
-        input_width,
-        input_height,
-        output_width,
-        output_height,
-        RGBA,
-        typ,
-    );
-    let mut output_image = Vec::<u8>::with_capacity(num_output_pixels * 4);
-    output_image.resize(num_output_pixels * 4, 0);
-    resizer.resize(input_image.as_slice(), output_image.as_mut_slice());
-
-    if premultiply || color_space_conversion {
-        for i in 0..num_output_pixels {
-            for j in 0..3 {
-                // We don’t need to worry about division by zero, as division by zero
-                // is well-defined on floats to return ±Inf. ±Inf is converted to 0
-                // when casting to integers.
-                output_image[4 * i + j] = to_color_space(demultiplier(
-                    output_image[4 * i + j],
-                    output_image[4 * i + 3],
-                ));
-            }
-        }
-    }
-
-    return output_image;
-}

codecs/resize/src/srgb.rs

@@ -1,29 +0,0 @@
-pub trait Clamp: std::cmp::PartialOrd + Sized {
-    fn clamp(self, min: Self, max: Self) -> Self {
-        if self.lt(&min) {
-            min
-        } else if self.gt(&max) {
-            max
-        } else {
-            self
-        }
-    }
-}
-
-impl Clamp for f32 {}
-
-pub fn srgb_to_linear(v: f32) -> f32 {
-    if v < 0.04045 {
-        v / 12.92
-    } else {
-        ((v + 0.055) / 1.055).powf(2.4).clamp(0.0, 1.0)
-    }
-}
-
-pub fn linear_to_srgb(v: f32) -> f32 {
-    if v < 0.0031308 {
-        v * 12.92
-    } else {
-        (1.055 * v.powf(1.0 / 2.4) - 0.055).clamp(0.0, 1.0)
-    }
-}

codecs/resize/src/utils.rs

@@ -1,17 +0,0 @@
-use cfg_if::cfg_if;
-
-cfg_if! {
-    // When the `console_error_panic_hook` feature is enabled, we can call the
-    // `set_panic_hook` function at least once during initialization, and then
-    // we will get better error messages if our code ever panics.
-    //
-    // For more details see
-    // https://github.com/rustwasm/console_error_panic_hook#readme
-    if #[cfg(feature = "console_error_panic_hook")] {
-        extern crate console_error_panic_hook;
-        pub use self::console_error_panic_hook::set_once as set_panic_hook;
-    } else {
-        #[inline]
-        pub fn set_panic_hook() {}
-    }
-}

codecs/rotate/.gitignore

@@ -1,2 +0,0 @@
-target
-Cargo.lock

codecs/rotate/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "rotate"
-version = "0.1.0"
-authors = ["Surma <surma@google.com>"]
-edition = "2018"
-
-[lib]
-name = "rotate"
-path = "rotate.rs"
-crate-type = ["cdylib", "rlib"]
-
-[profile.release]
-lto = true
-opt-level = "s"

codecs/rotate/Dockerfile

@@ -1,8 +0,0 @@
-FROM rust
-RUN rustup target add wasm32-unknown-unknown
-
-RUN mkdir /opt/wabt && \
- curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.11/wabt-1.0.11-linux.tar.gz  | tar -xzf - -C /opt/wabt --strip 1
-
-ENV PATH="/opt/wabt:${PATH}"
-WORKDIR /src

codecs/rotate/benchmark.js

@@ -1,45 +0,0 @@
-// THIS IS NOT A NODE SCRIPT
-// This is a d8 script. Please install jsvu[1] and install v8.
-// Then run `npm run --silent benchmark`.
-// [1]: https://github.com/GoogleChromeLabs/jsvu
-async function init() {
-  //  Adjustable constants.
-  const imageDimensions = 4096;
-  const iterations = new Array(100);
-
-  // Constants. Don’t change.
-  const imageByteSize = imageDimensions * imageDimensions * 4;
-  const wasmPageSize = 64 * 1024;
-
-  const buffer = readbuffer("rotate.wasm");
-  const { instance } = await WebAssembly.instantiate(buffer);
-
-  const pagesAvailable = Math.floor(
-    instance.exports.memory.buffer.byteLength / wasmPageSize
-  );
-  const pagesNeeded = Math.floor((imageByteSize * 2 + 4) / wasmPageSize) + 1;
-  const additionalPagesNeeded = pagesNeeded - pagesAvailable;
-  if (additionalPagesNeeded > 0) {
-    instance.exports.memory.grow(additionalPagesNeeded);
-  }
-
-  [0, 90, 180, 270].forEach(rotation => {
-    print(`\n${rotation} degrees`);
-    print(`==============================`);
-    for (let i = 0; i < 100; i++) {
-      const start = Date.now();
-      instance.exports.rotate(imageDimensions, imageDimensions, rotation);
-      iterations[i] = Date.now() - start;
-    }
-    const average = iterations.reduce((sum, c) => sum + c) / iterations.length;
-    const stddev = Math.sqrt(
-      iterations
-        .map(i => Math.pow(i - average, 2))
-        .reduce((sum, c) => sum + c) / iterations.length
-    );
-    print(`n = ${iterations.length}`);
-    print(`Average: ${average}`);
-    print(`StdDev: ${stddev}`);
-  });
-}
-init().catch(e => console.error(e.stack));

codecs/rotate/build.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-set -e
-
-echo "============================================="
-echo "Compiling wasm"
-echo "============================================="
-(
-  cargo build \
-    --target wasm32-unknown-unknown \
-    --release
-  cp target/wasm32-unknown-unknown/release/rotate.wasm .
-  wasm-strip rotate.wasm
-)
-echo "============================================="
-echo "Compiling wasm  done"
-echo "============================================="
-
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-echo "Did you update your docker image?"
-echo "Run \`docker pull ubuntu\`"
-echo "Run \`docker pull rust\`"
-echo "Run \`docker build -t squoosh-rotate .\`"
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/rotate/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "rotate",
-  "scripts": {
-    "build:image": "docker build -t squoosh-rotate .",
-    "build": "docker run --rm -v $(pwd):/src squoosh-rotate ./build.sh",
-    "benchmark": "echo File size after gzip && npm run benchmark:filesize && echo Optimizing && npm run -s benchmark:optimizing",
-    "benchmark:baseline": "v8 --liftoff --no-wasm-tier-up --no-opt ./benchmark.js",
-    "benchmark:optimizing": "v8 --no-liftoff --no-wasm-tier-up ./benchmark.js",
-    "benchmark:filesize": "cat rotate.wasm | gzip -c9n | wc -c"
-  }
-}

codecs/rotate/rotate.rs

@@ -1,113 +0,0 @@
-use std::slice::{from_raw_parts, from_raw_parts_mut};
-
-// This function is taken from Zachary Dremann
-// https://github.com/GoogleChromeLabs/squoosh/pull/462
-trait HardUnwrap<T> {
-    fn unwrap_hard(self) -> T;
-}
-
-impl<T> HardUnwrap<T> for Option<T> {
-    #[cfg(not(debug_assertions))]
-    #[inline]
-    fn unwrap_hard(self) -> T {
-        match self {
-            Some(t) => t,
-            None => std::process::abort(),
-        }
-    }
-
-    #[cfg(debug_assertions)]
-    fn unwrap_hard(self) -> T {
-        self.unwrap()
-    }
-}
-
-const TILE_SIZE: usize = 16;
-
-fn get_buffers<'a>(width: usize, height: usize) -> (&'a [u32], &'a mut [u32]) {
-    let num_pixels = width * height;
-    let in_b: &[u32];
-    let out_b: &mut [u32];
-    unsafe {
-        in_b = from_raw_parts::<u32>(8 as *const u32, num_pixels);
-        out_b = from_raw_parts_mut::<u32>((num_pixels * 4 + 8) as *mut u32, num_pixels);
-    }
-    return (in_b, out_b);
-}
-
-#[inline(never)]
-fn rotate_0(width: usize, height: usize) {
-    let (in_b, out_b) = get_buffers(width, height);
-    for (in_p, out_p) in in_b.iter().zip(out_b.iter_mut()) {
-        *out_p = *in_p;
-    }
-}
-
-#[inline(never)]
-fn rotate_90(width: usize, height: usize) {
-    let (in_b, out_b) = get_buffers(width, height);
-    let new_width = height;
-    let _new_height = width;
-    for y_start in (0..height).step_by(TILE_SIZE) {
-        for x_start in (0..width).step_by(TILE_SIZE) {
-            for y in y_start..(y_start + TILE_SIZE).min(height) {
-                let in_offset = y * width;
-                let in_bounds = if x_start + TILE_SIZE < width {
-                    (in_offset + x_start)..(in_offset + x_start + TILE_SIZE)
-                } else {
-                    (in_offset + x_start)..(in_offset + width)
-                };
-                let in_chunk = in_b.get(in_bounds).unwrap_hard();
-                for (x, in_p) in in_chunk.iter().enumerate() {
-                    let new_x = (new_width - 1) - y;
-                    let new_y = x + x_start;
-                    *out_b.get_mut(new_y * new_width + new_x).unwrap_hard() = *in_p;
-                }
-            }
-        }
-    }
-}
-
-#[inline(never)]
-fn rotate_180(width: usize, height: usize) {
-    let (in_b, out_b) = get_buffers(width, height);
-    for (in_p, out_p) in in_b.iter().zip(out_b.iter_mut().rev()) {
-        *out_p = *in_p;
-    }
-}
-
-#[inline(never)]
-fn rotate_270(width: usize, height: usize) {
-    let (in_b, out_b) = get_buffers(width, height);
-    let new_width = height;
-    let new_height = width;
-    for y_start in (0..height).step_by(TILE_SIZE) {
-        for x_start in (0..width).step_by(TILE_SIZE) {
-            for y in y_start..(y_start + TILE_SIZE).min(height) {
-                let in_offset = y * width;
-                let in_bounds = if x_start + TILE_SIZE < width {
-                    (in_offset + x_start)..(in_offset + x_start + TILE_SIZE)
-                } else {
-                    (in_offset + x_start)..(in_offset + width)
-                };
-                let in_chunk = in_b.get(in_bounds).unwrap_hard();
-                for (x, in_p) in in_chunk.iter().enumerate() {
-                    let new_x = y;
-                    let new_y = new_height - 1 - (x_start + x);
-                    *out_b.get_mut(new_y * new_width + new_x).unwrap_hard() = *in_p;
-                }
-            }
-        }
-    }
-}
-
-#[no_mangle]
-fn rotate(width: usize, height: usize, rotate: usize) {
-    match rotate {
-        0 => rotate_0(width, height),
-        90 => rotate_90(width, height),
-        180 => rotate_180(width, height),
-        270 => rotate_270(width, height),
-        _ => std::process::abort(),
-    }
-}

codecs/webp_dec/README.md

@@ -1,7 +1,7 @@
 # WebP decoder
 
 - Source: <https://github.com/webmproject/libwebp>
-- Version: v1.0.2
+- Version: v0.6.1
 
 ## Example
 

codecs/webp_dec/build.sh

@@ -6,33 +6,7 @@ export OPTIMIZE="-Os"
 export LDFLAGS="${OPTIMIZE}"
 export CFLAGS="${OPTIMIZE}"
 export CPPFLAGS="${OPTIMIZE}"
-apt-get update
-apt-get install -qqy autoconf libtool libpng-dev pkg-config
 
-echo "============================================="
-echo "Compiling libwebp"
-echo "============================================="
-test -n "$SKIP_LIBWEBP" || (
-  cd node_modules/libwebp
-  autoreconf -fiv
-  rm -rf build || true
-  mkdir -p build && cd build
-  emconfigure ../configure \
-    --disable-libwebpdemux \
-    --disable-wic \
-    --disable-gif \
-    --disable-tiff \
-    --disable-jpeg \
-    --disable-png \
-    --disable-sdl \
-    --disable-gl \
-    --disable-threading \
-    --disable-neon-rtcd \
-    --disable-neon \
-    --disable-sse2 \
-    --disable-sse4.1
-  emmake make
-)
 echo "============================================="
 echo "Compiling wasm bindings"
 echo "============================================="
@@ -46,9 +20,9 @@ echo "============================================="
     --std=c++11 \
     -I node_modules/libwebp \
     -o ./webp_dec.js \
+    node_modules/libwebp/src/{dec,dsp,demux,enc,mux,utils}/*.c \
     -x c++ \
-    webp_dec.cpp \
+    webp_dec.cpp
-    node_modules/libwebp/build/src/.libs/libwebp.a
 )
 echo "============================================="
 echo "Compiling wasm bindings done"

codecs/webp_dec/package.json

@@ -5,9 +5,9 @@
     "build": "docker run --rm -v $(pwd):/src trzeci/emscripten ./build.sh"
   },
   "napa": {
-    "libwebp": "webmproject/libwebp#v1.0.2"
+    "libwebp": "webmproject/libwebp#v1.0.0"
   },
   "devDependencies": {
-    "napa": "3.0.0"
+    "napa": "^3.0.0"
   }
 }

codecs/webp_enc/README.md

@@ -1,7 +1,7 @@
 # WebP encoder
 
 - Source: <https://github.com/webmproject/libwebp>
-- Version: v1.0.2
+- Version: v0.6.1
 
 ## Dependencies
 

codecs/webp_enc/build.sh

@@ -7,33 +7,6 @@ export LDFLAGS="${OPTIMIZE}"
 export CFLAGS="${OPTIMIZE}"
 export CPPFLAGS="${OPTIMIZE}"
 
-apt-get update
-apt-get install -qqy autoconf libtool libpng-dev pkg-config
-
-echo "============================================="
-echo "Compiling libwebp"
-echo "============================================="
-test -n "$SKIP_LIBWEBP" || (
-  cd node_modules/libwebp
-  autoreconf -fiv
-  rm -rf build || true
-  mkdir -p build && cd build
-  emconfigure ../configure \
-    --disable-libwebpdemux \
-    --disable-wic \
-    --disable-gif \
-    --disable-tiff \
-    --disable-jpeg \
-    --disable-png \
-    --disable-sdl \
-    --disable-gl \
-    --disable-threading \
-    --disable-neon-rtcd \
-    --disable-neon \
-    --disable-sse2 \
-    --disable-sse4.1
-  emmake make
-)
 echo "============================================="
 echo "Compiling wasm bindings"
 echo "============================================="
@@ -47,9 +20,9 @@ echo "============================================="
     --std=c++11 \
     -I node_modules/libwebp \
     -o ./webp_enc.js \
+    node_modules/libwebp/src/{dec,dsp,demux,enc,mux,utils}/*.c \
     -x c++ \
-    webp_enc.cpp \
+    webp_enc.cpp
-    node_modules/libwebp/build/src/.libs/libwebp.a
 )
 echo "============================================="
 echo "Compiling wasm bindings done"

codecs/webp_enc/package.json

@@ -5,9 +5,9 @@
     "build": "docker run --rm -v $(pwd):/src trzeci/emscripten ./build.sh"
   },
   "napa": {
-    "libwebp": "webmproject/libwebp#v1.0.2"
+    "libwebp": "webmproject/libwebp#v1.0.0"
   },
   "devDependencies": {
-    "napa": "3.0.0"
+    "napa": "^3.0.0"
   }
 }

codecs/webp_enc/webp_enc.cpp

@@ -26,8 +26,7 @@ val encode(std::string img, int width, int height, WebPConfig config) {
     throw std::runtime_error("Unexpected error");
   }
 
-  // Only use use_argb if we really need it, as it's slower.
+  pic.use_argb = !!config.lossless;
-  pic.use_argb = config.lossless || config.use_sharp_yuv || config.preprocessing > 0;
   pic.width = width;
   pic.height = height;
   pic.writer = WebPMemoryWrite;

package.json

@@ -1,14 +1,13 @@
 {
   "private": true,
   "name": "squoosh",
-  "version": "1.10.0",
+  "version": "1.2.2",
   "license": "apache-2.0",
   "scripts": {
     "start": "webpack-dev-server --host 0.0.0.0 --hot",
     "build": "webpack -p",
-    "lint": "tslint -c tslint.json  -p tsconfig.json -t verbose",
+    "lint": "tslint -c tslint.json  -p tsconfig.json -t verbose 'src/**/*.{ts,tsx,js,jsx}'",
-    "lintfix": "tslint -c tslint.json -p tsconfig.json -t verbose --fix 'src/**/*.{ts,tsx,js,jsx}'",
+    "lintfix": "tslint -c tslint.json -p tsconfig.json -t verbose --fix 'src/**/*.{ts,tsx,js,jsx}'"
-    "sizereport": "sizereport --config"
   },
   "husky": {
     "hooks": {
@@ -16,61 +15,55 @@
     }
   },
   "devDependencies": {
-    "@types/node": "10.14.15",
+    "@types/node": "^10.12.6",
-    "@types/pretty-bytes": "5.1.0",
+    "@types/pretty-bytes": "^5.1.0",
-    "@types/webassembly-js-api": "0.0.3",
+    "@types/webassembly-js-api": "0.0.1",
-    "@webcomponents/custom-elements": "1.2.4",
+    "@webcomponents/custom-elements": "^1.2.1",
-    "@webpack-cli/serve": "0.1.8",
+    "@webpack-cli/serve": "^0.1.2",
-    "assets-webpack-plugin": "3.9.10",
+    "assets-webpack-plugin": "^3.9.7",
-    "chalk": "2.4.2",
+    "chokidar": "^2.0.4",
-    "chokidar": "3.0.2",
+    "classnames": "^2.2.6",
-    "classnames": "2.2.6",
+    "clean-webpack-plugin": "^1.0.0",
-    "clean-webpack-plugin": "1.0.1",
+    "comlink": "^3.0.3",
-    "comlink": "3.1.1",
+    "copy-webpack-plugin": "^4.6.0",
-    "copy-webpack-plugin": "5.0.4",
+    "critters-webpack-plugin": "^2.0.1",
-    "critters-webpack-plugin": "2.4.0",
+    "css-loader": "^1.0.1",
-    "css-loader": "1.0.1",
+    "ejs": "^2.6.1",
-    "ejs": "2.6.2",
+    "exports-loader": "^0.7.0",
-    "escape-string-regexp": "2.0.0",
+    "file-drop-element": "^0.0.9",
-    "exports-loader": "0.7.0",
+    "file-loader": "^2.0.0",
-    "file-drop-element": "0.2.0",
+    "html-webpack-plugin": "^3.2.0",
-    "file-loader": "4.2.0",
+    "husky": "^1.1.4",
-    "gzip-size": "5.1.1",
+    "idb-keyval": "^3.1.0",
-    "html-webpack-plugin": "3.2.0",
+    "linkstate": "^1.1.1",
-    "husky": "3.0.4",
+    "loader-utils": "^1.1.0",
-    "idb-keyval": "3.2.0",
+    "mini-css-extract-plugin": "^0.4.4",
-    "linkstate": "1.1.1",
+    "minimatch": "^3.0.4",
-    "loader-utils": "1.2.3",
+    "node-sass": "^4.11.0",
-    "mini-css-extract-plugin": "0.8.0",
+    "optimize-css-assets-webpack-plugin": "^5.0.1",
-    "minimatch": "3.0.4",
+    "pointer-tracker": "^2.0.3",
-    "node-fetch": "2.6.0",
+    "preact": "^8.3.1",
-    "node-sass": "4.13.0",
+    "prerender-loader": "^1.2.0",
-    "optimize-css-assets-webpack-plugin": "5.0.1",
+    "pretty-bytes": "^5.1.0",
-    "pointer-tracker": "2.0.3",
+    "progress-bar-webpack-plugin": "^1.11.0",
-    "preact": "8.4.2",
+    "raw-loader": "^0.5.1",
-    "prerender-loader": "1.3.0",
+    "sass-loader": "^7.1.0",
-    "pretty-bytes": "5.3.0",
+    "script-ext-html-webpack-plugin": "^2.1.3",
-    "progress-bar-webpack-plugin": "1.12.1",
+    "source-map-loader": "^0.2.4",
-    "raw-loader": "3.1.0",
+    "style-loader": "^0.23.1",
-    "readdirp": "3.1.2",
+    "terser-webpack-plugin": "^1.1.0",
-    "sass-loader": "7.3.1",
+    "ts-loader": "^5.3.0",
-    "script-ext-html-webpack-plugin": "2.1.4",
+    "tslint": "^5.11.0",
-    "source-map-loader": "0.2.4",
+    "tslint-config-airbnb": "^5.11.0",
-    "style-loader": "1.0.0",
+    "tslint-config-semistandard": "^7.0.0",
-    "terser-webpack-plugin": "1.4.1",
+    "tslint-react": "^3.6.0",
-    "travis-size-report": "1.1.0",
+    "typed-css-modules": "^0.3.7",
-    "ts-loader": "6.0.3",
+    "typescript": "^3.1.6",
-    "tslint": "5.19.0",
+    "url-loader": "^1.1.2",
-    "tslint-config-airbnb": "5.11.1",
+    "webpack": "^4.25.1",
-    "tslint-config-semistandard": "8.0.1",
+    "webpack-bundle-analyzer": "^3.0.3",
-    "tslint-react": "4.0.0",
+    "webpack-cli": "^3.1.2",
-    "typed-css-modules": "0.4.2",
+    "webpack-dev-server": "^3.1.10",
-    "typescript": "3.5.3",
+    "worker-plugin": "^1.1.1"
-    "url-loader": "2.1.0",
-    "webpack": "4.39.3",
-    "webpack-bundle-analyzer": "3.4.1",
-    "webpack-cli": "3.3.4",
-    "webpack-dev-server": "3.8.0",
-    "worker-plugin": "3.1.0"
   }
 }

renovate.json

@@ -1,5 +0,0 @@
-{
-  "extends": [
-    "config:base"
-  ]
-}

sizereport.config.js

@@ -1,14 +0,0 @@
-const escapeRE = require("escape-string-regexp");
-
-module.exports = {
-  repo: "GoogleChromeLabs/squoosh",
-  path: "build/**/!(*.map)",
-  branch: "master",
-  findRenamed(path, newPaths) {
-    const nameParts = /^(.+\.)[a-f0-9]+(\..+)$/.exec(path);
-    if (!nameParts) return;
-
-    const matchRe = new RegExp(`^${escapeRE(nameParts[1])}[a-f0-9]+${escapeRE(nameParts[2])}$`);
-    return newPaths.find(newPath => matchRe.test(newPath));
-  }
-};

src/codecs/encoders.ts

@@ -1,5 +1,5 @@
 import * as identity from './identity/encoder-meta';
-import * as oxiPNG from './oxipng/encoder-meta';
+import * as optiPNG from './optipng/encoder-meta';
 import * as mozJPEG from './mozjpeg/encoder-meta';
 import * as webP from './webp/encoder-meta';
 import * as browserPNG from './browser-png/encoder-meta';
@@ -17,7 +17,7 @@ export interface EncoderSupportMap {
 
 export type EncoderState =
   identity.EncoderState |
-  oxiPNG.EncoderState |
+  optiPNG.EncoderState |
   mozJPEG.EncoderState |
   webP.EncoderState |
   browserPNG.EncoderState |
@@ -31,7 +31,7 @@ export type EncoderState =
 
 export type EncoderOptions =
   identity.EncodeOptions |
-  oxiPNG.EncodeOptions |
+  optiPNG.EncodeOptions |
   mozJPEG.EncodeOptions |
   webP.EncodeOptions |
   browserPNG.EncodeOptions |
@@ -47,7 +47,7 @@ export type EncoderType = keyof typeof encoderMap;
 
 export const encoderMap = {
   [identity.type]: identity,
-  [oxiPNG.type]: oxiPNG,
+  [optiPNG.type]: optiPNG,
   [mozJPEG.type]: mozJPEG,
   [webP.type]: webP,
   [browserPNG.type]: browserPNG,

src/codecs/hqx/processor-meta.ts

@@ -1,3 +0,0 @@
-export interface HqxOptions {
-  factor: 2 | 3 | 4;
-}

src/codecs/hqx/processor.ts

@@ -1,20 +0,0 @@
-import { resize } from '../../../codecs/hqx/pkg';
-import { HqxOptions } from './processor-meta';
-
-export async function hqx(
-  data: ImageData,
-  opts: HqxOptions,
-): Promise<ImageData> {
-  const input = data;
-  const result = resize(
-    new Uint32Array(input.data.buffer),
-    input.width,
-    input.height,
-    opts.factor,
-  );
-  return new ImageData(
-    new Uint8ClampedArray(result.buffer),
-    data.width * opts.factor,
-    data.height * opts.factor,
-  );
-}

src/codecs/imagequant/processor.ts

@@ -1,12 +1,12 @@
 import imagequant, { QuantizerModule } from '../../../codecs/imagequant/imagequant';
 import wasmUrl from '../../../codecs/imagequant/imagequant.wasm';
 import { QuantizeOptions } from './processor-meta';
-import { initEmscriptenModule } from '../util';
+import { initWasmModule } from '../util';
 
 let emscriptenModule: Promise<QuantizerModule>;
 
 export async function process(data: ImageData, opts: QuantizeOptions): Promise<ImageData> {
-  if (!emscriptenModule) emscriptenModule = initEmscriptenModule(imagequant, wasmUrl);
+  if (!emscriptenModule) emscriptenModule = initWasmModule(imagequant, wasmUrl);
 
   const module = await emscriptenModule;
 

src/codecs/mozjpeg/encoder.ts

@@ -1,12 +1,12 @@
 import mozjpeg_enc, { MozJPEGModule } from '../../../codecs/mozjpeg_enc/mozjpeg_enc';
 import wasmUrl from '../../../codecs/mozjpeg_enc/mozjpeg_enc.wasm';
 import { EncodeOptions } from './encoder-meta';
-import { initEmscriptenModule } from '../util';
+import { initWasmModule } from '../util';
 
 let emscriptenModule: Promise<MozJPEGModule>;
 
 export async function encode(data: ImageData, options: EncodeOptions): Promise<ArrayBuffer> {
-  if (!emscriptenModule) emscriptenModule = initEmscriptenModule(mozjpeg_enc, wasmUrl);
+  if (!emscriptenModule) emscriptenModule = initWasmModule(mozjpeg_enc, wasmUrl);
 
   const module = await emscriptenModule;
   const resultView = module.encode(data.data, data.width, data.height, options);

src/codecs/optipng/encoder-meta.ts

@@ -4,7 +4,7 @@ export interface EncodeOptions {
 export interface EncoderState { type: typeof type; options: EncodeOptions; }
 
 export const type = 'png';
-export const label = 'OxiPNG';
+export const label = 'OptiPNG';
 export const mimeType = 'image/png';
 export const extension = 'png';
 

src/codecs/optipng/encoder.ts

@@ -0,0 +1,18 @@
+import optipng, { OptiPngModule } from '../../../codecs/optipng/optipng';
+import wasmUrl from '../../../codecs/optipng/optipng.wasm';
+import { EncodeOptions } from './encoder-meta';
+import { initWasmModule } from '../util';
+
+let emscriptenModule: Promise<OptiPngModule>;
+
+export async function compress(data: BufferSource, options: EncodeOptions): Promise<ArrayBuffer> {
+  if (!emscriptenModule) emscriptenModule = initWasmModule(optipng, wasmUrl);
+
+  const module = await emscriptenModule;
+  const resultView = module.compress(data, options);
+  const result = new Uint8Array(resultView);
+  module.free_result();
+
+  // wasm can’t run on SharedArrayBuffers, so we hard-cast to ArrayBuffer.
+  return result.buffer as ArrayBuffer;
+}

src/codecs/optipng/options.tsx

@@ -10,7 +10,7 @@ type Props = {
   onChange(newOptions: EncodeOptions): void;
 };
 
-export default class OxiPNGEncoderOptions extends Component<Props, {}> {
+export default class OptiPNGEncoderOptions extends Component<Props, {}> {
   @bind
   onChange(event: Event) {
     const form = (event.currentTarget as HTMLInputElement).closest('form') as HTMLFormElement;
@@ -28,7 +28,7 @@ export default class OxiPNGEncoderOptions extends Component<Props, {}> {
           <Range
             name="level"
             min="0"
-            max="6"
+            max="7"
             step="1"
             value={options.level}
             onInput={this.onChange}

src/codecs/oxipng/encoder.ts

@@ -1,6 +0,0 @@
-import { optimise } from '../../../codecs/oxipng/pkg';
-import { EncodeOptions } from './encoder-meta';
-
-export async function compress(data: ArrayBuffer, options: EncodeOptions): Promise<ArrayBuffer> {
-  return optimise(new Uint8Array(data), options.level).buffer;
-}

src/codecs/processor-worker/index.ts

@@ -1,19 +1,13 @@
 import { expose } from 'comlink';
-import { isHqx } from '../resize/processor-meta';
-import { clamp } from '../util';
-
-function timed<T>(name: string, func: () => Promise<T>) {
-  console.time(name);
-  return func().finally(() => console.timeEnd(name));
-}
 
 async function mozjpegEncode(
   data: ImageData, options: import('../mozjpeg/encoder-meta').EncodeOptions,
 ): Promise<ArrayBuffer> {
   const { encode } = await import(
     /* webpackChunkName: "process-mozjpeg-enc" */
-    '../mozjpeg/encoder');
+    '../mozjpeg/encoder',
-  return timed('mozjpegEncode', () => encode(data, options));
+  );
+  return encode(data, options);
 }
 
 async function quantize(
@@ -21,8 +15,9 @@ async function quantize(
 ): Promise<ImageData> {
   const { process } = await import(
     /* webpackChunkName: "process-imagequant" */
-    '../imagequant/processor');
+    '../imagequant/processor',
-  return timed('quantize', () => process(data, opts));
+  );
+  return process(data, opts);
 }
 
 async function rotate(
@@ -30,40 +25,20 @@ async function rotate(
 ): Promise<ImageData> {
   const { rotate } = await import(
     /* webpackChunkName: "process-rotate" */
-    '../rotate/processor');
+    '../rotate/processor',
+  );
 
-  return timed('rotate', () => rotate(data, opts));
+  return rotate(data, opts);
 }
 
-async function resize(
+async function optiPngEncode(
-  data: ImageData, opts: import('../resize/processor-meta').WorkerResizeOptions,
+  data: BufferSource, options: import('../optipng/encoder-meta').EncodeOptions,
-): Promise<ImageData> {
-  if (isHqx(opts)) {
-    const { hqx } = await import(
-      /* webpackChunkName: "process-hqx" */
-      '../hqx/processor');
-
-    const widthRatio = opts.width / data.width;
-    const heightRatio = opts.height / data.height;
-    const ratio = Math.max(widthRatio, heightRatio);
-    if (ratio <= 1) return data;
-    const factor = clamp(Math.ceil(ratio), { min: 2, max: 4 }) as 2|3|4;
-    return timed('hqx', () => hqx(data, { factor }));
-  }
-  const { resize } = await import(
-    /* webpackChunkName: "process-resize" */
-    '../resize/processor');
-
-  return timed('resize', () => resize(data, opts));
-}
-
-async function oxiPngEncode(
-  data: ArrayBuffer, options: import('../oxipng/encoder-meta').EncodeOptions,
 ): Promise<ArrayBuffer> {
   const { compress } = await import(
-    /* webpackChunkName: "process-oxipng" */
+    /* webpackChunkName: "process-optipng" */
-    '../oxipng/encoder');
+    '../optipng/encoder',
-  return timed('oxiPngEncode', () => compress(data, options));
+  );
+  return compress(data, options);
 }
 
 async function webpEncode(
@@ -71,26 +46,20 @@ async function webpEncode(
 ): Promise<ArrayBuffer> {
   const { encode } = await import(
     /* webpackChunkName: "process-webp-enc" */
-    '../webp/encoder');
+    '../webp/encoder',
-  return timed('webpEncode', () => encode(data, options));
+  );
+  return encode(data, options);
 }
 
 async function webpDecode(data: ArrayBuffer): Promise<ImageData> {
   const { decode } = await import(
     /* webpackChunkName: "process-webp-dec" */
-    '../webp/decoder');
+    '../webp/decoder',
-  return timed('webpDecode', () => decode(data));
+  );
+  return decode(data);
 }
 
-const exports = {
+const exports = { mozjpegEncode, quantize, rotate, optiPngEncode, webpEncode, webpDecode };
-  mozjpegEncode,
-  quantize,
-  rotate,
-  resize,
-  oxiPngEncode,
-  webpEncode,
-  webpDecode,
-};
 export type ProcessorWorkerApi = typeof exports;
 
 expose(exports, self);

src/codecs/processor.ts

@@ -2,12 +2,12 @@ import { proxy } from 'comlink';
 import { QuantizeOptions } from './imagequant/processor-meta';
 import { canvasEncode, blobToArrayBuffer } from '../lib/util';
 import { EncodeOptions as MozJPEGEncoderOptions } from './mozjpeg/encoder-meta';
-import { EncodeOptions as OxiPNGEncoderOptions } from './oxipng/encoder-meta';
+import { EncodeOptions as OptiPNGEncoderOptions } from './optipng/encoder-meta';
 import { EncodeOptions as WebPEncoderOptions } from './webp/encoder-meta';
 import { EncodeOptions as BrowserJPEGOptions } from './browser-jpeg/encoder-meta';
 import { EncodeOptions as BrowserWebpEncodeOptions } from './browser-webp/encoder-meta';
-import { BrowserResizeOptions, VectorResizeOptions } from './resize/processor-meta';
+import { BitmapResizeOptions, VectorResizeOptions } from './resize/processor-meta';
-import { browserResize, vectorResize } from './resize/processor-sync';
+import { resize, vectorResize } from './resize/processor';
 import * as browserBMP from './browser-bmp/encoder';
 import * as browserPNG from './browser-png/encoder';
 import * as browserJPEG from './browser-jpeg/encoder';
@@ -16,7 +16,6 @@ import * as browserGIF from './browser-gif/encoder';
 import * as browserTIFF from './browser-tiff/encoder';
 import * as browserJP2 from './browser-jp2/encoder';
 import * as browserPDF from './browser-pdf/encoder';
-import { bind } from '../lib/initial-util';
 
 type ProcessorWorkerApi = import('./processor-worker').ProcessorWorkerApi;
 
@@ -95,7 +94,14 @@ export default class Processor {
     if (!this._worker) return;
 
     // If the worker is unused for 10 seconds, remove it to save memory.
-    this._workerTimeoutId = self.setTimeout(this.terminateWorker, workerTimeout);
+    this._workerTimeoutId = self.setTimeout(
+      () => {
+        if (!this._worker) return;
+        this._worker.terminate();
+        this._worker = undefined;
+      },
+      workerTimeout,
+    );
   }
 
   /** Abort the current job, if any */
@@ -105,11 +111,7 @@ export default class Processor {
     this._abortRejector(new DOMException('Aborted', 'AbortError'));
     this._abortRejector = undefined;
     this._busy = false;
-    this.terminateWorker();
-  }
 
-  @bind
-  terminateWorker() {
     if (!this._worker) return;
     this._worker.terminate();
     this._worker = undefined;
@@ -128,13 +130,6 @@ export default class Processor {
     return this._workerApi!.rotate(data, opts);
   }
 
-  @Processor._processingJob({ needsWorker: true })
-  workerResize(
-    data: ImageData, opts: import('./resize/processor-meta').WorkerResizeOptions,
-  ): Promise<ImageData> {
-    return this._workerApi!.resize(data, opts);
-  }
-
   @Processor._processingJob({ needsWorker: true })
   mozjpegEncode(
     data: ImageData, opts: MozJPEGEncoderOptions,
@@ -143,13 +138,13 @@ export default class Processor {
   }
 
   @Processor._processingJob({ needsWorker: true })
-  async oxiPngEncode(
+  async optiPngEncode(
-    data: ImageData, opts: OxiPNGEncoderOptions,
+    data: ImageData, opts: OptiPNGEncoderOptions,
   ): Promise<ArrayBuffer> {
-    // OxiPNG expects PNG input.
+    // OptiPNG expects PNG input.
     const pngBlob = await canvasEncode(data, 'image/png');
     const pngBuffer = await blobToArrayBuffer(pngBlob);
-    return this._workerApi!.oxiPngEncode(pngBuffer, opts);
+    return this._workerApi!.optiPngEncode(pngBuffer, opts);
   }
 
   @Processor._processingJob({ needsWorker: true })
@@ -207,9 +202,9 @@ export default class Processor {
 
   // Synchronous jobs
 
-  resize(data: ImageData, opts: BrowserResizeOptions) {
+  resize(data: ImageData, opts: BitmapResizeOptions) {
     this.abortCurrent();
-    return browserResize(data, opts);
+    return resize(data, opts);
   }
 
   vectorResize(data: HTMLImageElement, opts: VectorResizeOptions) {

src/codecs/resize/options.tsx

@@ -1,10 +1,8 @@
 import { h, Component } from 'preact';
 import linkState from 'linkstate';
 import { bind, linkRef } from '../../lib/initial-util';
-import {
+import { inputFieldValueAsNumber, inputFieldValue, preventDefault } from '../../lib/util';
-  inputFieldValueAsNumber, inputFieldValue, preventDefault, inputFieldChecked,
+import { ResizeOptions } from './processor-meta';
-} from '../../lib/util';
-import { ResizeOptions, isWorkerOptions } from './processor-meta';
 import * as style from '../../components/Options/style.scss';
 import Checkbox from '../../components/checkbox';
 import Expander from '../../components/expander';
@@ -12,9 +10,8 @@ import Select from '../../components/select';
 
 interface Props {
   isVector: Boolean;
-  inputWidth: number;
-  inputHeight: number;
   options: ResizeOptions;
+  aspect: number;
   onChange(newOptions: ResizeOptions): void;
 }
 
@@ -22,21 +19,12 @@ interface State {
   maintainAspect: boolean;
 }
 
-const sizePresets = [0.25, 0.3333, 0.5, 1, 2, 3, 4];
-
 export default class ResizerOptions extends Component<Props, State> {
   state: State = {
     maintainAspect: true,
   };
 
-  private form?: HTMLFormElement;
+  form?: HTMLFormElement;
-  private presetWidths: { [idx: number]: number } = {};
-  private presetHeights: { [idx: number]: number } = {};
-
-  constructor(props: Props) {
-    super(props);
-    this.generatePresetValues(props.inputWidth, props.inputHeight);
-  }
 
   private reportOptions() {
     const form = this.form!;
@@ -50,8 +38,6 @@ export default class ResizerOptions extends Component<Props, State> {
       width: inputFieldValueAsNumber(width),
       height: inputFieldValueAsNumber(height),
       method: form.resizeMethod.value,
-      premultiply: inputFieldChecked(form.premultiply, true),
-      linearRGB: inputFieldChecked(form.linearRGB, true),
       // Casting, as the formfield only returns the correct values.
       fitMethod: inputFieldValue(form.fitMethod, options.fitMethod) as ResizeOptions['fitMethod'],
     };
@@ -63,31 +49,18 @@ export default class ResizerOptions extends Component<Props, State> {
     this.reportOptions();
   }
 
-  private getAspect() {
-    return this.props.inputWidth / this.props.inputHeight;
-  }
-
   componentDidUpdate(prevProps: Props, prevState: State) {
     if (!prevState.maintainAspect && this.state.maintainAspect) {
-      this.form!.height.value = Math.round(Number(this.form!.width.value) / this.getAspect());
+      this.form!.height.value = Math.round(Number(this.form!.width.value) / this.props.aspect);
       this.reportOptions();
     }
   }
 
-  componentWillReceiveProps(nextProps: Props) {
-    if (
-      this.props.inputWidth !== nextProps.inputWidth ||
-      this.props.inputHeight !== nextProps.inputHeight
-    ) {
-      this.generatePresetValues(nextProps.inputWidth, nextProps.inputHeight);
-    }
-  }
-
   @bind
   private onWidthInput() {
     if (this.state.maintainAspect) {
       const width = inputFieldValueAsNumber(this.form!.width);
-      this.form!.height.value = Math.round(width / this.getAspect());
+      this.form!.height.value = Math.round(width / this.props.aspect);
     }
 
     this.reportOptions();
@@ -97,44 +70,12 @@ export default class ResizerOptions extends Component<Props, State> {
   private onHeightInput() {
     if (this.state.maintainAspect) {
       const height = inputFieldValueAsNumber(this.form!.height);
-      this.form!.width.value = Math.round(height * this.getAspect());
+      this.form!.width.value = Math.round(height * this.props.aspect);
     }
 
     this.reportOptions();
   }
 
-  private generatePresetValues(width: number, height: number) {
-    for (const preset of sizePresets) {
-      this.presetWidths[preset] = Math.round(width * preset);
-      this.presetHeights[preset] = Math.round(height * preset);
-    }
-  }
-
-  private getPreset(): number | string {
-    const { width, height } = this.props.options;
-
-    for (const preset of sizePresets) {
-      if (
-        width === this.presetWidths[preset] &&
-        height === this.presetHeights[preset]
-      ) return preset;
-    }
-
-    return 'custom';
-  }
-
-  @bind
-  private onPresetChange(event: Event) {
-    const select = event.target as HTMLSelectElement;
-    if (select.value === 'custom') return;
-    const multiplier = Number(select.value);
-    (this.form!.width as HTMLInputElement).value =
-      Math.round(this.props.inputWidth * multiplier) + '';
-    (this.form!.height as HTMLInputElement).value =
-      Math.round(this.props.inputHeight * multiplier) + '';
-    this.reportOptions();
-  }
-
   render({ options, isVector }: Props, { maintainAspect }: State) {
     return (
       <form ref={linkRef(this, 'form')} class={style.optionsSection} onSubmit={preventDefault}>
@@ -146,26 +87,12 @@ export default class ResizerOptions extends Component<Props, State> {
             onChange={this.onChange}
           >
             {isVector && <option value="vector">Vector</option>}
-            <option value="lanczos3">Lanczos3</option>
-            <option value="mitchell">Mitchell</option>
-            <option value="catrom">Catmull-Rom</option>
-            <option value="triangle">Triangle (bilinear)</option>
-            <option value="hqx">hqx (pixel art)</option>
             <option value="browser-pixelated">Browser pixelated</option>
             <option value="browser-low">Browser low quality</option>
             <option value="browser-medium">Browser medium quality</option>
             <option value="browser-high">Browser high quality</option>
           </Select>
         </label>
-        <label class={style.optionTextFirst}>
-          Preset:
-          <Select value={this.getPreset()} onChange={this.onPresetChange}>
-            {sizePresets.map(preset =>
-              <option value={preset}>{preset * 100}%</option>,
-            )}
-            <option value="custom">Custom</option>
-          </Select>
-        </label>
         <label class={style.optionTextFirst}>
           Width:
           <input
@@ -190,30 +117,6 @@ export default class ResizerOptions extends Component<Props, State> {
             onInput={this.onHeightInput}
           />
         </label>
-        <Expander>
-          {isWorkerOptions(options) ?
-            <label class={style.optionInputFirst}>
-              <Checkbox
-                name="premultiply"
-                checked={options.premultiply}
-                onChange={this.onChange}
-              />
-              Premultiply alpha channel
-            </label>
-            : null
-          }
-          {isWorkerOptions(options) ?
-            <label class={style.optionInputFirst}>
-              <Checkbox
-                name="linearRGB"
-                checked={options.linearRGB}
-                onChange={this.onChange}
-              />
-              Linear RGB
-            </label>
-            : null
-          }
-        </Expander>
         <label class={style.optionInputFirst}>
           <Checkbox
             name="maintainAspect"

src/codecs/resize/processor-meta.ts

@@ -1,75 +1,26 @@
-type BrowserResizeMethods =
+type BitmapResizeMethods = 'browser-pixelated' | 'browser-low' | 'browser-medium' | 'browser-high';
-  | 'browser-pixelated'
-  | 'browser-low'
-  | 'browser-medium'
-  | 'browser-high';
-type WorkerResizeMethods =
-  | 'triangle'
-  | 'catrom'
-  | 'mitchell'
-  | 'lanczos3'
-  | 'hqx';
-const workerResizeMethods: WorkerResizeMethods[] = [
-  'triangle',
-  'catrom',
-  'mitchell',
-  'lanczos3',
-  'hqx',
-];
 
-export type ResizeOptions =
+export interface ResizeOptions {
-  | BrowserResizeOptions
-  | WorkerResizeOptions
-  | VectorResizeOptions;
-
-export interface ResizeOptionsCommon {
   width: number;
   height: number;
+  method: 'vector' | BitmapResizeMethods;
   fitMethod: 'stretch' | 'contain';
 }
 
-export interface BrowserResizeOptions extends ResizeOptionsCommon {
+export interface BitmapResizeOptions extends ResizeOptions {
-  method: BrowserResizeMethods;
+  method: BitmapResizeMethods;
 }
 
-export interface WorkerResizeOptions extends ResizeOptionsCommon {
+export interface VectorResizeOptions extends ResizeOptions {
-  method: WorkerResizeMethods;
-  premultiply: boolean;
-  linearRGB: boolean;
-}
-
-export interface VectorResizeOptions extends ResizeOptionsCommon {
   method: 'vector';
 }
 
-/**
- * Return whether a set of options are worker resize options.
- *
- * @param opts
- */
-export function isWorkerOptions(
-  opts: ResizeOptions,
-): opts is WorkerResizeOptions {
-  return (workerResizeMethods as string[]).includes(opts.method);
-}
-
-/**
- * Return whether a set of options are from the HQ<n>X set
- *
- * @param opts
- */
-export function isHqx(opts: ResizeOptions): opts is WorkerResizeOptions {
-  return opts.method === 'hqx';
-}
-
 export const defaultOptions: ResizeOptions = {
   // Width and height will always default to the image size.
   // This is set elsewhere.
   width: 1,
   height: 1,
   // This will be set to 'vector' if the input is SVG.
-  method: 'lanczos3',
+  method: 'browser-high',
   fitMethod: 'stretch',
-  premultiply: true,
-  linearRGB: true,
 };

src/codecs/resize/processor-sync.ts

@@ -1,35 +0,0 @@
-import { nativeResize, NativeResizeMethod, drawableToImageData } from '../../lib/util';
-import { BrowserResizeOptions, VectorResizeOptions } from './processor-meta';
-import { getContainOffsets } from './util';
-
-export function browserResize(data: ImageData, opts: BrowserResizeOptions): ImageData {
-  let sx = 0;
-  let sy = 0;
-  let sw = data.width;
-  let sh = data.height;
-
-  if (opts.fitMethod === 'contain') {
-    ({ sx, sy, sw, sh } = getContainOffsets(sw, sh, opts.width, opts.height));
-  }
-
-  return nativeResize(
-    data, sx, sy, sw, sh, opts.width, opts.height,
-    opts.method.slice('browser-'.length) as NativeResizeMethod,
-  );
-}
-
-export function vectorResize(data: HTMLImageElement, opts: VectorResizeOptions): ImageData {
-  let sx = 0;
-  let sy = 0;
-  let sw = data.width;
-  let sh = data.height;
-
-  if (opts.fitMethod === 'contain') {
-    ({ sx, sy, sw, sh } = getContainOffsets(sw, sh, opts.width, opts.height));
-  }
-
-  return drawableToImageData(data, {
-    sx, sy, sw, sh,
-    width: opts.width, height: opts.height,
-  });
-}

src/codecs/resize/processor.ts

@@ -1,39 +1,49 @@
-import { WorkerResizeOptions } from './processor-meta';
+import { nativeResize, NativeResizeMethod, drawableToImageData } from '../../lib/util';
-import { getContainOffsets } from './util';
+import { BitmapResizeOptions, VectorResizeOptions } from './processor-meta';
-import { resize as codecResize } from '../../../codecs/resize/pkg';
 
-function crop(data: ImageData, sx: number, sy: number, sw: number, sh: number): ImageData {
+function getContainOffsets(sw: number, sh: number, dw: number, dh: number) {
-  const inputPixels = new Uint32Array(data.data.buffer);
+  const currentAspect = sw / sh;
+  const endAspect = dw / dh;
 
-  // Copy within the same buffer for speed and memory efficiency.
+  if (endAspect > currentAspect) {
-  for (let y = 0; y < sh; y += 1) {
+    const newSh = sw / endAspect;
-    const start = ((y + sy) * data.width) + sx;
+    const newSy = (sh - newSh) / 2;
-    inputPixels.copyWithin(y * sw, start, start + sw);
+    return { sw, sh: newSh, sx: 0, sy: newSy };
   }
 
-  return new ImageData(
+  const newSw = sh * endAspect;
-    new Uint8ClampedArray(inputPixels.buffer.slice(0, sw * sh * 4)),
+  const newSx = (sw - newSw) / 2;
-    sw, sh,
+  return { sh, sw: newSw, sx: newSx, sy: 0 };
-  );
 }
 
-/** Resize methods by index */
+export function resize(data: ImageData, opts: BitmapResizeOptions): ImageData {
-const resizeMethods: WorkerResizeOptions['method'][] = [
+  let sx = 0;
-  'triangle', 'catrom', 'mitchell', 'lanczos3',
+  let sy = 0;
-];
+  let sw = data.width;
-
+  let sh = data.height;
-export async function resize(data: ImageData, opts: WorkerResizeOptions): Promise<ImageData> {
-  let input = data;
 
   if (opts.fitMethod === 'contain') {
-    const { sx, sy, sw, sh } = getContainOffsets(data.width, data.height, opts.width, opts.height);
+    ({ sx, sy, sw, sh } = getContainOffsets(sw, sh, opts.width, opts.height));
-    input = crop(input, Math.round(sx), Math.round(sy), Math.round(sw), Math.round(sh));
   }
 
-  const result = codecResize(
+  return nativeResize(
-    new Uint8Array(input.data.buffer), input.width, input.height, opts.width, opts.height,
+    data, sx, sy, sw, sh, opts.width, opts.height,
-    resizeMethods.indexOf(opts.method), opts.premultiply, opts.linearRGB,
+    opts.method.slice('browser-'.length) as NativeResizeMethod,
   );
-
+}
-  return new ImageData(new Uint8ClampedArray(result.buffer), opts.width, opts.height);
+
+export function vectorResize(data: HTMLImageElement, opts: VectorResizeOptions): ImageData {
+  let sx = 0;
+  let sy = 0;
+  let sw = data.width;
+  let sh = data.height;
+
+  if (opts.fitMethod === 'contain') {
+    ({ sx, sy, sw, sh } = getContainOffsets(sw, sh, opts.width, opts.height));
+  }
+
+  return drawableToImageData(data, {
+    sx, sy, sw, sh,
+    width: opts.width, height: opts.height,
+  });
 }

src/codecs/resize/util.ts

@@ -1,14 +0,0 @@
-export function getContainOffsets(sw: number, sh: number, dw: number, dh: number) {
-  const currentAspect = sw / sh;
-  const endAspect = dw / dh;
-
-  if (endAspect > currentAspect) {
-    const newSh = sw / endAspect;
-    const newSy = (sh - newSh) / 2;
-    return { sw, sh: newSh, sx: 0, sy: newSy };
-  }
-
-  const newSw = sh * endAspect;
-  const newSx = (sw - newSw) / 2;
-  return { sh, sw: newSw, sx: newSx, sy: 0 };
-}

src/codecs/rotate/processor-meta.ts

@@ -3,10 +3,3 @@ export interface RotateOptions {
 }
 
 export const defaultOptions: RotateOptions = { rotate: 0 };
-
-export interface RotateModuleInstance {
-  exports: {
-    memory: WebAssembly.Memory;
-    rotate(width: number, height: number, rotate: 0 | 90 | 180 | 270): void;
-  };
-}

src/codecs/rotate/processor.ts

@@ -1,43 +1,76 @@
-import wasmUrl from '../../../codecs/rotate/rotate.wasm';
+import { RotateOptions } from './processor-meta';
-import { RotateOptions, RotateModuleInstance } from './processor-meta';
 
-// We are loading a 500B module here. Loading the code to feature-detect
+const bpp = 4;
-// `instantiateStreaming` probably takes longer to load than the time we save by
-// using `instantiateStreaming` in the first place. So let’s just use
-// `ArrayBuffer`s here.
-const instancePromise = fetch(wasmUrl)
-  .then(r => r.arrayBuffer())
-  .then(buf => WebAssembly.instantiate(buf));
 
-export async function rotate(
+export function rotate(data: ImageData, opts: RotateOptions): ImageData {
-  data: ImageData,
+  const { rotate } = opts;
-  opts: RotateOptions,
+  const flipDimensions = rotate % 180 !== 0;
-): Promise<ImageData> {
+  const { width: inputWidth, height: inputHeight } = data;
-  const { instance } = (await instancePromise) as {
+  const outputWidth = flipDimensions ? inputHeight : inputWidth;
-    instance: RotateModuleInstance;
+  const outputHeight = flipDimensions ? inputWidth : inputHeight;
-  };
+  const out = new ImageData(outputWidth, outputHeight);
+  let i = 0;
 
-  // Number of wasm memory pages (á 64KiB) needed to store the image twice.
+  // In the straight-copy case, d1 is x, d2 is y.
-  const bytesPerImage = data.width * data.height * 4;
+  // x starts at 0 and increases.
-  const numPagesNeeded = Math.ceil((bytesPerImage * 2 + 8) / (64 * 1024));
+  // y starts at 0 and increases.
-  // Only count full pages, just to be safe.
+  let d1Start = 0;
-  const numPagesAvailable = Math.floor(
+  let d1Limit = inputWidth;
-    instance.exports.memory.buffer.byteLength / (64 * 1024),
+  let d1Advance = 1;
-  );
+  let d1Multiplier = 1;
-  const additionalPagesToAllocate = numPagesNeeded - numPagesAvailable;
+  let d2Start = 0;
+  let d2Limit = inputHeight;
+  let d2Advance = 1;
+  let d2Multiplier = inputWidth;
 
-  if (additionalPagesToAllocate > 0) {
+  if (rotate === 90) {
-    instance.exports.memory.grow(additionalPagesToAllocate);
+    // d1 is y, d2 is x.
+    // y starts at its max value and decreases.
+    // x starts at 0 and increases.
+    d1Start = inputHeight - 1;
+    d1Limit = inputHeight;
+    d1Advance = -1;
+    d1Multiplier = inputWidth;
+    d2Start = 0;
+    d2Limit = inputWidth;
+    d2Advance = 1;
+    d2Multiplier = 1;
+  } else if (rotate === 180) {
+    // d1 is x, d2 is y.
+    // x starts at its max and decreases.
+    // y starts at its max and decreases.
+    d1Start = inputWidth - 1;
+    d1Limit = inputWidth;
+    d1Advance = -1;
+    d1Multiplier = 1;
+    d2Start = inputHeight - 1;
+    d2Limit = inputHeight;
+    d2Advance = -1;
+    d2Multiplier = inputWidth;
+  } else if (rotate === 270) {
+    // d1 is y, d2 is x.
+    // y starts at 0 and increases.
+    // x starts at its max and decreases.
+    d1Start = 0;
+    d1Limit = inputHeight;
+    d1Advance = 1;
+    d1Multiplier = inputWidth;
+    d2Start = inputWidth - 1;
+    d2Limit = inputWidth;
+    d2Advance = -1;
+    d2Multiplier = 1;
   }
-  const view = new Uint8ClampedArray(instance.exports.memory.buffer);
-  view.set(data.data, 8);
 
-  instance.exports.rotate(data.width, data.height, opts.rotate);
+  for (let d2 = d2Start; d2 >= 0 && d2 < d2Limit; d2 += d2Advance) {
+    for (let d1 = d1Start; d1 >= 0 && d1 < d1Limit; d1 += d1Advance) {
+      // Iterate over channels:
+      const start = ((d1 * d1Multiplier) + (d2 * d2Multiplier)) * bpp;
+      for (let j = 0; j < bpp; j += 1) {
+        out.data[i] = data.data[start + j];
+        i += 1;
+      }
+    }
+  }
 
-  const flipDimensions = opts.rotate % 180 !== 0;
+  return out;
-  return new ImageData(
-    view.slice(bytesPerImage + 8, bytesPerImage * 2 + 8),
-    flipDimensions ? data.height : data.width,
-    flipDimensions ? data.width : data.height,
-  );
 }

src/codecs/util.ts

@@ -2,7 +2,7 @@ type ModuleFactory<M extends EmscriptenWasm.Module> = (
   opts: EmscriptenWasm.ModuleOpts,
 ) => M;
 
-export function initEmscriptenModule<T extends EmscriptenWasm.Module>(
+export function initWasmModule<T extends EmscriptenWasm.Module>(
   moduleFactory: ModuleFactory<T>,
   wasmUrl: string,
 ): Promise<T> {
@@ -25,12 +25,3 @@ export function initEmscriptenModule<T extends EmscriptenWasm.Module>(
     });
   });
 }
-
-interface ClampOpts {
-  min?: number;
-  max?: number;
-}
-
-export function clamp(x: number, opts: ClampOpts): number {
-  return Math.min(Math.max(x, opts.min || Number.MIN_VALUE), opts.max || Number.MAX_VALUE);
-}