From 941b6479863ff10f751f2ca6d4fc2f56615eb53c Mon Sep 17 00:00:00 2001 From: Philip Kristoffersen Date: Thu, 8 Sep 2022 17:05:17 +0200 Subject: [PATCH] Fix crash on loading animated webp alpha --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- flatpak/cargo-lock.json | 8 ++++---- flatpak/io.github.philipk.boilr.appdata.xml | 7 +++++++ src/testdata/tunic.webp | Bin 0 -> 892578 bytes src/ui/defines.rs | 6 ++++++ src/ui/ui_image_download.rs | 3 --- 7 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 src/testdata/tunic.webp diff --git a/Cargo.lock b/Cargo.lock index 14ac882..7f8cb4b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -168,7 +168,7 @@ dependencies = [ [[package]] name = "boilr" -version = "1.4.8" +version = "1.4.9" dependencies = [ "base64", "chrono", @@ -1340,7 +1340,7 @@ dependencies = [ [[package]] name = "image" version = "0.24.3" -source = "git+https://github.com/PhilipK/image?rev=cb66840dd42785c7283206cc9805240501695a61#cb66840dd42785c7283206cc9805240501695a61" +source = "git+https://github.com/PhilipK/image?rev=55a668409b28fedcd6cd3dea25ae1b3cc9d25ec5#55a668409b28fedcd6cd3dea25ae1b3cc9d25ec5" dependencies = [ "bytemuck", "byteorder", diff --git a/Cargo.toml b/Cargo.toml index 2d9cf47..cb48b7d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] edition = "2021" name = "boilr" -version = "1.4.8" +version = "1.4.9" [dependencies] base64 = "^0.13.0" @@ -35,7 +35,7 @@ version = "^0.3.23" [dependencies.image] features = ["png","webp","jpeg"] git = "https://github.com/PhilipK/image" -rev = "cb66840dd42785c7283206cc9805240501695a61" +rev = "55a668409b28fedcd6cd3dea25ae1b3cc9d25ec5" [dependencies.reqwest] default_features = false diff --git a/flatpak/cargo-lock.json b/flatpak/cargo-lock.json index 2239f97..da827d0 100644 --- a/flatpak/cargo-lock.json +++ b/flatpak/cargo-lock.json @@ -2,8 +2,8 @@ { "type": "git", "url": "https://github.com/philipk/image", - "commit": "cb66840dd42785c7283206cc9805240501695a61", - "dest": "flatpak-cargo/git/image-cb66840" + "commit": "55a668409b28fedcd6cd3dea25ae1b3cc9d25ec5", + "dest": "flatpak-cargo/git/image-55a6684" }, { "type": "archive", @@ -1685,7 +1685,7 @@ { "type": "shell", "commands": [ - "cp -r --reflink=auto \"flatpak-cargo/git/image-cb66840/.\" \"cargo/vendor/image\"" + "cp -r --reflink=auto \"flatpak-cargo/git\\image-55a6684\\.\" \"cargo/vendor/image\"" ] }, { @@ -4439,7 +4439,7 @@ }, { "type": "inline", - "contents": "[source.vendored-sources]\ndirectory = \"cargo/vendor\"\n\n[source.crates-io]\nreplace-with = \"vendored-sources\"\n\n[source.\"https://github.com/philipk/image\"]\ngit = \"https://github.com/philipk/image\"\nreplace-with = \"vendored-sources\"\nrev = \"cb66840dd42785c7283206cc9805240501695a61\"\n", + "contents": "[source.vendored-sources]\ndirectory = \"cargo/vendor\"\n\n[source.crates-io]\nreplace-with = \"vendored-sources\"\n\n[source.\"https://github.com/philipk/image\"]\ngit = \"https://github.com/philipk/image\"\nreplace-with = \"vendored-sources\"\nrev = \"55a668409b28fedcd6cd3dea25ae1b3cc9d25ec5\"\n", "dest": "cargo", "dest-filename": "config" } diff --git a/flatpak/io.github.philipk.boilr.appdata.xml b/flatpak/io.github.philipk.boilr.appdata.xml index e2d9939..81fda2c 100644 --- a/flatpak/io.github.philipk.boilr.appdata.xml +++ b/flatpak/io.github.philipk.boilr.appdata.xml @@ -25,6 +25,13 @@ https://hughsie.github.io/oars/index.html --> + + +
    +
  • Fixed a crash that would happen when loading specific animated webp images that use alpha blending
  • +
+
+