⬆️ Upgrade libjxl v0.9.0

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "libjxl"]
 	path = jpegxl-src/libjxl
 	url = https://github.com/libjxl/libjxl
-	branch = tags/v0.8.2
+	branch = tags/v0.9.1

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.8.3+libjxl-0.8.2"
+version = "0.9.0+libjxl-0.9.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -29,20 +29,20 @@ bench = []
 [dependencies]
 derive_builder = "0.12.0"
 image = { version = "0.24.7", optional = true, default-features = false }
-thiserror = "1.0.50"
+thiserror = "1.0.51"
 half = "2.3.1"
 byteorder = "1.5.0"
 
 [dependencies.jpegxl-sys]
-version = "0.8.2"
+version = "0.9.0"
 path = "../jpegxl-sys"
 
 [dev-dependencies]
 image = { version = "0.24.7", default-features = false, features = [
     "jpeg",
     "png",
 ] }
-lcms2 = "6.0.0"
+lcms2 = "6.0.3"
 testresult = "0.3.0"
 
 [target.'cfg(not(target_family = "wasm"))'.dev-dependencies]

jpegxl-rs/src/common.rs

@@ -19,10 +19,11 @@ along with jpegxl-rs.  If not, see <https://www.gnu.org/licenses/>.
 
 use byteorder::{ByteOrder, NativeEndian, BE, LE};
 use half::f16;
-use jpegxl_sys::{JxlDataType, JxlPixelFormat};
+
+use jpegxl_sys::types::{JxlDataType, JxlPixelFormat};
 
 /// Endianness of the pixels
-pub type Endianness = jpegxl_sys::JxlEndianness;
+pub type Endianness = jpegxl_sys::types::JxlEndianness;
 
 mod private {
     pub trait Sealed {}

jpegxl-rs/src/decode.rs

@@ -20,7 +20,11 @@ along with jpegxl-rs.  If not, see <https://www.gnu.org/licenses/>.
 use std::{mem::MaybeUninit, ptr::null};
 
 #[allow(clippy::wildcard_imports)]
-use jpegxl_sys::*;
+use jpegxl_sys::{
+    codestream_header::{JxlBasicInfo, JxlOrientation},
+    decode::*,
+    types::{JxlDataType, JxlPixelFormat},
+};
 
 use crate::{
     common::{Endianness, PixelType},
@@ -84,7 +88,7 @@ impl Default for PixelFormat {
 pub struct JxlDecoder<'pr, 'mm> {
     /// Opaque pointer to the underlying decoder
     #[builder(setter(skip))]
-    dec: *mut jpegxl_sys::JxlDecoder,
+    dec: *mut jpegxl_sys::decode::JxlDecoder,
 
     /// Override desired pixel format
     pub pixel_format: Option<PixelFormat>,
@@ -298,7 +302,6 @@ impl<'pr, 'mm> JxlDecoder<'pr, 'mm> {
                 }
                 s::NeedPreviewOutBuffer => todo!(),
                 s::BoxNeedMoreOutput => todo!(),
-                s::Extensions => todo!(),
                 s::PreviewImage => todo!(),
                 s::Frame => todo!(),
                 s::Box => todo!(),
@@ -351,19 +354,13 @@ impl<'pr, 'mm> JxlDecoder<'pr, 'mm> {
     fn get_icc_profile(&self, icc_profile: &mut Vec<u8>) -> Result<(), DecodeError> {
         let mut icc_size = 0;
         check_dec_status(unsafe {
-            JxlDecoderGetICCProfileSize(
-                self.dec,
-                null(),
-                JxlColorProfileTarget::Data,
-                &mut icc_size,
-            )
+            JxlDecoderGetICCProfileSize(self.dec, JxlColorProfileTarget::Data, &mut icc_size)
         })?;
         icc_profile.resize(icc_size, 0);
 
         check_dec_status(unsafe {
             JxlDecoderGetColorAsICCProfile(
                 self.dec,
-                null(),
                 JxlColorProfileTarget::Data,
                 icc_profile.as_mut_ptr(),
                 icc_size,

jpegxl-rs/src/decode/result.rs

@@ -16,7 +16,7 @@ along with jpegxl-rs.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 use half::f16;
-use jpegxl_sys::{JxlDataType, JxlPixelFormat};
+use jpegxl_sys::types::{JxlDataType, JxlPixelFormat};
 
 use super::Orientation;
 use crate::common::PixelType;

jpegxl-rs/src/encode.rs

@@ -17,10 +17,15 @@ along with jpegxl-rs.  If not, see <https://www.gnu.org/licenses/>.
 
 //! Encoder of JPEG XL format
 
-#[allow(clippy::wildcard_imports)]
-use jpegxl_sys::*;
 use std::{marker::PhantomData, mem::MaybeUninit, ops::Deref, ptr::null};
 
+#[allow(clippy::wildcard_imports)]
+use jpegxl_sys::{
+    color_encoding::JxlColorEncoding,
+    encode::*,
+    types::{JxlEndianness, JxlPixelFormat},
+};
+
 use crate::{
     common::PixelType, errors::EncodeError, memory::MemoryManager, parallel::JxlParallelRunner,
 };
@@ -165,7 +170,7 @@ impl<U: PixelType> Deref for EncoderResult<U> {
 pub struct JxlEncoder<'prl, 'mm> {
     /// Opaque pointer to the underlying encoder
     #[builder(setter(skip))]
-    enc: *mut jpegxl_sys::JxlEncoder,
+    enc: *mut jpegxl_sys::encode::JxlEncoder,
     /// Opaque pointer to the encoder options
     #[builder(setter(skip))]
     options_ptr: *mut JxlEncoderFrameSettings,
@@ -289,8 +294,6 @@ impl JxlEncoder<'_, '_> {
                 JxlEncoderError::NotSupported => Err(EncodeError::NotSupported),
                 JxlEncoderError::ApiUsage => Err(EncodeError::ApiUsage),
             },
-            #[allow(deprecated)]
-            JxlEncoderStatus::NotSupported => Err(EncodeError::NotSupported),
             JxlEncoderStatus::NeedMoreOutput => Err(EncodeError::NeedMoreOutput),
         }
     }

jpegxl-rs/src/errors.rs

@@ -17,10 +17,10 @@ along with jpegxl-rs.  If not, see <https://www.gnu.org/licenses/>.
 
 //! Decoder and encoder errors
 
-#[allow(clippy::wildcard_imports)]
-use jpegxl_sys::*;
 use thiserror::Error;
 
+use jpegxl_sys::{decode::JxlDecoderStatus, encode::JxlEncoderError};
+
 /// Errors derived from [`JxlDecoderStatus`]
 #[derive(Error, Debug)]
 #[non_exhaustive]

jpegxl-rs/src/image.rs

@@ -22,7 +22,7 @@ along with jpegxl-rs.  If not, see <https://www.gnu.org/licenses/>.
 use std::mem::MaybeUninit;
 
 use image::{DynamicImage, ImageBuffer};
-use jpegxl_sys::{JxlDataType, JxlPixelFormat};
+use jpegxl_sys::types::{JxlDataType, JxlPixelFormat};
 
 use crate::{
     common::PixelType,

jpegxl-rs/src/tests/encode.rs

@@ -178,7 +178,7 @@ fn gray() -> TestResult {
     )?;
     _ = decoder.decode(&result)?;
 
-    encoder.set_frame_option(jpegxl_sys::FrameSetting::BrotliEffort, 1)?;
+    encoder.set_frame_option(jpegxl_sys::encode::FrameSetting::BrotliEffort, 1)?;
 
     Ok(())
 }

jpegxl-rs/src/utils.rs

@@ -17,7 +17,7 @@ along with jpegxl-rs.  If not, see <https://www.gnu.org/licenses/>.
 
 //! Utils functions when a decoder or encoder is not needed
 
-use jpegxl_sys::{JxlSignature, JxlSignatureCheck};
+use jpegxl_sys::decode::{JxlSignature, JxlSignatureCheck};
 
 /// Check if the signature of the input is valid.
 /// Return `None` if it needs more data.

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.8.2"
+version = "0.9.1"
 exclude = [
     "libjxl/third_party/libpng",
     "libjxl/third_party/sjpeg",
@@ -33,3 +33,5 @@ exclude = [
 
 [dependencies]
 cmake = "0.1.50"
+
+[features]

jpegxl-src/src/lib.rs

@@ -2,7 +2,6 @@
 
 use std::{
     env,
-    num::NonZeroUsize,
     path::{Path, PathBuf},
 };
 
@@ -17,15 +16,9 @@ fn source_dir() -> PathBuf {
 pub fn build() {
     let source = source_dir();
 
-    env::set_var(
-        "CMAKE_BUILD_PARALLEL_LEVEL",
-        format!(
-            "{}",
-            std::thread::available_parallelism()
-                .map(NonZeroUsize::get)
-                .unwrap_or(1)
-        ),
-    );
+    if let Ok(p) = std::thread::available_parallelism() {
+        env::set_var("CMAKE_BUILD_PARALLEL_LEVEL", format!("{}", p))
+    }
 
     let mut config = cmake::Config::new(source);
     config
@@ -41,23 +34,17 @@ pub fn build() {
         .define("JPEGXL_ENABLE_OPENEXR", "OFF");
 
     let mut prefix = config.build();
-    println!("cargo:rustc-link-lib=static=jxl");
-    println!("cargo:rustc-link-lib=static=jxl_threads");
-
-    println!("cargo:rustc-link-lib=static=hwy");
     prefix.push("lib");
     println!("cargo:rustc-link-search=native={}", prefix.display());
-    prefix.pop();
 
-    prefix.push("build");
-    prefix.push("third_party");
-    println!("cargo:rustc-link-search=native={}", prefix.display());
+    println!("cargo:rustc-link-lib=static=jxl");
+    println!("cargo:rustc-link-lib=static=jxl_cms");
+    println!("cargo:rustc-link-lib=static=jxl_threads");
 
-    println!("cargo:rustc-link-lib=static=brotlicommon-static");
-    println!("cargo:rustc-link-lib=static=brotlidec-static");
-    println!("cargo:rustc-link-lib=static=brotlienc-static");
-    prefix.push("brotli");
-    println!("cargo:rustc-link-search=native={}", prefix.display());
+    println!("cargo:rustc-link-lib=static=hwy");
+    println!("cargo:rustc-link-lib=static=brotlicommon");
+    println!("cargo:rustc-link-lib=static=brotlidec");
+    println!("cargo:rustc-link-lib=static=brotlienc");
 
     #[cfg(any(target_os = "macos", target_os = "ios", target_os = "freebsd"))]
     println!("cargo:rustc-link-lib=c++");

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.8.2+libjxl-0.8.2"
+version = "0.9.0+libjxl-0.9.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -21,10 +21,10 @@ module_name_repetitions = "allow"
 features = ["docs"]
 
 [build-dependencies]
-pkg-config = "0.3.27"
+pkg-config = "0.3.28"
 
 [build-dependencies.jpegxl-src]
-version = "0.8.2"
+version = "0.9.0"
 path = "../jpegxl-src"
 optional = true