Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 10 additions & 33 deletions weaver/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions weaver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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"]
Expand Down
4 changes: 2 additions & 2 deletions weaver/src/jxl_decode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -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());
Expand Down
Loading