Merge pull request #2574 from image-rs/png-0.18

197g · web-flow · commit 901a75c6e688 · 2025-08-31T17:07:36.000Z
Png 0.18
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -50,7 +50,6 @@ jobs:
       run: |
         cargo -Zminimal-versions generate-lockfile
         cargo update --offline num-bigint --precise 0.4.2
-        cargo update --offline bitflags:1.0.0 --precise 1.3.2
 
     - uses: dtolnay/rust-toolchain@v1
       with:
diff --git a/Cargo.toml b/Cargo.toml
@@ -47,7 +47,7 @@ exr = { version = "1.5.0", optional = true }
 gif = { version = "0.13.1", optional = true }
 image-webp = { version = "0.2.0", optional = true }
 mp4parse = { version = "0.17.0", optional = true }
-png = { version = "0.17.16", optional = true }
+png = { version = "0.18.0", optional = true }
 qoi = { version = "0.4", optional = true }
 ravif = { version = "0.11.12", default-features = false, optional = true }
 rayon = { version = "1.7.0", optional = true }
diff --git a/src/codecs/png.rs b/src/codecs/png.rs
@@ -45,7 +45,6 @@ impl<R: BufRead + Seek> PngDecoder<R> {
 
         let max_bytes = usize::try_from(limits.max_alloc.unwrap_or(u64::MAX)).unwrap_or(usize::MAX);
         let mut decoder = png::Decoder::new_with_limits(r, png::Limits { bytes: max_bytes });
-        decoder.set_ignore_text_chunk(true);
 
         let info = decoder.read_header_info().map_err(ImageError::from_png)?;
         limits.check_dimensions(info.width, info.height)?;
@@ -306,8 +305,13 @@ impl<R: BufRead + Seek> ApngDecoder<R> {
         if self.has_thumbnail {
             // Clone the limits so that our one-off allocation that's destroyed after this scope doesn't persist
             let mut limits = self.inner.limits.clone();
-            limits.reserve_usize(self.inner.reader.output_buffer_size())?;
-            let mut buffer = vec![0; self.inner.reader.output_buffer_size()];
+
+            let buffer_size = self.inner.reader.output_buffer_size().ok_or_else(|| {
+                ImageError::Limits(LimitError::from_kind(LimitErrorKind::InsufficientMemory))
+            })?;
+
+            limits.reserve_usize(buffer_size)?;
+            let mut buffer = vec![0; buffer_size];
             // TODO: add `png::Reader::change_limits()` and call it here
             // to also constrain the internal buffer allocations in the PNG crate
             self.inner
@@ -364,7 +368,10 @@ impl<R: BufRead + Seek> ApngDecoder<R> {
         let mut limits = self.inner.limits.clone();
 
         // Read next frame data.
-        let raw_frame_size = self.inner.reader.output_buffer_size();
+        let raw_frame_size = self.inner.reader.output_buffer_size().ok_or_else(|| {
+            ImageError::Limits(LimitError::from_kind(LimitErrorKind::InsufficientMemory))
+        })?;
+
         limits.reserve_usize(raw_frame_size)?;
         let mut buffer = vec![0; raw_frame_size];
         // TODO: add `png::Reader::change_limits()` and call it here
@@ -597,21 +604,20 @@ impl<W: Write> PngEncoder<W> {
                 ))
             }
         };
+
         let comp = match self.compression {
-            CompressionType::Default => png::Compression::Default,
-            CompressionType::Best => png::Compression::Best,
+            CompressionType::Default => png::Compression::Balanced,
+            CompressionType::Best => png::Compression::High,
             _ => png::Compression::Fast,
         };
-        let (filter, adaptive_filter) = match self.filter {
-            FilterType::NoFilter => (
-                png::FilterType::NoFilter,
-                png::AdaptiveFilterType::NonAdaptive,
-            ),
-            FilterType::Sub => (png::FilterType::Sub, png::AdaptiveFilterType::NonAdaptive),
-            FilterType::Up => (png::FilterType::Up, png::AdaptiveFilterType::NonAdaptive),
-            FilterType::Avg => (png::FilterType::Avg, png::AdaptiveFilterType::NonAdaptive),
-            FilterType::Paeth => (png::FilterType::Paeth, png::AdaptiveFilterType::NonAdaptive),
-            FilterType::Adaptive => (png::FilterType::Sub, png::AdaptiveFilterType::Adaptive),
+
+        let filter = match self.filter {
+            FilterType::NoFilter => png::Filter::NoFilter,
+            FilterType::Sub => png::Filter::Sub,
+            FilterType::Up => png::Filter::Up,
+            FilterType::Avg => png::Filter::Avg,
+            FilterType::Paeth => png::Filter::Paeth,
+            FilterType::Adaptive => png::Filter::Adaptive,
         };
 
         let mut info = png::Info::with_size(width, height);
@@ -630,7 +636,6 @@ impl<W: Write> PngEncoder<W> {
         encoder.set_depth(bits);
         encoder.set_compression(comp);
         encoder.set_filter(filter);
-        encoder.set_adaptive_filter(adaptive_filter);
         let mut writer = encoder
             .write_header()
             .map_err(|e| ImageError::IoError(e.into()))?;
