Skip to content

Commit

Permalink
fix release workflow #3
Browse files Browse the repository at this point in the history
  • Loading branch information
Vulae committed Aug 1, 2024
1 parent 7676102 commit 0ee3cd1
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 23 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ jobs:
build:
name: Release
runs-on: ubuntu-latest
permissions: write-all

strategy:
fail-fast: false
Expand Down Expand Up @@ -37,7 +38,7 @@ jobs:
target: ${{ matrix.target }}

- name: Install linker
if: ${{ matrix.linker_package }} != null
if: matrix.linker_package != null
run: sudo apt-get install -y ${{ matrix.linker_package }}

- name: Build project
Expand Down
39 changes: 25 additions & 14 deletions Cargo.lock

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

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ 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"] }
image = "0.25.2"
# 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"
rayon = "1.10.0"
regex = "1.10.5"
rfd = "0.14.1"
Expand Down
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,16 @@ A CLI may be implemented in the future to allow for automation of extracting.

# [Supported Formats](#supported-formats)

* Image formats
* image/png, image/jpeg, image/webp
* Common image formats
* Source Engine
* .vpk archive
* .vtf texture
* `.vpk` archive
* `.vtf` texture

# [Unimplemented Formats](#unimplemented-formats)

Some formats that will most likely be implemented in the future.

* .zip archive
* `.zip` archive
* Unity game engine assets
* Godot game engine archive
* Ren'Py game engine archive
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::ImageReader::with_format(
Some(filename) => image::io::Reader::with_format(
BufReader::new(file),
image::ImageFormat::from_path(filename)?,
).decode()?,
None => image::ImageReader::new(BufReader::new(file))
None => image::io::Reader::new(BufReader::new(file))
.with_guessed_format()?
.decode()?,
};
Expand Down

0 comments on commit 0ee3cd1

Please sign in to comment.