Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Janitor: Update the image crate #4816

Merged
merged 2 commits into from
Apr 15, 2024
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
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion api/cpp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
8 changes: 7 additions & 1 deletion api/rs/slint/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ default = [
"backend-default",
"renderer-femtovg",
"renderer-software",
"image-default-formats",
"accessibility",
"compat-1-2",
]
Expand All @@ -34,7 +35,8 @@ default = [
## Newer patch version may put current functionality behind a new feature
## that would be enabled by default only if this feature was added.
## [More info in this blog post](https://slint.dev/blog/rust-adding-default-cargo-feature.html)
"compat-1-2" = []
"compat-1-6" = []
"compat-1-2" = ["compat-1-6", "image-default-formats"]
"compat-1-0" = ["compat-1-2", "renderer-software"]

## Enable use of the Rust standard library.
Expand Down Expand Up @@ -84,6 +86,10 @@ accessibility = ["i-slint-backend-selector/accessibility"]
## [HasDisplayHandle](raw_window_handle_06::HasDisplayHandle) implementation.
raw-window-handle-06 = ["dep:raw-window-handle-06", "i-slint-backend-selector/raw-window-handle-06"]

## Enable all formats from the `image` crate. To increase what is supported from [`Image::load_from_path`]
## or in `@image-url`.
image-default-formats = ["i-slint-core/image-default-formats"]

#! ### Backends

#! Slint needs a backend that will act as liaison between Slint and the OS.
Expand Down
2 changes: 1 addition & 1 deletion examples/imagefilter/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
1 change: 0 additions & 1 deletion internal/backends/testing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
2 changes: 1 addition & 1 deletion internal/compiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
3 changes: 2 additions & 1 deletion internal/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ software-renderer = ["bytemuck"]
software-renderer-rotation = []

image-decoders = ["dep:image", "dep:clru"]
image-default-formats = ["image?/default-formats"]
svg = ["dep:resvg", "shared-fontdb"]

box-shadow-cache = []
Expand Down Expand Up @@ -81,7 +82,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 }
Expand Down
2 changes: 1 addition & 1 deletion tests/screenshots/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion tools/lsp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,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"
Expand Down
2 changes: 1 addition & 1 deletion tools/viewer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading