Skip to content

Commit

Permalink
fix release workflow #5 (windows fixed now maybe?)
Browse files Browse the repository at this point in the history
  • Loading branch information
Vulae committed Aug 2, 2024
1 parent 7b4e418 commit fbff8b9
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 31 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -58,6 +58,3 @@ jobs:
body: "Release for ${{ matrix.os }}"





29 changes: 9 additions & 20 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/app/explorers/image.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ impl ImageExplorer {

pub fn file<F: Read + Seek>(file: F, filename: Option<String>) -> Result<ImageExplorer> {
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()?,
};
Expand Down

0 comments on commit fbff8b9

Please sign in to comment.