⬆️ Upgrade libjxl to v0.9.2

inflation · Feb 11, 2024 · 9855b5a · 9855b5a
1 parent d564940
commit 9855b5a
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 22 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "libjxl"]
 	path = jpegxl-src/libjxl
 	url = https://github.com/libjxl/libjxl
-	branch = tags/v0.9.1
+	branch = tags/v0.9.2
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,3 +1,6 @@
 [workspace]
 members = ["jpegxl-src", "jpegxl-sys", "jpegxl-rs"]
-resolver = "2"
+resolver = "2"
+
+[workspace.dependencies]
+pretty_assertions = "1.4.0"
diff --git a/jpegxl-rs/Cargo.toml b/jpegxl-rs/Cargo.toml
@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later"
 name = "jpegxl-rs"
 readme = "README.md"
 repository = "https://github.com/inflation/jpegxl-rs"
-version = "0.9.0+libjxl-0.9.1"
+version = "0.9.1+libjxl-0.9.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -28,21 +28,22 @@ bench = []
 
 [dependencies]
 derive_builder = "0.13.0"
-image = { version = "0.24.7", optional = true, default-features = false }
-thiserror = "1.0.51"
+image = { version = "0.24.8", optional = true, default-features = false }
+thiserror = "1.0.56"
 half = "2.3.1"
 byteorder = "1.5.0"
 
 [dependencies.jpegxl-sys]
-version = "0.9.0"
+version = "0.9.1"
 path = "../jpegxl-sys"
 
 [dev-dependencies]
-image = { version = "0.24.7", default-features = false, features = [
+image = { version = "0.24.8", default-features = false, features = [
     "jpeg",
     "png",
 ] }
-lcms2 = "6.0.3"
+lcms2 = "6.0.4"
+pretty_assertions.workspace = true
 testresult = "0.3.0"
 
 [target.'cfg(not(target_family = "wasm"))'.dev-dependencies]

diff --git a/jpegxl-rs/src/image.rs b/jpegxl-rs/src/image.rs
@@ -135,17 +135,17 @@ fn to_image(
 
 #[cfg(test)]
 mod tests {
-    use half::f16;
-    use testresult::TestResult;
-
+    use super::*;
     use crate::{
         decode::PixelFormat,
         decoder_builder,
         tests::{SAMPLE_JXL, SAMPLE_JXL_GRAY, SAMPLE_PNG},
         ThreadsRunner,
     };
 
-    use super::*;
+    use half::f16;
+    use pretty_assertions::assert_eq;
+    use testresult::TestResult;
 
     #[test]
     #[cfg_attr(coverage_nightly, coverage(off))]

diff --git a/jpegxl-rs/src/tests/decode.rs b/jpegxl-rs/src/tests/decode.rs
@@ -1,6 +1,6 @@
 use half::f16;
 use image::ImageDecoder;
-
+use pretty_assertions::assert_eq;
 use testresult::TestResult;
 
 use crate::{

diff --git a/jpegxl-rs/src/tests/encode.rs b/jpegxl-rs/src/tests/encode.rs
@@ -1,5 +1,6 @@
 use half::f16;
 use image::DynamicImage;
+use pretty_assertions::assert_eq;
 use testresult::TestResult;
 
 use crate::{

diff --git a/jpegxl-rs/src/utils.rs b/jpegxl-rs/src/utils.rs
@@ -35,9 +35,10 @@ pub fn check_valid_signature(buf: &[u8]) -> Option<bool> {
 #[cfg(test)]
 mod tests {
     use super::*;
-
     use crate::tests::SAMPLE_JXL;
 
+    use pretty_assertions::assert_eq;
+
     #[test]
     fn test_signature() {
         assert!(check_valid_signature(&[]).is_none());

diff --git a/jpegxl-src/Cargo.toml b/jpegxl-src/Cargo.toml
@@ -6,7 +6,7 @@ license = "BSD-3-Clause"
 name = "jpegxl-src"
 readme = "README.md"
 repository = "https://github.com/inflation/jpegxl-rs"
-version = "0.9.1"
+version = "0.9.2"
 exclude = [
     "libjxl/third_party/libpng",
     "libjxl/third_party/sjpeg",

diff --git a/jpegxl-src/libjxl b/jpegxl-src/libjxl
diff --git a/jpegxl-sys/Cargo.toml b/jpegxl-sys/Cargo.toml
@@ -9,7 +9,7 @@ links = "jxl"
 name = "jpegxl-sys"
 readme = "README.md"
 repository = "https://github.com/inflation/jpegxl-rs"
-version = "0.9.0+libjxl-0.9.1"
+version = "0.9.1+libjxl-0.9.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -21,15 +21,16 @@ module_name_repetitions = "allow"
 features = ["docs"]
 
 [build-dependencies]
-pkg-config = "0.3.28"
+pkg-config = "0.3.29"
 
 [build-dependencies.jpegxl-src]
-version = "0.9.0"
+version = "0.9.2"
 path = "../jpegxl-src"
 optional = true
 
 [dev-dependencies]
-image = { version = "0.24.7", default-features = false, features = ["png"] }
+image = { version = "0.24.8", default-features = false, features = ["png"] }
+pretty_assertions.workspace = true
 
 [features]
 default = ["threads"]

diff --git a/jpegxl-sys/src/lib.rs b/jpegxl-sys/src/lib.rs
@@ -44,8 +44,11 @@ mod test {
         },
         types::*,
     };
+
     use std::{mem::MaybeUninit, ptr};
 
+    use pretty_assertions::assert_eq;
+
     const SAMPLE_PNG: &[u8] = include_bytes!("../../samples/sample.png");
     const SAMPLE_JXL: &[u8] = include_bytes!("../../samples/sample.jxl");
 
@@ -81,8 +84,8 @@ mod test {
     #[cfg_attr(coverage_nightly, coverage(off))]
     fn test_bindings_version() {
         unsafe {
-            assert_eq!(JxlDecoderVersion(), 9001);
-            assert_eq!(JxlEncoderVersion(), 9001);
+            assert_eq!(JxlDecoderVersion(), 9002);
+            assert_eq!(JxlEncoderVersion(), 9002);
         }
     }
+139 −0		.github/workflows/build_test_wasm.yml
+1 −1		.github/workflows/conformance.yml
+2 −0		AUTHORS
+6 −0		CHANGELOG.md
+3 −1		CMakeLists.txt
+7 −1		debian/changelog
+1 −1		lib/CMakeLists.txt
+4 −0		lib/jxl/base/status.h
+20 −0		lib/jxl/dec_group.cc
+24 −39		lib/jxl/decode.cc
+6 −2		lib/jxl/decode_test.cc
+1 −1		lib/jxl_lists.bzl
+21 −12		lib/jxl_tests.cmake
+4 −6		plugins/gdk-pixbuf/pixbufloader-jxl.c
+6 −2		tools/CMakeLists.txt
+14 −11		tools/conformance/CMakeLists.txt
+9 −0		tools/djxl_main.cc
+7 −2		tools/wasm_demo/CMakeLists.txt