Merge pull request #30 from alexwlchan/dependabot/cargo/image-0.25.1

ID

4341a59

date

2024-05-12 09:31:20+00:00

author

Alex Chan <alex@alexwlchan.net>

parents

21ee744, 15ab295

message

Merge pull request #30 from alexwlchan/dependabot/cargo/image-0.25.1

Bump image from 0.24.4 to 0.25.1

changed files

4 files, 32 additions, 38 deletions

Cargo.lock
Cargo.toml
src/get_bytes.rs
src/main.rs

Changed files

Cargo.lock (13655) → Cargo.lock (13570)

diff --git a/Cargo.lock b/Cargo.lock
index e128919..05b9eaf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -185,9 +185,9 @@ dependencies = [
 
 [[package]]
 name = "gif"
-version = "0.11.4"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06"
+checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
 dependencies = [
  "color_quant",
  "weezl",
@@ -204,26 +204,26 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.24.4"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd8e4fb07cf672b1642304e731ef8a6a4c7891d67bb4fd4f5ce58cd6ed86803c"
+checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
 dependencies = [
  "bytemuck",
  "byteorder",
  "color_quant",
  "gif",
- "jpeg-decoder",
- "num-rational",
  "num-traits",
  "png",
  "tiff",
+ "zune-core",
+ "zune-jpeg",
 ]
 
 [[package]]
 name = "jpeg-decoder"
-version = "0.2.6"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b"
+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
 
 [[package]]
 name = "kmeans_colors"
@@ -259,27 +259,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "num-integer"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
 name = "num-traits"
 version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -456,9 +435,9 @@ checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b"
 
 [[package]]
 name = "tiff"
-version = "0.7.3"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7259662e32d1e219321eb309d5f9d898b779769d81b76e762c07c8e5d38fcb65"
+checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
 dependencies = [
  "flate2",
  "jpeg-decoder",
@@ -488,9 +467,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "weezl"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
+checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
 [[package]]
 name = "winapi"
@@ -522,3 +501,18 @@ name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "zune-core"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
+
+[[package]]
+name = "zune-jpeg"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448"
+dependencies = [
+ "zune-core",
+]

Cargo.toml (417) → Cargo.toml (417)

diff --git a/Cargo.toml b/Cargo.toml
index 3534433..4c1b928 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ features = ["palette_color"]
 default-features = false
 
 [dependencies.image]
-version = "0.24"
+version = "0.25"
 features = ["jpeg", "png", "gif", "tiff"]
 default-features = false

src/get_bytes.rs (4306) → src/get_bytes.rs (4362)

diff --git a/src/get_bytes.rs b/src/get_bytes.rs
index eb90bba..f028477 100644
--- a/src/get_bytes.rs
+++ b/src/get_bytes.rs
@@ -1,4 +1,5 @@
 use std::fs::File;
+use std::io::BufReader;
 
 use image::codecs::gif::GifDecoder;
 use image::imageops::FilterType;
@@ -42,6 +43,8 @@ pub fn get_bytes_for_gif(path: &str) -> Vec<u8> {
         }
     };
 
+    let f = BufReader::new(f);
+
     let decoder = GifDecoder::new(f).ok().unwrap();
 
     // If the GIF is animated, we want to make sure we look at multiple

src/main.rs (8441) → src/main.rs (8381)

diff --git a/src/main.rs b/src/main.rs
index 62b8d32..0e3b273 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -222,10 +222,7 @@ mod tests {
 
         assert_eq!(output.exit_code, 1);
         assert_eq!(output.stdout, "");
-        assert_eq!(
-            output.stderr,
-            "The file extension `.\"md\"` was not recognized as an image format\n"
-        );
+        assert_eq!(output.stderr, "The image format could not be determined\n");
     }
 
     #[test]