diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d6498fb..a8c8377 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: artifact_name: universal-explorer asset_name: universal-explorer_linux_x86_64 - os: windows-x86_64 - target: x86_64-pc-windows-msvc + target: x86_64-pc-windows-gnu artifact_name: universal-explorer.exe asset_name: universal-explorer_win_x86_64.exe linker_package: gcc-mingw-w64-x86-64 @@ -58,6 +58,3 @@ jobs: body: "Release for ${{ matrix.os }}" - - - diff --git a/Cargo.lock b/Cargo.lock index ef34ac5..e423dff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1181,7 +1181,7 @@ dependencies = [ "glow", "glutin", "glutin-winit", - "image 0.25.2", + "image", "js-sys", "log", "objc2 0.5.2", @@ -1877,8 +1877,9 @@ dependencies = [ [[package]] name = "image" -version = "0.25.1" -source = "git+https://github.com/Murad-Awad/image?branch=upgrade-zune#15355ed2823d597a49f9f28d4abb98e08a258238" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", "byteorder-lite", @@ -1897,18 +1898,6 @@ dependencies = [ "zune-jpeg", ] -[[package]] -name = "image" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" -dependencies = [ - "bytemuck", - "byteorder-lite", - "num-traits", - "png", -] - [[package]] name = "image-webp" version = "0.1.3" @@ -3603,7 +3592,7 @@ dependencies = [ "eframe", "egui", "env_logger", - "image 0.25.1", + "image", "rayon", "regex", "rfd", @@ -4620,9 +4609,9 @@ dependencies = [ [[package]] name = "zune-core" -version = "0.5.0-rc2" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa5491574238487afaf76a17d1907b47eaace69e97720b8486d584dfca013dc" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" [[package]] name = "zune-inflate" @@ -4635,9 +4624,9 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.5.0-rc2" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6e1b91c3b508b590945d61560be96449641b504a94f42f1a5594161b2d328ea" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" dependencies = [ "zune-core", ] diff --git a/Cargo.toml b/Cargo.toml index 34bcf35..39db5f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,11 +10,7 @@ clap = { version = "4.5.11", features = ["derive"] } eframe = "0.28.1" egui = "0.28.1" env_logger = { version = "0.11.5", features = ["auto-color", "humantime"] } -# TEMP FIX: Fix dynamic linking with `zune-jpeg` crate -# https://github.com/etemesi254/zune-image/commit/5846e3cd7ee786fcc4714133509db166aeb069bb -# https://github.com/image-rs/image/pull/2209 -image = { git = "https://github.com/Murad-Awad/image", branch = "upgrade-zune" } -# image = "0.25.2" +image = "0.25.2" rayon = "1.10.0" regex = "1.10.5" rfd = "0.14.1" diff --git a/src/app/explorers/image.rs b/src/app/explorers/image.rs index 2900ee1..1573e24 100644 --- a/src/app/explorers/image.rs +++ b/src/app/explorers/image.rs @@ -26,11 +26,11 @@ impl ImageExplorer { pub fn file(file: F, filename: Option) -> Result { let image: DynamicImage = match &filename { - Some(filename) => image::io::Reader::with_format( + Some(filename) => image::ImageReader::with_format( BufReader::new(file), image::ImageFormat::from_path(filename)?, ).decode()?, - None => image::io::Reader::new(BufReader::new(file)) + None => image::ImageReader::new(BufReader::new(file)) .with_guessed_format()? .decode()?, };