djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update image 0.23 -> 0.24

Browse source
This commit is contained in:
Emil Ernerfeldt 2022-02-04 13:20:18 +01:00
parent 8dfa6ce2f0
commit 47038c631e
9 changed files with 82 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
Cargo.lock generated
View file

@ -218,7 +218,7 @@ dependencies = [
"cc", "cc",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"libc", "libc",
"miniz_oxide 0.4.4", "miniz_oxide",
"object", "object",
"rustc-demangle", "rustc-demangle",
] ]
@ -825,12 +825,11 @@ checksum = "7046468a81e6a002061c01e6a7c83139daf91b11c30e66795b13217c2d885c8b"
[[package]] [[package]]
name = "deflate" name = "deflate"
version = "0.8.6" version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" checksum = "5f95bf05dffba6e6cce8dfbb30def788154949ccd9aed761b472119c21e01c70"
dependencies = [ dependencies = [
"adler32", "adler32",
"byteorder",
] ]
[[package]] [[package]]
@ -1102,6 +1101,70 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "encoding"
version = "0.2.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
dependencies = [
"encoding-index-japanese",
"encoding-index-korean",
"encoding-index-simpchinese",
"encoding-index-singlebyte",
"encoding-index-tradchinese",
]
[[package]]
name = "encoding-index-japanese"
version = "1.20141219.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
dependencies = [
"encoding_index_tests",
]
[[package]]
name = "encoding-index-korean"
version = "1.20141219.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
dependencies = [
"encoding_index_tests",
]
[[package]]
name = "encoding-index-simpchinese"
version = "1.20141219.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7"
dependencies = [
"encoding_index_tests",
]
[[package]]
name = "encoding-index-singlebyte"
version = "1.20141219.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
dependencies = [
"encoding_index_tests",
]
[[package]]
name = "encoding-index-tradchinese"
version = "1.20141219.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
dependencies = [
"encoding_index_tests",
]
[[package]]
name = "encoding_index_tests"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
[[package]] [[package]]
name = "enum-map" name = "enum-map"
version = "2.0.1" version = "2.0.1"
@ -1218,7 +1281,7 @@ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"crc32fast", "crc32fast",
"libc", "libc",
"miniz_oxide 0.4.4", "miniz_oxide",
] ]
[[package]] [[package]]
@ -1594,9 +1657,9 @@ dependencies = [
[[package]] [[package]]
name = "image" name = "image"
version = "0.23.14" version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" checksum = "e94ac3d41f882c624a82d7945952032388488681f45f9d4077999a6c85688d61"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"byteorder", "byteorder",
@ -1673,9 +1736,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
[[package]] [[package]]
name = "jpeg-decoder" name = "jpeg-decoder"
version = "0.1.22" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" checksum = "fbcf0244f6597be39ab8d9203f574cafb529ae8c698afa2182f7b3c3205a4a9c"
[[package]] [[package]]
name = "js-sys" name = "js-sys"
@ -1804,15 +1867,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
dependencies = [
"adler32",
]
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.4.4" version = "0.4.4"
@ -2008,9 +2062,9 @@ dependencies = [
[[package]] [[package]]
name = "num-rational" name = "num-rational"
version = "0.3.2" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
dependencies = [ dependencies = [
"autocfg", "autocfg",
"num-integer", "num-integer",
@ -2281,14 +2335,15 @@ dependencies = [
[[package]] [[package]]
name = "png" name = "png"
version = "0.16.8" version = "0.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" checksum = "c845088517daa61e8a57eee40309347cea13f273694d1385c553e7a57127763b"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"crc32fast", "crc32fast",
"deflate", "deflate",
"miniz_oxide 0.3.7", "encoding",
"miniz_oxide",
] ]
[[package]] [[package]]

2
eframe/Cargo.toml
View file

@ -39,7 +39,7 @@ egui_web = { version = "0.16.0", path = "../egui_web", default-features = false,
[dev-dependencies] [dev-dependencies]
ehttp = "0.2" ehttp = "0.2"
image = { version = "0.23", default-features = false, features = ["jpeg", "png"] } image = { version = "0.24", default-features = false, features = ["jpeg", "png"] }
poll-promise = "0.1" poll-promise = "0.1"
rfd = "0.6" rfd = "0.6"

1
eframe/examples/download_image.rs
View file

@ -70,7 +70,6 @@ fn parse_response(
} }
fn load_image(image_data: &[u8]) -> Result<egui::ColorImage, image::ImageError> { fn load_image(image_data: &[u8]) -> Result<egui::ColorImage, image::ImageError> {
use image::GenericImageView as _;
let image = image::load_from_memory(image_data)?; let image = image::load_from_memory(image_data)?;
let size = [image.width() as _, image.height() as _]; let size = [image.width() as _, image.height() as _];
let image_buffer = image.to_rgba8(); let image_buffer = image.to_rgba8();

1
eframe/examples/image.rs
View file

@ -34,7 +34,6 @@ fn main() {
} }
fn load_image(image_data: &[u8]) -> Result<egui::ColorImage, image::ImageError> { fn load_image(image_data: &[u8]) -> Result<egui::ColorImage, image::ImageError> {
use image::GenericImageView as _;
let image = image::load_from_memory(image_data)?; let image = image::load_from_memory(image_data)?;
let size = [image.width() as _, image.height() as _]; let size = [image.width() as _, image.height() as _];
let image_buffer = image.to_rgba8(); let image_buffer = image.to_rgba8();

2
egui_demo_lib/Cargo.toml
View file

@ -33,7 +33,7 @@ unicode_names2 = { version = "0.4.0", default-features = false }
# feature "http": # feature "http":
ehttp = { version = "0.2.0", optional = true } ehttp = { version = "0.2.0", optional = true }
image = { version = "0.23", default-features = false, features = ["jpeg", "png"], optional = true } image = { version = "0.24", default-features = false, features = ["jpeg", "png"], optional = true }
poll-promise = { version = "0.1", default-features = false, optional = true } poll-promise = { version = "0.1", default-features = false, optional = true }
# feature "syntax_highlighting": # feature "syntax_highlighting":

1
egui_demo_lib/src/apps/http_app.rs
View file

@ -274,7 +274,6 @@ impl ColoredText {
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
fn load_image(image_data: &[u8]) -> Result<egui::ColorImage, image::ImageError> { fn load_image(image_data: &[u8]) -> Result<egui::ColorImage, image::ImageError> {
use image::GenericImageView as _;
let image = image::load_from_memory(image_data)?; let image = image::load_from_memory(image_data)?;
let size = [image.width() as _, image.height() as _]; let size = [image.width() as _, image.height() as _];
let image_buffer = image.to_rgba8(); let image_buffer = image.to_rgba8();

2
egui_glium/Cargo.toml
View file

@ -35,7 +35,7 @@ bytemuck = "1.7"
glium = "0.31" glium = "0.31"
[dev-dependencies] [dev-dependencies]
image = { version = "0.23", default-features = false, features = ["png"] } image = { version = "0.24", default-features = false, features = ["png"] }
[features] [features]
default = ["clipboard", "default_fonts", "links", "persistence"] default = ["clipboard", "default_fonts", "links", "persistence"]

2
egui_glow/Cargo.toml
View file

@ -43,7 +43,7 @@ web-sys = { version = "0.3", features=["console"] }
wasm-bindgen = { version = "0.2" } wasm-bindgen = { version = "0.2" }
[dev-dependencies] [dev-dependencies]
image = { version = "0.23", default-features = false, features = ["png"] } image = { version = "0.24", default-features = false, features = ["png"] }
[features] [features]
default = ["clipboard", "default_fonts", "links", "persistence", "winit"] default = ["clipboard", "default_fonts", "links", "persistence", "winit"]

2
epaint/src/image.rs
View file

@ -70,7 +70,6 @@ impl ColorImage {
/// ## Example using the [`image`](crates.io/crates/image) crate: /// ## Example using the [`image`](crates.io/crates/image) crate:
/// ``` ignore /// ``` ignore
/// fn load_image_from_path(path: &std::path::Path) -> Result<egui::ColorImage, image::ImageError> { /// fn load_image_from_path(path: &std::path::Path) -> Result<egui::ColorImage, image::ImageError> {
/// use image::GenericImageView as _;
/// let image = image::io::Reader::open(path)?.decode()?; /// let image = image::io::Reader::open(path)?.decode()?;
/// let size = [image.width() as _, image.height() as _]; /// let size = [image.width() as _, image.height() as _];
/// let image_buffer = image.to_rgba8(); /// let image_buffer = image.to_rgba8();
@ -82,7 +81,6 @@ impl ColorImage {
/// } /// }
/// ///
/// fn load_image_from_memory(image_data: &[u8]) -> Result<ColorImage, image::ImageError> { /// fn load_image_from_memory(image_data: &[u8]) -> Result<ColorImage, image::ImageError> {
/// use image::GenericImageView as _;
/// let image = image::load_from_memory(image_data)?; /// let image = image::load_from_memory(image_data)?;
/// let size = [image.width() as _, image.height() as _]; /// let size = [image.width() as _, image.height() as _];
/// let image_buffer = image.to_rgba8(); /// let image_buffer = image.to_rgba8();