Merge pull request #1396 from andrews05/oxipng9

Update oxipng to v9 [updated]

codecs/oxipng/Cargo.toml

@@ -12,8 +12,7 @@ wasm-opt = ["-O", "--no-validation"]
 crate-type = ["cdylib"]
 
 [dependencies]
-oxipng = { version = "4.0.3", default-features = false, features = ["libdeflater"] }
-libdeflater = { version = "0.7.1", features = ["freestanding"] }
+oxipng = { version = "9.0", default-features = false, features = ["freestanding"] }
 wasm-bindgen = "0.2.73"
 log = { version = "0.4.11", features = ["release_max_level_off"] }
 wasm-bindgen-rayon = { version = "1.0", optional = true }

codecs/oxipng/README.md

@@ -1,5 +1,5 @@
 # OxiPNG
 
 - Source: <https://github.com/shssoichiro/oxipng>
-- Version: v3.0.0
+- Version: v9.0.0
 - License: MIT

codecs/oxipng/build.sh

@@ -5,5 +5,5 @@ set -e
 rm -rf pkg,{-parallel}
 export CFLAGS="${CFLAGS} -DUNALIGNED_ACCESS_IS_FAST=1"
 wasm-pack build -t web
-RUSTFLAGS='-C target-feature=+atomics,+bulk-memory' wasm-pack build -t web -d pkg-parallel -- -Z build-std=panic_abort,std --features=parallel
+RUSTFLAGS='-C target-feature=+atomics,+bulk-memory' wasm-pack build -t web -d pkg-parallel . -- -Z build-std=panic_abort,std --features=parallel
 rm pkg{,-parallel}/.gitignore

codecs/oxipng/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxipng",
   "scripts": {
-    "build": "RUST_IMG=rustlang/rust@sha256:744aeea5a38f95aa7a96ec37269a65f0c6197a1cdd87d6534e12bb869141d807 ../build-rust.sh ./build.sh"
+    "build": "RUST_IMG=rustlang/rust@sha256:5fd16a5576c22c8fdd5d659247755999e426c04de8dcf18a41ea446c5f253309 ../build-rust.sh ./build.sh"
   }
 }

codecs/oxipng/pkg-parallel/README.md

@@ -1,5 +1,5 @@
 # OxiPNG
 
 - Source: <https://github.com/shssoichiro/oxipng>
-- Version: v3.0.0
+- Version: v9.0.0
 - License: MIT

codecs/oxipng/pkg-parallel/package.json

@@ -11,5 +11,7 @@
   ],
   "module": "squoosh_oxipng.js",
   "types": "squoosh_oxipng.d.ts",
-  "sideEffects": false
+  "sideEffects": [
+    "./snippets/*"
+  ]
 }

codecs/oxipng/pkg/README.md

@@ -1,5 +1,5 @@
 # OxiPNG
 
 - Source: <https://github.com/shssoichiro/oxipng>
-- Version: v3.0.0
+- Version: v9.0.0
 - License: MIT

codecs/oxipng/pkg/package.json

@@ -11,5 +11,7 @@
   ],
   "module": "squoosh_oxipng.js",
   "types": "squoosh_oxipng.d.ts",
-  "sideEffects": false
+  "sideEffects": [
+    "./snippets/*"
+  ]
 }

codecs/oxipng/src/lib.rs

@@ -1,20 +1,27 @@
 #[cfg(feature = "parallel")]
 pub use wasm_bindgen_rayon::init_thread_pool;
 
-use oxipng::AlphaOptim;
+use oxipng::{BitDepth, ColorType, Interlacing};
 use wasm_bindgen::prelude::*;
+use wasm_bindgen::Clamped;
 
 #[wasm_bindgen]
-pub fn optimise(data: &[u8], level: u8, interlace: bool) -> Vec<u8> {
+pub fn optimise(
+    data: Clamped<Vec<u8>>,
+    width: u32,
+    height: u32,
+    level: u8,
+    interlace: bool,
+) -> Vec<u8> {
     let mut options = oxipng::Options::from_preset(level);
-    options.alphas.insert(AlphaOptim::Black);
-    options.alphas.insert(AlphaOptim::White);
-    options.alphas.insert(AlphaOptim::Up);
-    options.alphas.insert(AlphaOptim::Down);
-    options.alphas.insert(AlphaOptim::Left);
-    options.alphas.insert(AlphaOptim::Right);
-    options.interlace = Some(if interlace { 1 } else { 0 });
+    options.optimize_alpha = true;
+    options.interlace = Some(if interlace {
+        Interlacing::Adam7
+    } else {
+        Interlacing::None
+    });
 
-    options.deflate = oxipng::Deflaters::Libdeflater;
-    oxipng::optimize_from_memory(data, &options).unwrap_throw()
+    let raw = oxipng::RawImage::new(width, height, ColorType::RGBA, BitDepth::Eight, data.0)
+        .unwrap_throw();
+    raw.create_optimized_png(&options).unwrap_throw()
 }

codecs/rust.Dockerfile

@@ -2,7 +2,7 @@ ARG RUST_IMG=rust:1.47
 
 FROM emscripten/emsdk:2.0.8 AS wasm-tools
 WORKDIR /opt/wasm-tools
-RUN wget -qO- https://github.com/rustwasm/wasm-pack/releases/download/v0.9.1/wasm-pack-v0.9.1-x86_64-unknown-linux-musl.tar.gz | tar -xzf - --strip 1
+RUN wget -qO- https://github.com/rustwasm/wasm-pack/releases/download/v0.12.1/wasm-pack-v0.12.1-x86_64-unknown-linux-musl.tar.gz | tar -xzf - --strip 1
 
 FROM $RUST_IMG AS rust
 ARG RUST_IMG

src/features/encoders/oxiPNG/client/index.tsx

@@ -1,9 +1,4 @@
-import { canvasEncode } from 'client/lazy-app/util/canvas';
-import {
-  abortable,
-  blobToArrayBuffer,
-  inputFieldChecked,
-} from 'client/lazy-app/util';
+import { inputFieldChecked } from 'client/lazy-app/util';
 import { EncodeOptions } from '../shared/meta';
 import type WorkerBridge from 'client/lazy-app/worker-bridge';
 import { h, Component } from 'preact';
@@ -18,9 +13,7 @@ export async function encode(
   imageData: ImageData,
   options: EncodeOptions,
 ) {
-  const pngBlob = await abortable(signal, canvasEncode(imageData, 'image/png'));
-  const pngBuffer = await abortable(signal, blobToArrayBuffer(pngBlob));
-  return workerBridge.oxipngEncode(signal, pngBuffer, options);
+  return workerBridge.oxipngEncode(signal, imageData, options);
 }
 
 type Props = {
@@ -56,7 +49,7 @@ export class Options extends Component<Props, {}> {
           <Range
             name="level"
             min="0"
-            max="3"
+            max="6"
             step="1"
             value={options.level}
             onInput={this.onChange}

src/features/encoders/oxiPNG/worker/oxipngEncode.ts

@@ -35,7 +35,7 @@ async function initST() {
 let wasmReady: ReturnType<typeof initMT | typeof initST>;
 
 export default async function encode(
-  data: ArrayBuffer,
+  data: ImageData,
   options: EncodeOptions,
 ): Promise<ArrayBuffer> {
   if (!wasmReady) {
@@ -45,6 +45,11 @@ export default async function encode(
   }
 
   const optimise = await wasmReady;
-  return optimise(new Uint8Array(data), options.level, options.interlace)
-    .buffer;
+  return optimise(
+    data.data,
+    data.width,
+    data.height,
+    options.level,
+    options.interlace,
+  ).buffer;
 }