From 17fc8fd0d9433405fb3a2938c125db89c46d8492 Mon Sep 17 00:00:00 2001 From: Inflation <2375962+inflation@users.noreply.github.com> Date: Tue, 27 Feb 2024 15:48:33 +0800 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrade=20`libjxl`=20to=20?= =?UTF-8?q?v0.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 2 +- CHANGELOG.md | 13 +++++-------- jpegxl-rs/Cargo.toml | 8 ++++---- jpegxl-src/Cargo.toml | 2 +- jpegxl-src/libjxl | 2 +- jpegxl-sys/Cargo.toml | 4 ++-- jpegxl-sys/src/decode.rs | 4 +++- jpegxl-sys/src/encode.rs | 1 + 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.gitmodules b/.gitmodules index d3feaf5..97691ed 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "libjxl"] path = jpegxl-src/libjxl url = https://github.com/libjxl/libjxl - branch = tags/v0.9.2 + branch = tags/v0.10.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index e8711ca..04b7931 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,20 +5,17 @@ ### Changed -- ⬆️ Upgrade libjxl v0.9.0 ([#32](https://github.com/inflation/jpegxl-rs/issues/32)) [[0fd2388](https://github.com/inflation/jpegxl-rs/commit/0fd238801acf9409329426b38730d31bd69026b2)] -- ⬆️ Upgrade libjxl v0.9.0 [[f4498b1](https://github.com/inflation/jpegxl-rs/commit/f4498b178534512888492fa66fa353383d0ea674)] -- ♻️ Add back derived traits for `JxlBitDepth` [[a72176a](https://github.com/inflation/jpegxl-rs/commit/a72176ae03eb47ed957b5e4f19d8fa7e1c093a8d)] -- ♻️ Use [lints] in Cargo.toml [[ff1bc74](https://github.com/inflation/jpegxl-rs/commit/ff1bc74e513e23179d444d11ebe3f536c120a06d)] +- ⬆️ Upgrade libjxl v0.9.0 +- ♻️ Add back derived traits for `JxlBitDepth` ### Fixed -- 💚 Update coverage attribute [[59a7cf1](https://github.com/inflation/jpegxl-rs/commit/59a7cf17b18deba5cded4712f1655c21c5cce618)] +- 💚 Update coverage attribute ### Miscellaneous -- 🔀 : Bump actions/cache from 3 to 4 ([#33](https://github.com/inflation/jpegxl-rs/issues/33)) [[c609f18](https://github.com/inflation/jpegxl-rs/commit/c609f18d54b9c7f4899839a35a42cf65e366cda6)] -- ️👷 (deps): Bump actions/cache from 3 to 4 [[eff742e](https://github.com/inflation/jpegxl-rs/commit/eff742e21f5df614074725dd5db2d93b7126d27e)] -- ⚰️ Remove unused color encoding setup when encoding JPEG [[8d285be](https://github.com/inflation/jpegxl-rs/commit/8d285be2260a24c7fdf2c2da50cd665c7342e1eb)] +- 👷 (deps): Bump actions/cache from 3 to 4 +- ⚰️ Remove unused color encoding setup when encoding JPEG diff --git a/jpegxl-rs/Cargo.toml b/jpegxl-rs/Cargo.toml index 32590d2..701d050 100644 --- 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.1+libjxl-0.9.2" +version = "0.10.0+libjxl-0.10.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -30,11 +30,11 @@ bench = [] derive_builder = "0.20.0" image = { version = "0.24.8", optional = true, default-features = false } thiserror = "1.0.56" -half = "2.3.1" +half = "2.4.0" byteorder = "1.5.0" [dependencies.jpegxl-sys] -version = "0.9.1" +version = "0.10.0" path = "../jpegxl-sys" [dev-dependencies] @@ -42,7 +42,7 @@ image = { version = "0.24.8", default-features = false, features = [ "jpeg", "png", ] } -lcms2 = "6.0.4" +lcms2 = "6.1.0" pretty_assertions.workspace = true testresult = "0.3.0" diff --git a/jpegxl-src/Cargo.toml b/jpegxl-src/Cargo.toml index 2a9618b..7d0263c 100644 --- 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.2" +version = "0.10.0" exclude = [ "libjxl/third_party/libpng", "libjxl/third_party/sjpeg", diff --git a/jpegxl-src/libjxl b/jpegxl-src/libjxl index 41b8cda..19bcd82 160000 --- a/jpegxl-src/libjxl +++ b/jpegxl-src/libjxl @@ -1 +1 @@ -Subproject commit 41b8cdab7815c79a060938bfe0c24337e2eb9e54 +Subproject commit 19bcd827dbf44bdc7ef30af8925696a5b82dcdf2 diff --git a/jpegxl-sys/Cargo.toml b/jpegxl-sys/Cargo.toml index 1a48194..9e1cd97 100644 --- 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.1+libjxl-0.9.2" +version = "0.10.0+libjxl-0.10.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -24,7 +24,7 @@ features = ["docs"] pkg-config = "0.3.29" [build-dependencies.jpegxl-src] -version = "0.9.2" +version = "0.10.0" path = "../jpegxl-src" optional = true diff --git a/jpegxl-sys/src/decode.rs b/jpegxl-sys/src/decode.rs index 6b9da46..8627671 100644 --- a/jpegxl-sys/src/decode.rs +++ b/jpegxl-sys/src/decode.rs @@ -318,7 +318,9 @@ extern "C" { decompressed: JxlBool, ) -> JxlDecoderStatus; - pub fn JxlDecoderGetBoxSizeRaw(dec: *mut JxlDecoder, size: *mut usize) -> JxlDecoderStatus; + pub fn JxlDecoderGetBoxSizeRaw(dec: *mut JxlDecoder, size: *mut u64) -> JxlDecoderStatus; + + pub fn JxlDecoderGetBoxSizeContents(dec: *mut JxlDecoder, size: *mut u64) -> JxlDecoderStatus; pub fn JxlDecoderSetProgressiveDetail( dec: *mut JxlDecoder, diff --git a/jpegxl-sys/src/encode.rs b/jpegxl-sys/src/encode.rs index 9b9a7ef..c6529f2 100644 --- a/jpegxl-sys/src/encode.rs +++ b/jpegxl-sys/src/encode.rs @@ -101,6 +101,7 @@ pub enum FrameSetting { JpegKeepExif = 35, JpegKeepXmp = 36, JpegKeepJumbf = 37, + UseFullImageHeuristics = 38, FillEnum = 65535, }