Skip to content

Commit

Permalink
Make image a workspace dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
emilk committed Mar 11, 2024
1 parent 00a399b commit f53d6b8
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 16 deletions.
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ backtrace = "0.3"
criterion = { version = "0.5.1", default-features = false }
document-features = " 0.2.8"
glow = "0.13"
image = { version = "0.24", default-features = false }
log = { version = "0.4", features = ["std"] }
nohash-hasher = "0.2"
parking_lot = "0.12"
Expand Down
4 changes: 1 addition & 3 deletions crates/eframe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,7 @@ egui-winit = { workspace = true, default-features = false, features = [
"clipboard",
"links",
] }
image = { version = "0.24", default-features = false, features = [
"png",
] } # Needed for app icon
image = { workspace = true, features = ["png"] } # Needed for app icon
winit = { workspace = true, default-features = false, features = ["rwh_06"] }

# optional native:
Expand Down
5 changes: 1 addition & 4 deletions crates/egui_demo_app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,7 @@ wgpu = { workspace = true, features = ["webgpu", "webgl"], optional = true }

# feature "http":
ehttp = { version = "0.5", optional = true }
image = { version = "0.24", optional = true, default-features = false, features = [
"jpeg",
"png",
] }
image = { workspace = true, optional = true, features = ["jpeg", "png"] }
poll-promise = { version = "0.3", optional = true, default-features = false }

# feature "persistence":
Expand Down
5 changes: 2 additions & 3 deletions crates/egui_extras/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ http = ["dep:ehttp"]
##
## You also need to ALSO opt-in to the image formats you want to support, like so:
## ```toml
## image = { version = "0.24", features = ["jpeg", "png"] } # Add the types you want support for

## image = { version = "*", features = ["jpeg", "png"] } # Add the types you want support for
## ```
image = ["dep:image"]

Expand Down Expand Up @@ -79,7 +78,7 @@ chrono = { version = "0.4", optional = true, default-features = false, features
## Enable this when generating docs.
document-features = { workspace = true, optional = true }

image = { version = "0.24", optional = true, default-features = false }
image = { workspace = true, optional = true }

# file feature
mime_guess2 = { version = "2", optional = true, default-features = false }
Expand Down
5 changes: 1 addition & 4 deletions examples/images/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,4 @@ env_logger = { version = "0.10", default-features = false, features = [
"auto-color",
"humantime",
] }
image = { version = "0.24", default-features = false, features = [
"jpeg",
"png",
] }
image = { workspace = true, features = ["jpeg", "png"] }
2 changes: 1 addition & 1 deletion examples/save_plot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ eframe = { workspace = true, features = [
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] }
egui_plot.workspace = true
image = { version = "0.24", default-features = false, features = ["png"] }
image = { workspace = true, features = ["png"] }
rfd = "0.13.0"
env_logger = { version = "0.10", default-features = false, features = [
"auto-color",
Expand Down
2 changes: 1 addition & 1 deletion examples/screenshot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ env_logger = { version = "0.10", default-features = false, features = [
"auto-color",
"humantime",
] }
image = { version = "0.24", default-features = false, features = ["png"] }
image = { workspace = true, features = ["png"] }

0 comments on commit f53d6b8

Please sign in to comment.