Fixing others

.nvmrc

@@ -1 +1 @@
-10.15.3
+v10.15.1

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 = "squooshresize"
-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,18 +0,0 @@
-FROM ubuntu
-RUN apt-get update && \
-  apt-get install -qqy git build-essential cmake python2.7
-RUN git clone --recursive https://github.com/WebAssembly/wabt /usr/src/wabt
-RUN mkdir -p /usr/src/wabt/build
-WORKDIR /usr/src/wabt/build
-RUN cmake .. -DCMAKE_INSTALL_PREFIX=/opt/wabt && \
-  make && \
-  make install
-
-FROM rust
-RUN rustup install nightly && \
-  rustup target add --toolchain nightly wasm32-unknown-unknown && \
-  cargo install wasm-pack
-
-COPY --from=0 /opt/wabt /opt/wabt
-ENV PATH="/opt/wabt/bin:${PATH}"
-WORKDIR /src

codecs/resize/benchmark.js

@@ -1,53 +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
-
-self = global = this;
-load("./pkg/resize.js");
-
-async function init() {
-  //  Adjustable constants.
-  const inputDimensions = 2000;
-  const outputDimensions = 1500;
-  const algorithm = 3; // Lanczos
-  const iterations = new Array(100);
-
-  // Constants. Don’t change.
-  const imageByteSize = inputDimensions * inputDimensions * 4;
-  const imageBuffer = new Uint8ClampedArray(imageByteSize);
-
-  const module = await WebAssembly.compile(readbuffer("./pkg/resize_bg.wasm"));
-  await wasm_bindgen(module);
-  [[false, false], [true, false], [false, true], [true, true]].forEach(
-    opts => {
-      print(`\npremultiplication: ${opts[0]}`);
-      print(`color space conversion: ${opts[1]}`);
-      print(`==============================`);
-      for (let i = 0; i < 100; i++) {
-        const start = Date.now();
-        wasm_bindgen.resize(
-          imageBuffer,
-          inputDimensions,
-          inputDimensions,
-          outputDimensions,
-          outputDimensions,
-          algorithm,
-          ...opts
-        );
-        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, e.stack));

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 "============================================="
-(
-  rustup run nightly \
-    wasm-pack build --target no-modules
-  wasm-strip pkg/resize_bg.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-resize .\`"
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/resize/package-lock.json

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

codecs/resize/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "resize",
-  "scripts": {
-    "build:image": "docker build -t squoosh-resize .",
-    "build": "docker run --rm -v $(pwd):/src squoosh-resize ./build.sh",
-    "benchmark": "v8 --no-liftoff --no-wasm-tier-up ./benchmark.js"
-  }
-}

codecs/resize/pkg/resize.d.ts

@@ -1,13 +0,0 @@
-/* tslint:disable */
-/**
-* @param {Uint8Array} arg0 
-* @param {number} arg1 
-* @param {number} arg2 
-* @param {number} arg3 
-* @param {number} arg4 
-* @param {number} arg5 
-* @param {boolean} arg6 
-* @param {boolean} arg7 
-* @returns {Uint8Array} 
-*/
-export function resize(arg0: Uint8Array, arg1: number, arg2: number, arg3: number, arg4: number, arg5: number, arg6: boolean, arg7: boolean): Uint8Array;

codecs/resize/pkg/resize.js

@@ -1,114 +0,0 @@
-(function() {
-    var wasm;
-    const __exports = {};
-
-
-    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;
-    }
-
-    function getArrayU8FromWasm(ptr, len) {
-        return getUint8Memory().subarray(ptr / 1, ptr / 1 + len);
-    }
-
-    let cachedGlobalArgumentPtr = null;
-    function globalArgumentPtr() {
-        if (cachedGlobalArgumentPtr === null) {
-            cachedGlobalArgumentPtr = wasm.__wbindgen_global_argument_ptr();
-        }
-        return cachedGlobalArgumentPtr;
-    }
-
-    let cachegetUint32Memory = null;
-    function getUint32Memory() {
-        if (cachegetUint32Memory === null || cachegetUint32Memory.buffer !== wasm.memory.buffer) {
-            cachegetUint32Memory = new Uint32Array(wasm.memory.buffer);
-        }
-        return cachegetUint32Memory;
-    }
-    /**
-    * @param {Uint8Array} arg0
-    * @param {number} arg1
-    * @param {number} arg2
-    * @param {number} arg3
-    * @param {number} arg4
-    * @param {number} arg5
-    * @param {boolean} arg6
-    * @param {boolean} arg7
-    * @returns {Uint8Array}
-    */
-    __exports.resize = function(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) {
-        const ptr0 = passArray8ToWasm(arg0);
-        const len0 = WASM_VECTOR_LEN;
-        const retptr = globalArgumentPtr();
-        wasm.resize(retptr, ptr0, len0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-        const mem = getUint32Memory();
-        const rustptr = mem[retptr / 4];
-        const rustlen = mem[retptr / 4 + 1];
-
-        const realRet = getArrayU8FromWasm(rustptr, rustlen).slice();
-        wasm.__wbindgen_free(rustptr, rustlen * 1);
-        return realRet;
-
-    };
-
-    const heap = new Array(32);
-
-    heap.fill(undefined);
-
-    heap.push(undefined, null, true, false);
-
-    let heap_next = heap.length;
-
-    function dropObject(idx) {
-        if (idx < 36) return;
-        heap[idx] = heap_next;
-        heap_next = idx;
-    }
-
-    __exports.__wbindgen_object_drop_ref = function(i) { dropObject(i); };
-
-    function init(path_or_module) {
-        let instantiation;
-        const imports = { './resize': __exports };
-        if (path_or_module instanceof WebAssembly.Module) {
-            instantiation = WebAssembly.instantiate(path_or_module, imports)
-            .then(instance => {
-            return { instance, module: path_or_module }
-        });
-    } else {
-        const data = fetch(path_or_module);
-        if (typeof WebAssembly.instantiateStreaming === 'function') {
-            instantiation = WebAssembly.instantiateStreaming(data, imports)
-            .catch(e => {
-                console.warn("`WebAssembly.instantiateStreaming` failed. Assuming this is because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e);
-                return data
-                .then(r => r.arrayBuffer())
-                .then(bytes => WebAssembly.instantiate(bytes, imports));
-            });
-        } else {
-            instantiation = data
-            .then(response => response.arrayBuffer())
-            .then(buffer => WebAssembly.instantiate(buffer, imports));
-        }
-    }
-    return instantiation.then(({instance}) => {
-        wasm = init.wasm = instance.exports;
-
-    });
-};
-self.wasm_bindgen = Object.assign(init, __exports);
-})();

codecs/resize/pkg/resize_bg.d.ts

@@ -1,6 +0,0 @@
-/* tslint:disable */
-export const memory: WebAssembly.Memory;
-export function __wbindgen_global_argument_ptr(): number;
-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/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/package.json

@@ -2,10 +2,6 @@
   "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"
+    "build": "docker run --rm -v $(pwd):/src squoosh-rotate ./build.sh"
   }
 }

codecs/rotate/rotate.rs

@@ -1,113 +1,90 @@
-use std::slice::{from_raw_parts, from_raw_parts_mut};
+use std::slice::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> {
+// This function is taken from
+// https://rustwasm.github.io/book/reference/code-size.html
 #[cfg(not(debug_assertions))]
 #[inline]
-    fn unwrap_hard(self) -> T {
-        match self {
+pub fn unwrap_abort<T>(o: Option<T>) -> T {
+    use std::process;
+    match o {
         Some(t) => t,
-            None => std::process::abort(),
+        None => process::abort(),
     }
 }
 
+// Normal panic-y behavior for debug builds
 #[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;
-                }
-            }
-        }
-    }
+unsafe fn unchecked_unwrap<T>(o: Option<T>) -> T {
+    o.unwrap()
 }
 
 #[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(),
+fn rotate(input_width: isize, input_height: isize, rotate: isize) {
+  let mut i = 0isize;
+
+  // In the straight-copy case, d1 is x, d2 is y.
+  // x starts at 0 and increases.
+  // y starts at 0 and increases.
+  let mut d1_start: isize = 0;
+  let mut d1_limit: isize = input_width;
+  let mut d1_advance: isize = 1;
+  let mut d1_multiplier: isize = 1;
+  let mut d2_start: isize = 0;
+  let mut d2_limit: isize = input_height;
+  let mut d2_advance: isize = 1;
+  let mut d2_multiplier: isize = input_width;
+
+  if rotate == 90 {
+    // d1 is y, d2 is x.
+    // y starts at its max value and decreases.
+    // x starts at 0 and increases.
+    d1_start = input_height - 1;
+    d1_limit = input_height;
+    d1_advance = -1;
+    d1_multiplier = input_width;
+    d2_start = 0;
+    d2_limit = input_width;
+    d2_advance = 1;
+    d2_multiplier = 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.
+    d1_start = input_width - 1;
+    d1_limit = input_width;
+    d1_advance = -1;
+    d1_multiplier = 1;
+    d2_start = input_height - 1;
+    d2_limit = input_height;
+    d2_advance = -1;
+    d2_multiplier = input_width;
+  } else if rotate == 270 {
+    // d1 is y, d2 is x.
+    // y starts at 0 and increases.
+    // x starts at its max and decreases.
+    d1_start = 0;
+    d1_limit = input_height;
+    d1_advance = 1;
+    d1_multiplier = input_width;
+    d2_start = input_width - 1;
+    d2_limit = input_width;
+    d2_advance = -1;
+    d2_multiplier = 1;
+  }
+
+  let num_pixels = (input_width * input_height) as usize;
+  let in_b: &mut [u32];
+  let out_b: &mut [u32];
+  unsafe {
+    in_b = from_raw_parts_mut::<u32>(4 as *mut u32, num_pixels);
+    out_b = from_raw_parts_mut::<u32>((input_width * input_height * 4 + 4) as *mut u32, num_pixels);
+  }
+
+  for d2 in 0..d2_limit {
+    for d1 in 0..d1_limit {
+      let in_idx = (d1_start + d1 * d1_advance) * d1_multiplier + (d2_start + d2 * d2_advance) * d2_multiplier;
+      *unwrap_abort(out_b.get_mut(i as usize)) = *unwrap_abort(in_b.get(in_idx as usize));
+      i += 1;
+    }
   }
 }

config/size-report.js

@@ -22,7 +22,6 @@ function fetchTravisBuildInfo(user, repo, branch) {
     'branch.name': branch,
     state: 'passed',
     limit: 1,
-    event_type: 'push',
   }).then(r => r.json());
 }
 
@@ -33,7 +32,9 @@ function fetchTravisText(path) {
 /**
  * Recursively-read a directory and turn it into an array of { name, size, gzipSize }
  */
-async function dirToInfoArray(startPath) {
+async function dirToInfoArray(startPath, {
+  namePrefix = '',
+} = {}) {
   const results = await new Promise((resolve, reject) => {
     readdirp({ root: startPath }, (err, results) => {
       if (err) reject(err); else resolve(results);

package.json

@@ -1,12 +1,12 @@
 {
   "private": true,
   "name": "squoosh",
-  "version": "1.6.0",
+  "version": "1.3.3",
   "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}'",
     "sizereport": "node config/size-report.js"
   },
@@ -16,24 +16,24 @@
     }
   },
   "devDependencies": {
-    "@types/node": "10.12.30",
+    "@types/node": "10.12.26",
     "@types/pretty-bytes": "5.1.0",
     "@types/webassembly-js-api": "0.0.2",
     "@webcomponents/custom-elements": "1.2.1",
     "@webpack-cli/serve": "0.1.3",
-    "assets-webpack-plugin": "3.9.10",
-    "chokidar": "2.1.2",
+    "assets-webpack-plugin": "3.9.7",
+    "chokidar": "2.1.1",
     "chalk": "2.4.2",
     "classnames": "2.2.6",
     "clean-webpack-plugin": "1.0.1",
     "comlink": "3.1.1",
-    "copy-webpack-plugin": "5.0.1",
-    "critters-webpack-plugin": "2.3.0",
+    "copy-webpack-plugin": "4.6.0",
+    "critters-webpack-plugin": "2.2.0",
     "css-loader": "1.0.1",
     "ejs": "2.6.1",
     "escape-string-regexp": "1.0.5",
     "exports-loader": "0.7.0",
-    "file-drop-element": "0.2.0",
+    "file-drop-element": "0.0.9",
     "file-loader": "3.0.1",
     "gzip-size": "5.0.0",
     "html-webpack-plugin": "3.2.0",
@@ -48,7 +48,7 @@
     "optimize-css-assets-webpack-plugin": "5.0.1",
     "pointer-tracker": "2.0.3",
     "preact": "8.4.2",
-    "prerender-loader": "1.3.0",
+    "prerender-loader": "1.2.0",
     "pretty-bytes": "5.1.0",
     "progress-bar-webpack-plugin": "1.12.1",
     "raw-loader": "1.0.0",
@@ -57,19 +57,19 @@
     "script-ext-html-webpack-plugin": "2.1.3",
     "source-map-loader": "0.2.4",
     "style-loader": "0.23.1",
-    "terser-webpack-plugin": "1.2.3",
+    "terser-webpack-plugin": "1.2.2",
     "ts-loader": "5.3.3",
-    "tslint": "5.13.1",
+    "tslint": "5.12.1",
     "tslint-config-airbnb": "5.11.1",
     "tslint-config-semistandard": "7.0.0",
     "tslint-react": "3.6.0",
-    "typed-css-modules": "0.4.2",
-    "typescript": "3.3.3333",
+    "typed-css-modules": "0.3.7",
+    "typescript": "3.2.4",
     "url-loader": "1.1.2",
     "webpack": "4.28.0",
-    "webpack-bundle-analyzer": "3.1.0",
+    "webpack-bundle-analyzer": "3.0.4",
     "webpack-cli": "3.2.3",
-    "webpack-dev-server": "3.2.1",
-    "worker-plugin": "3.1.0"
+    "webpack-dev-server": "3.1.14",
+    "worker-plugin": "3.0.0"
   }
 }

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.ts

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

src/codecs/processor-worker/index.ts

@@ -5,7 +5,8 @@ async function mozjpegEncode(
 ): Promise<ArrayBuffer> {
   const { encode } = await import(
     /* webpackChunkName: "process-mozjpeg-enc" */
-    '../mozjpeg/encoder');
+    '../mozjpeg/encoder',
+  );
   return encode(data, options);
 }
 
@@ -14,7 +15,8 @@ async function quantize(
 ): Promise<ImageData> {
   const { process } = await import(
     /* webpackChunkName: "process-imagequant" */
-    '../imagequant/processor');
+    '../imagequant/processor',
+  );
   return process(data, opts);
 }
 
@@ -23,27 +25,19 @@ async function rotate(
 ): Promise<ImageData> {
   const { rotate } = await import(
     /* webpackChunkName: "process-rotate" */
-    '../rotate/processor');
+    '../rotate/processor',
+  );
 
   return rotate(data, opts);
 }
 
-async function resize(
-  data: ImageData, opts: import('../resize/processor-meta').WorkerResizeOptions,
-): Promise<ImageData> {
-  const { resize } = await import(
-    /* webpackChunkName: "process-resize" */
-    '../resize/processor');
-
-  return resize(data, opts);
-}
-
 async function optiPngEncode(
   data: BufferSource, options: import('../optipng/encoder-meta').EncodeOptions,
 ): Promise<ArrayBuffer> {
   const { compress } = await import(
     /* webpackChunkName: "process-optipng" */
-    '../optipng/encoder');
+    '../optipng/encoder',
+  );
   return compress(data, options);
 }
 
@@ -52,18 +46,20 @@ async function webpEncode(
 ): Promise<ArrayBuffer> {
   const { encode } = await import(
     /* webpackChunkName: "process-webp-enc" */
-    '../webp/encoder');
+    '../webp/encoder',
+  );
   return encode(data, options);
 }
 
 async function webpDecode(data: ArrayBuffer): Promise<ImageData> {
   const { decode } = await import(
     /* webpackChunkName: "process-webp-dec" */
-    '../webp/decoder');
+    '../webp/decoder',
+  );
   return decode(data);
 }
 
-const exports = { mozjpegEncode, quantize, rotate, resize, optiPngEncode, webpEncode, webpDecode };
+const exports = { mozjpegEncode, quantize, rotate, optiPngEncode, webpEncode, webpDecode };
 export type ProcessorWorkerApi = typeof exports;
 
 expose(exports, self);

src/codecs/processor.ts

@@ -6,8 +6,8 @@ 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 { browserResize, vectorResize } from './resize/processor-sync';
+import { BitmapResizeOptions, VectorResizeOptions } from './resize/processor-meta';
+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';
@@ -130,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,
@@ -209,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 {
-  inputFieldValueAsNumber, inputFieldValue, preventDefault, inputFieldChecked,
-} from '../../lib/util';
-import { ResizeOptions, isWorkerOptions } from './processor-meta';
+import { inputFieldValueAsNumber, inputFieldValue, preventDefault } from '../../lib/util';
+import { ResizeOptions } from './processor-meta';
 import * as style from '../../components/Options/style.scss';
 import Checkbox from '../../components/checkbox';
 import Expander from '../../components/expander';
@@ -40,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'],
     };
@@ -91,10 +87,6 @@ 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="browser-pixelated">Browser pixelated</option>
             <option value="browser-low">Browser low quality</option>
             <option value="browser-medium">Browser medium quality</option>
@@ -125,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,46 +1,26 @@
-type BrowserResizeMethods = 'browser-pixelated' | 'browser-low' | 'browser-medium' | 'browser-high';
-type WorkerResizeMethods = 'triangle' | 'catrom' | 'mitchell' | 'lanczos3';
-const workerResizeMethods: WorkerResizeMethods[] = ['triangle', 'catrom', 'mitchell', 'lanczos3'];
+type BitmapResizeMethods = 'browser-pixelated' | 'browser-low' | 'browser-medium' | 'browser-high';
 
-export type ResizeOptions = BrowserResizeOptions | WorkerResizeOptions | VectorResizeOptions;
-
-export interface ResizeOptionsCommon {
+export interface ResizeOptions {
   width: number;
   height: number;
+  method: 'vector' | BitmapResizeMethods;
   fitMethod: 'stretch' | 'contain';
 }
 
-export interface BrowserResizeOptions extends ResizeOptionsCommon {
-  method: BrowserResizeMethods;
+export interface BitmapResizeOptions extends ResizeOptions {
+  method: BitmapResizeMethods;
 }
 
-export interface WorkerResizeOptions extends ResizeOptionsCommon {
-  method: WorkerResizeMethods;
-  premultiply: boolean;
-  linearRGB: boolean;
-}
-
-export interface VectorResizeOptions extends ResizeOptionsCommon {
+export interface VectorResizeOptions extends ResizeOptions {
   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);
-}
-
 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,52 +1,49 @@
-import wasmUrl from '../../../codecs/resize/pkg/resize_bg.wasm';
-import '../../../codecs/resize/pkg/resize';
-import { WorkerResizeOptions } from './processor-meta';
-import { getContainOffsets } from './util';
+import { nativeResize, NativeResizeMethod, drawableToImageData } from '../../lib/util';
+import { BitmapResizeOptions, VectorResizeOptions } from './processor-meta';
 
-interface WasmBindgenExports {
-  resize: typeof import('../../../codecs/resize/pkg/resize').resize;
+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 };
   }
 
-type WasmBindgen = ((url: string) => Promise<void>) & WasmBindgenExports;
-
-declare var wasm_bindgen: WasmBindgen;
-
-const ready = wasm_bindgen(wasmUrl);
-
-function crop(data: ImageData, sx: number, sy: number, sw: number, sh: number): ImageData {
-  const inputPixels = new Uint32Array(data.data.buffer);
-
-  // Copy within the same buffer for speed and memory efficiency.
-  for (let y = 0; y < sh; y += 1) {
-    const start = ((y + sy) * data.width) + sx;
-    inputPixels.copyWithin(y * sw, start, start + sw);
+  const newSw = sh * endAspect;
+  const newSx = (sw - newSw) / 2;
+  return { sh, sw: newSw, sx: newSx, sy: 0 };
 }
 
-  return new ImageData(
-    new Uint8ClampedArray(inputPixels.buffer.slice(0, sw * sh * 4)),
-    sw, sh,
-  );
-}
-
-/** Resize methods by index */
-const resizeMethods: WorkerResizeOptions['method'][] = [
-  'triangle', 'catrom', 'mitchell', 'lanczos3',
-];
-
-export async function resize(data: ImageData, opts: WorkerResizeOptions): Promise<ImageData> {
-  let input = data;
+export function resize(data: ImageData, opts: BitmapResizeOptions): ImageData {
+  let sx = 0;
+  let sy = 0;
+  let sw = data.width;
+  let sh = data.height;
 
   if (opts.fitMethod === 'contain') {
-    const { sx, sy, sw, sh } = getContainOffsets(data.width, data.height, opts.width, opts.height);
-    input = crop(input, Math.round(sx), Math.round(sy), Math.round(sw), Math.round(sh));
+    ({ sx, sy, sw, sh } = getContainOffsets(sw, sh, opts.width, opts.height));
   }
 
-  await ready;
-
-  const result = wasm_bindgen.resize(
-    new Uint8Array(input.data.buffer), input.width, input.height, opts.width, opts.height,
-    resizeMethods.indexOf(opts.method), opts.premultiply, opts.linearRGB,
+  return nativeResize(
+    data, sx, sy, sw, sh, opts.width, opts.height,
+    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.ts

@@ -1,42 +1,32 @@
 import wasmUrl from '../../../codecs/rotate/rotate.wasm';
 import { RotateOptions, RotateModuleInstance } from './processor-meta';
 
-// We are loading a 500B module here. Loading the code to feature-detect
-// `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));
+const instancePromise = (WebAssembly as any).instantiateStreaming(fetch(wasmUrl));
 
 export async function rotate(
   data: ImageData,
   opts: RotateOptions,
 ): Promise<ImageData> {
-  const { instance } = (await instancePromise) as {
-    instance: RotateModuleInstance;
-  };
+  const { instance } = (await instancePromise) as {instance: RotateModuleInstance};
 
   // Number of wasm memory pages (á 64KiB) needed to store the image twice.
   const bytesPerImage = data.width * data.height * 4;
-  const numPagesNeeded = Math.ceil((bytesPerImage * 2 + 8) / (64 * 1024));
+  const numPagesNeeded = Math.ceil((bytesPerImage * 2 + 4) / (64 * 1024));
   // Only count full pages, just to be safe.
-  const numPagesAvailable = Math.floor(
-    instance.exports.memory.buffer.byteLength / (64 * 1024),
-  );
+  const numPagesAvailable = Math.floor(instance.exports.memory.buffer.byteLength / (64 * 1024));
   const additionalPagesToAllocate = numPagesNeeded - numPagesAvailable;
 
   if (additionalPagesToAllocate > 0) {
     instance.exports.memory.grow(additionalPagesToAllocate);
   }
   const view = new Uint8ClampedArray(instance.exports.memory.buffer);
-  view.set(data.data, 8);
+  view.set(data.data, 4);
 
   instance.exports.rotate(data.width, data.height, opts.rotate);
 
   const flipDimensions = opts.rotate % 180 !== 0;
   return new ImageData(
-    view.slice(bytesPerImage + 8, bytesPerImage * 2 + 8),
+    view.slice(bytesPerImage + 4, bytesPerImage * 2 + 4),
     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> {

src/codecs/webp/decoder.ts

@@ -1,11 +1,11 @@
 import webp_dec, { WebPModule } from '../../../codecs/webp_dec/webp_dec';
 import wasmUrl from '../../../codecs/webp_dec/webp_dec.wasm';
-import { initEmscriptenModule } from '../util';
+import { initWasmModule } from '../util';
 
 let emscriptenModule: Promise<WebPModule>;
 
 export async function decode(data: ArrayBuffer): Promise<ImageData> {
-  if (!emscriptenModule) emscriptenModule = initEmscriptenModule(webp_dec, wasmUrl);
+  if (!emscriptenModule) emscriptenModule = initWasmModule(webp_dec, wasmUrl);
 
   const module = await emscriptenModule;
   const rawImage = module.decode(data);

src/codecs/webp/encoder.ts

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

src/components/App/index.tsx

@@ -13,10 +13,12 @@ const ROUTE_EDITOR = '/editor';
 
 const compressPromise = import(
   /* webpackChunkName: "main-app" */
-  '../compress');
+  '../compress',
+);
 const offlinerPromise = import(
   /* webpackChunkName: "offliner" */
-  '../../lib/offliner');
+  '../../lib/offliner',
+);
 
 function back() {
   window.history.back();
@@ -72,9 +74,8 @@ export default class App extends Component<Props, State> {
   }
 
   @bind
-  private onFileDrop({ files }: FileDropEvent) {
-    if (!files || files.length === 0) return;
-    const file = files[0];
+  private onFileDrop({ file }: FileDropEvent) {
+    if (!file) return;
     this.openEditor();
     this.setState({ file });
   }

src/components/compress/index.tsx

@@ -18,14 +18,20 @@ import * as browserTIFF from '../../codecs/browser-tiff/encoder-meta';
 import * as browserJP2 from '../../codecs/browser-jp2/encoder-meta';
 import * as browserBMP from '../../codecs/browser-bmp/encoder-meta';
 import * as browserPDF from '../../codecs/browser-pdf/encoder-meta';
-import { EncoderState, EncoderType, EncoderOptions, encoderMap } from '../../codecs/encoders';
-import { PreprocessorState, defaultPreprocessorState } from '../../codecs/preprocessors';
+import {
+    EncoderState,
+    EncoderType,
+    EncoderOptions,
+    encoderMap,
+} from '../../codecs/encoders';
+import {
+  PreprocessorState,
+  defaultPreprocessorState,
+} from '../../codecs/preprocessors';
 import { decodeImage } from '../../codecs/decoders';
 import { cleanMerge, cleanSet } from '../../lib/clean-modify';
 import Processor from '../../codecs/processor';
-import {
-  BrowserResizeOptions, isWorkerOptions as isWorkerResizeOptions,
-} from '../../codecs/resize/processor-meta';
+import { VectorResizeOptions, BitmapResizeOptions } from '../../codecs/resize/processor-meta';
 import './custom-els/MultiPanel';
 import Results from '../results';
 import { ExpandIcon, CopyAcrossIconProps } from '../../lib/icons';
@@ -104,12 +110,10 @@ async function preprocessImage(
     if (preprocessData.resize.method === 'vector' && source.vectorImage) {
       result = processor.vectorResize(
         source.vectorImage,
-        preprocessData.resize,
+        preprocessData.resize as VectorResizeOptions,
       );
-    } else if (isWorkerResizeOptions(preprocessData.resize)) {
-      result = await processor.workerResize(result, preprocessData.resize);
     } else {
-      result = processor.resize(result, preprocessData.resize as BrowserResizeOptions);
+      result = processor.resize(result, preprocessData.resize as BitmapResizeOptions);
     }
   }
   if (preprocessData.quantizer.enabled) {
@@ -437,7 +441,7 @@ export default class Compress extends Component<Props, State> {
         newState = cleanMerge(newState, `sides.${i}.latestSettings.preprocessorState.resize`, {
           width: processed.width,
           height: processed.height,
-          method: vectorImage ? 'vector' : 'lanczos3',
+          method: vectorImage ? 'vector' : 'browser-high',
         });
       }
 

src/index.ts

@@ -7,7 +7,8 @@ function init() {
 if (!('customElements' in self)) {
   import(
     /* webpackChunkName: "wc-polyfill" */
-    '@webcomponents/custom-elements').then(init);
+    '@webcomponents/custom-elements',
+  ).then(init);
 } else {
   init();
 }

webpack.config.js

@@ -17,6 +17,8 @@ const CrittersPlugin = require('critters-webpack-plugin');
 const AssetTemplatePlugin = require('./config/asset-template-plugin');
 const addCssTypes = require('./config/add-css-types');
 
+const regexpPathSep = path.sep === '\\' ? '\\\\' : '/';
+
 function readJson (filename) {
   return JSON.parse(fs.readFileSync(filename));
 }
@@ -38,7 +40,7 @@ module.exports = async function (_, env) {
   return {
     mode: isProd ? 'production' : 'development',
     entry: {
-      'first-interaction': './src/index'
+      'first-interaction': path.join('.', 'src', 'index'),
     },
     devtool: isProd ? 'source-map' : 'inline-source-map',
     stats: 'minimal',
@@ -52,13 +54,13 @@ module.exports = async function (_, env) {
     resolve: {
       extensions: ['.ts', '.tsx', '.mjs', '.js', '.scss', '.css'],
       alias: {
-        style: path.join(__dirname, 'src/style')
+        style: path.join(__dirname, 'src', 'style')
       }
     },
     resolveLoader: {
       alias: {
         // async-component-loader returns a wrapper component that waits for the import to load before rendering:
-        async: path.join(__dirname, 'config/async-component-loader')
+        async: path.join(__dirname, 'config', 'async-component-loader')
       }
     },
     module: {
@@ -147,11 +149,11 @@ module.exports = async function (_, env) {
         },
         {
           // All the codec files define a global with the same name as their file name. `exports-loader` attaches those to `module.exports`.
-          test: /\/codecs\/.*\.js$/,
+          test: new RegExp(`${regexpPathSep}codecs${regexpPathSep}.*\.js`),
           loader: 'exports-loader'
         },
         {
-          test: /\/codecs\/.*\.wasm$/,
+          test: new RegExp(`${regexpPathSep}codecs${regexpPathSep}.*\.wasm`),
           // This is needed to make webpack NOT process wasm files.
           // See https://github.com/webpack/webpack/issues/6725
           type: 'javascript/auto',
@@ -172,7 +174,7 @@ module.exports = async function (_, env) {
     plugins: [
       new webpack.IgnorePlugin(
         /(fs|crypto|path)/,
-        new RegExp(`${path.sep}codecs${path.sep}`)
+        new RegExp(`${regexpPathSep}codecs${regexpPathSep}`)
       ),
 
       // Pretty progressbar showing build progress: