From cbbc927472e3928a1785569a54bdc0497a428fb4 Mon Sep 17 00:00:00 2001 From: Vladyslav Vladinov <111443297+SalOne22@users.noreply.github.com> Date: Sun, 15 Oct 2023 17:48:52 +0200 Subject: [PATCH] Updated readme and windows builds --- .github/workflows/rimage.yml | 13 +------------ README.md | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/.github/workflows/rimage.yml b/.github/workflows/rimage.yml index 2072648e..302a39ed 100644 --- a/.github/workflows/rimage.yml +++ b/.github/workflows/rimage.yml @@ -83,16 +83,6 @@ jobs: if: matrix.target == 'x86_64-apple-darwin' run: brew install jpeg-xl - - name: Install libjxl πŸ§‘β€πŸ’» (msvc) - if: matrix.target == 'x86_64-pc-windows-msvc' - uses: johnwason/vcpkg-action@v5 - id: vcpkg - with: - pkgs: libjxl - triplet: x64-windows-release - revision: master - token: ${{ github.token }} - - name: Setup rust toolchain πŸ¦€ uses: actions-rs/toolchain@v1 with: @@ -112,8 +102,7 @@ jobs: shell: cmd run: | call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat" - set DEP_JXL_LIB=${{github.workspace}}\vcpkg\installed\x64-windows-release\lib - cargo build --all-features --release + cargo build --features avif,webp --release - name: Test πŸ§ͺ if: matrix.target == 'x86_64-unknown-linux-gnu' || matrix.target == 'x86_64-apple-darwin' diff --git a/README.md b/README.md index 733b711f..1c50b6ea 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,13 @@ Rimage simplifies and enhances your image optimization workflows. Optimize image ## Installation +Dependencies: +On x86_64 macos requires libjxl installed. + You can download latest release from the [releases](https://github.com/SalOne22/rimage/releases) tab. +> Note: On x86_64-pc-windows-msvc build jxl feature disabled, because of libjxl inability for build on msvc target. + Alternatively you can build rimage from source if you have `rust`, `cargo`, `nasm` and `cmake` installed: ```sh @@ -91,9 +96,9 @@ List of available resize filters: ### png => jpg & quality => 90 & backup -|Image Path|Quality|Out Format|Out Dir|Backup| -|----|----|----|----|----| -|"D:\\Desktop\\input [text].png"|90|jpg|"D:\\Desktop\\OutputTest"|True| +| Image Path | Quality | Out Format | Out Dir | Backup | +| ------------------------------- | ------- | ---------- | ------------------------- | ------ | +| "D:\\Desktop\\input [text].png" | 90 | jpg | "D:\\Desktop\\OutputTest" | True | ```sh rimage.exe "D:\\Desktop\\input [text].png" -q 90 -f jpg -o "D:\\Desktop\\OutputTest" -b @@ -101,9 +106,9 @@ rimage.exe "D:\\Desktop\\input [text].png" -q 90 -f jpg -o "D:\\Desktop\\OutputT ### suffix & recursive & quantization & dithering -|Image Path|Quality|Out Format|Suffix|Recursive|Quantization|Dithering| -|----|----|----|----|----|----|----| -|"C:\\δΈ­ ζ–‡\\γ‚½γƒ•γƒˆγ‚¦γ‚§γ‚’.PNG"|40|png|_문자|True|95|85| +| Image Path | Quality | Out Format | Suffix | Recursive | Quantization | Dithering | +| ----------------------------- | ------- | ---------- | ------ | --------- | ------------ | --------- | +| "C:\\δΈ­ ζ–‡\\γ‚½γƒ•γƒˆγ‚¦γ‚§γ‚’.PNG" | 40 | png | \_문자 | True | 95 | 85 | ```sh rimage.exe "C:\\δΈ­ ζ–‡\\γ‚½γƒ•γƒˆγ‚¦γ‚§γ‚’.PNG" -q 40 --codec png -s "_문자" -r --quantization 95 --dithering 85 @@ -111,9 +116,9 @@ rimage.exe "C:\\δΈ­ ζ–‡\\γ‚½γƒ•γƒˆγ‚¦γ‚§γ‚’.PNG" -q 40 --codec png -s "_문자" ### jpg => webp & threads &resize width and height (both are opinional) -|Image Path|Quality|Out Format|Out Dir|Threads|Width|Height| -|----|----|----|----|----|----|----| -|"C:\\Docs\\justfortest.JPG"|40|webp|"C:\\Desktop\\Test"|4|60|10| +| Image Path | Quality | Out Format | Out Dir | Threads | Width | Height | +| --------------------------- | ------- | ---------- | ------------------- | ------- | ----- | ------ | +| "C:\\Docs\\justfortest.JPG" | 40 | webp | "C:\\Desktop\\Test" | 4 | 60 | 10 | ```sh rimage.exe "C:\\Docs\\justfortest.PNG" --quality 40 --codec webp --output "C:\\Desktop\\Test" --threads 4 --width 60 --height 10