From 66b3ec009f09109b8bc0990c31d6ad51cf629e0c Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 11 Mar 2024 18:09:52 +0100 Subject: [PATCH] Janitor: Update the image crate Note: this could be a breaking change if someone did ``` image = { version = "0.24", features = [...] } ``` To enable more features decoder of the image to support more file format in slint --- Cargo.toml | 1 + api/cpp/Cargo.toml | 2 +- examples/imagefilter/rust/Cargo.toml | 2 +- internal/backends/testing/Cargo.toml | 1 - internal/compiler/Cargo.toml | 2 +- internal/core/Cargo.toml | 2 +- tests/screenshots/Cargo.toml | 2 +- tools/lsp/Cargo.toml | 2 +- tools/viewer/Cargo.toml | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b2a3d9c3301b..c5c58e249613 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -132,6 +132,7 @@ css-color-parser2 = { version = "1.0.1" } fontdb = { version = "0.16.0", default-features = false } fontdue = { version = "0.8.0" } glutin = { version = "0.31.1", default-features = false } +image = { version = "0.25", default-features = false, features = [ "png", "jpeg" ] } itertools = { version = "0.12" } resvg = { version= "0.40.0", default-features = false, features = ["text"] } send_wrapper = { version = "0.6.0" } diff --git a/api/cpp/Cargo.toml b/api/cpp/Cargo.toml index 70804467b49c..e5f316b86099 100644 --- a/api/cpp/Cargo.toml +++ b/api/cpp/Cargo.toml @@ -55,7 +55,7 @@ i-slint-core = { workspace = true, features = ["ffi"] } slint-interpreter = { workspace = true, features = ["ffi", "compat-1-2"], optional = true } raw-window-handle = { version = "0.5", optional = true } # Enable image-rs' default features to make all image formats to C++ users -image = { version = "0.24.0", optional = true } +image = { workspace = true, optional = true, features = ["default"] } esp-backtrace = { version = "0.11.0", features = ["panic-handler", "println"], optional = true } esp-println = { version = "0.9.0", default-features = false, features = ["uart"], optional = true } diff --git a/examples/imagefilter/rust/Cargo.toml b/examples/imagefilter/rust/Cargo.toml index 1064b1f716a0..79090470cc65 100644 --- a/examples/imagefilter/rust/Cargo.toml +++ b/examples/imagefilter/rust/Cargo.toml @@ -16,7 +16,7 @@ name = "imagefilter" [dependencies] slint = { path = "../../../api/rs/slint" } -image = { version = "0.24.0", default-features = false, features = [ "png" ] } +image = { workspace = true } [build-dependencies] slint-build = { path = "../../../api/rs/build" } diff --git a/internal/backends/testing/Cargo.toml b/internal/backends/testing/Cargo.toml index 6a694fececcc..2d234a78f648 100644 --- a/internal/backends/testing/Cargo.toml +++ b/internal/backends/testing/Cargo.toml @@ -22,4 +22,3 @@ default = [] [dependencies] i-slint-core = { workspace = true, features = ["default"] } vtable = { workspace = true } -image = { version = "0.24.0", default-features = false, features = ["png", "jpeg"] } diff --git a/internal/compiler/Cargo.toml b/internal/compiler/Cargo.toml index ce1ee4123152..c7f74718e2f1 100644 --- a/internal/compiler/Cargo.toml +++ b/internal/compiler/Cargo.toml @@ -55,7 +55,7 @@ url = "2.2.1" linked_hash_set = "0.1.4" # for processing and embedding the rendered image (texture) -image = { version = "0.24", optional = true } +image = { workspace = true, optional = true, features = ["default"] } resvg = { workspace = true, optional = true } # font embedding fontdue = { workspace = true, optional = true } diff --git a/internal/core/Cargo.toml b/internal/core/Cargo.toml index 4068ddcafc1a..3bd585a5810d 100644 --- a/internal/core/Cargo.toml +++ b/internal/core/Cargo.toml @@ -81,7 +81,7 @@ unicode-script = { version = "0.5.3", optional = true } integer-sqrt = { version = "0.1.5" } bytemuck = { workspace = true, optional = true, features = ["derive"] } -image = { version = "0.24.0", optional = true, default-features = false, features = [ "png", "jpeg" ] } +image = { workspace = true, optional = true, default-features = false } clru = { version = "0.6.0", optional = true } resvg = { workspace = true, optional = true } diff --git a/tests/screenshots/Cargo.toml b/tests/screenshots/Cargo.toml index 74275ce02b87..6714be390d2f 100644 --- a/tests/screenshots/Cargo.toml +++ b/tests/screenshots/Cargo.toml @@ -21,7 +21,7 @@ name = "test-driver-screenshot" slint = { workspace = true, features = ["std", "compat-1-2"] } i-slint-core = { workspace = true, features = ["default", "software-renderer", "software-renderer-rotation"] } i-slint-backend-testing = { workspace = true, features = ["default"] } -image = { version = "0.24.0", default-features = false, features = ["png", "jpeg"] } +image = { workspace = true } crossterm = "0.27" [build-dependencies] diff --git a/tools/lsp/Cargo.toml b/tools/lsp/Cargo.toml index 3f651705fe50..c797e55be69e 100644 --- a/tools/lsp/Cargo.toml +++ b/tools/lsp/Cargo.toml @@ -103,7 +103,7 @@ lsp-server = "0.7" once_cell = "1.9.0" # Enable image-rs' default features to make all image formats available for the preview -image = { version = "0.24.0", optional = true } +image = { workspace = true, optional = true, features = ["default"] } [target.'cfg(target_arch = "wasm32")'.dependencies] console_error_panic_hook = "0.1.5" diff --git a/tools/viewer/Cargo.toml b/tools/viewer/Cargo.toml index 8c571c6b2844..b1cd5d2b065e 100644 --- a/tools/viewer/Cargo.toml +++ b/tools/viewer/Cargo.toml @@ -67,7 +67,7 @@ env_logger = "0.10.0" itertools = { workspace = true } # Enable image-rs' default features to make all image formats available for preview -image = { version = "0.24.0" } +image = { workspace = true, features = ["default"] } [[bin]] name = "slint-viewer"