diff --git a/weaver/Cargo.lock b/weaver/Cargo.lock index e862d2b..7e17330 100644 --- a/weaver/Cargo.lock +++ b/weaver/Cargo.lock @@ -303,9 +303,9 @@ checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" [[package]] name = "jixel" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d2b6ecdc17c4c1e31adf5a0b98820aaebf149781e9d17a97b276eee9c8574af" +checksum = "1eda79e30fc3a03e9f09b4632b0a2d7cf626fb6062b855902f1b9432530782f2" [[package]] name = "jni" @@ -367,9 +367,9 @@ dependencies = [ [[package]] name = "jxl" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d1c706ad4b79469f7e713886c1d62b1cef365f38978c5e78d6e44258b18b99" +checksum = "74aed4bea1d90bd8c20df7ab9bb7ce7593bd55fe68adafb90cfcdc99a0ef8e0b" dependencies = [ "array-init", "byteorder", @@ -383,11 +383,10 @@ dependencies = [ [[package]] name = "jxl_macros" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d67c8b0a177004f4b05f73513c4be845845d2b5b1f93b6db71b5c72a1c9ad748" +checksum = "8d78c22c5117b783f7ccb395888690626dce7895b364ac97b7af6eb735d94fb4" dependencies = [ - "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.115", @@ -395,15 +394,15 @@ dependencies = [ [[package]] name = "jxl_simd" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15d37f283bbcd785c0a1b128a9c1249feb8bdca899fffb0f281a6b183d3c3761" +checksum = "c79e012d858a0085c31bdf9acf18d3a5caade46e2afa0c937c49702eb189986f" [[package]] name = "jxl_transforms" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcc4291b69be45f42167d1722b286fec0ff8644e75e9e74d4c8db24e7e90bdf" +checksum = "08bcbe3b6a6240a6e4fb906def3534764fb616c7a8c571c46b2b2576ebf70067" dependencies = [ "jxl_simd", ] @@ -515,28 +514,6 @@ dependencies = [ "syn 2.0.115", ] -[[package]] -name = "proc-macro-error-attr2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "proc-macro-error2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" -dependencies = [ - "proc-macro-error-attr2", - "proc-macro2", - "quote", - "syn 2.0.115", -] - [[package]] name = "proc-macro2" version = "1.0.106" diff --git a/weaver/Cargo.toml b/weaver/Cargo.toml index 7d4eac8..07c6d38 100644 --- a/weaver/Cargo.toml +++ b/weaver/Cargo.toml @@ -12,7 +12,7 @@ gainforge = "0.5.1" thiserror = "2.0.18" libc = "1.0.0-alpha.3" log = "0.4.32" -jxl = { version = "0.4.3", default-features = false } +jxl = { version = "0.5.0", default-features = false } yuv = { version = "0.8.16", default-features = false, features = ["nightly_f16"] } [target.'cfg(target_os = "android")'.dependencies] @@ -22,7 +22,7 @@ android_logger = { version = "0.15", optional = true } # pulled in only by `lo anyhow = "1.0.102" [target.'cfg(any(target_arch = "aarch64", target_arch = "arm"))'.dependencies] -jixel = { version = "0.2.14", default-features = false } +jixel = { version = "0.2.15", default-features = false } [features] rdm = ["pic-scale/rdm", "moxcms/neon_shaper_fixed_point_paths", "jixel/neon", "jxl/neon"] diff --git a/weaver/src/jxl_decode.rs b/weaver/src/jxl_decode.rs index 243cefa..38b22cf 100644 --- a/weaver/src/jxl_decode.rs +++ b/weaver/src/jxl_decode.rs @@ -67,7 +67,7 @@ pub(crate) const MAX_JXL_SAMPLES_EXCLUSIVE: usize = MAX_JXL_PIXELS * 4 + 1; pub(crate) fn limited_decoder_options() -> JxlDecoderOptions { let mut options = JxlDecoderOptions::default(); - options.pixel_limit = Some(MAX_JXL_SAMPLES_EXCLUSIVE); + options.sample_limit = Some(MAX_JXL_SAMPLES_EXCLUSIVE); options } @@ -305,7 +305,7 @@ mod tests { #[test] fn applies_decoder_and_dimension_limits() { assert_eq!( - limited_decoder_options().pixel_limit, + limited_decoder_options().sample_limit, Some(MAX_JXL_SAMPLES_EXCLUSIVE) ); assert!(validate_jxl_dimensions(MAX_JXL_DIMENSION, MAX_JXL_DIMENSION).is_ok());