Merge pull request #2644 from image-rs/gif-0.14

Bump Gif to 0.14, introducing XMP and ICC

Author: 197g

Cargo.toml

@@ -44,7 +44,7 @@ num-traits = { version = "0.2.0" }
 color_quant = { version = "1.1", optional = true }
 dav1d = { version = "0.10.3", optional = true }
 exr = { version = "1.74.0", default-features = false, optional = true }
-gif = { version = "0.13.1", optional = true }
+gif = { version = "0.14.0", optional = true }
 image-webp = { version = "0.2.0", optional = true }
 mp4parse = { version = "0.17.0", optional = true }
 png = { version = "0.18.0", optional = true }

src/codecs/gif.rs

@@ -214,6 +214,16 @@ impl<R: BufRead + Seek> ImageDecoder for GifDecoder<R> {
         Ok(())
     }
 
+    fn icc_profile(&mut self) -> ImageResult<Option<Vec<u8>>> {
+        // Similar to XMP metadata
+        Ok(self.reader.icc_profile().map(Vec::from))
+    }
+
+    fn xmp_metadata(&mut self) -> ImageResult<Option<Vec<u8>>> {
+        // XMP metadata must be part of the header which is read with `read_info`.
+        Ok(self.reader.xmp_metadata().map(Vec::from))
+    }
+
     fn read_image_boxed(self: Box<Self>, buf: &mut [u8]) -> ImageResult<()> {
         (*self).read_image(buf)
     }
@@ -634,20 +644,16 @@ impl ImageError {
     fn from_decoding(err: gif::DecodingError) -> ImageError {
         use gif::DecodingError::*;
         match err {
-            err @ Format(_) => {
-                ImageError::Decoding(DecodingError::new(ImageFormat::Gif.into(), err))
-            }
             Io(io_err) => ImageError::IoError(io_err),
+            other => ImageError::Decoding(DecodingError::new(ImageFormat::Gif.into(), other)),
         }
     }
 
     fn from_encoding(err: gif::EncodingError) -> ImageError {
         use gif::EncodingError::*;
         match err {
-            err @ Format(_) => {
-                ImageError::Encoding(EncodingError::new(ImageFormat::Gif.into(), err))
-            }
             Io(io_err) => ImageError::IoError(io_err),
+            other => ImageError::Encoding(EncodingError::new(ImageFormat::Gif.into(), other)),
         }
     }
 }