Merge pull request #2736 from Shnatsel/jpeg-encoder-0.7

Upgrade to jpeg-encoder 0.7

Author: 197g

.github/workflows/rust.yml

@@ -39,14 +39,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: ["1.85.0", nightly, beta]
+        rust: ["1.87.0", nightly, beta]
     steps:
     - uses: actions/checkout@v4
 
     - uses: dtolnay/rust-toolchain@nightly
-      if: ${{ matrix.rust == '1.85.0' }}
+      if: ${{ matrix.rust == '1.87.0' }}
     - name: Generate Cargo.lock with minimal-version dependencies
-      if: ${{ matrix.rust == '1.85.0' }}
+      if: ${{ matrix.rust == '1.87.0' }}
       run: |
         cargo -Zminimal-versions generate-lockfile
         cargo update --offline num-bigint --precise 0.4.2
@@ -61,7 +61,7 @@ jobs:
     - name: build
       run: cargo build -v
     - name: test
-      if: ${{ matrix.rust != '1.85.0' }}
+      if: ${{ matrix.rust != '1.87.0' }}
       run: cargo test -v && cargo doc -v
 
   test_other_archs:

Cargo.toml

@@ -10,7 +10,7 @@ resolver = "2"
 publish = false
 
 # note: when changed, also update test runner in `.github/workflows/rust.yml`
-rust-version = "1.85.0"
+rust-version = "1.87.0"
 
 license = "MIT OR Apache-2.0"
 description = "Imaging library. Provides basic image processing and encoders/decoders for common image formats."
@@ -60,7 +60,7 @@ rgb = { version = "0.8.48", default-features = false, optional = true }
 tiff = { version = "0.10.3", optional = true }
 zune-core = { version = "0.5.0", default-features = false, optional = true }
 zune-jpeg = { version = "0.5.5", optional = true }
-jpeg-encoder = { version = "0.6.1", optional = true, features = ["simd"] }
+jpeg-encoder = { version = "0.7.0", optional = true, features = ["simd"] }
 serde = { version = "1.0.214", optional = true, features = ["derive"] }
 pic-scale-safe = "0.1.5"
 

src/codecs/avif/encoder.rs

@@ -196,7 +196,7 @@ impl<W: Write> AvifEncoder<W> {
                 Err(PodCastError::TargetAlignmentGreaterAndInputNotAligned) => {
                     // Sad, but let's allocate.
                     // bytemuck checks alignment _before_ slop but size mismatch before this..
-                    if buf.len() % size_of::<Channel>() != 0 {
+                    if !buf.len().is_multiple_of(size_of::<Channel>()) {
                         Err(ImageError::Parameter(ParameterError::from_kind(
                             ParameterErrorKind::DimensionMismatch,
                         )))

src/codecs/dxt.rs

@@ -80,7 +80,7 @@ impl<R: Read> DxtDecoder<R> {
         height: u32,
         variant: DxtVariant,
     ) -> Result<DxtDecoder<R>, ImageError> {
-        if width % 4 != 0 || height % 4 != 0 {
+        if !width.is_multiple_of(4) || !height.is_multiple_of(4) {
             // TODO: this is actually a bit of a weird case. We could return `DecodingError` but
             // it's not really the format that is wrong However, the encoder should surely return
             // `EncodingError` so it would be the logical choice for symmetry.
@@ -289,7 +289,7 @@ fn decode_dxt1_block(source: &[u8], dest: &mut [u8]) {
 /// Decode a row of DXT1 data to four rows of RGB data.
 /// `source.len()` should be a multiple of 8, otherwise this panics.
 fn decode_dxt1_row(source: &[u8], dest: &mut [u8]) {
-    assert!(source.len() % 8 == 0);
+    assert!(source.len().is_multiple_of(8));
     let block_count = source.len() / 8;
     assert!(dest.len() >= block_count * 48);
 
@@ -310,7 +310,7 @@ fn decode_dxt1_row(source: &[u8], dest: &mut [u8]) {
 /// Decode a row of DXT3 data to four rows of RGBA data.
 /// `source.len()` should be a multiple of 16, otherwise this panics.
 fn decode_dxt3_row(source: &[u8], dest: &mut [u8]) {
-    assert!(source.len() % 16 == 0);
+    assert!(source.len().is_multiple_of(16));
     let block_count = source.len() / 16;
     assert!(dest.len() >= block_count * 64);
 
@@ -331,7 +331,7 @@ fn decode_dxt3_row(source: &[u8], dest: &mut [u8]) {
 /// Decode a row of DXT5 data to four rows of RGBA data.
 /// `source.len()` should be a multiple of 16, otherwise this panics.
 fn decode_dxt5_row(source: &[u8], dest: &mut [u8]) {
-    assert!(source.len() % 16 == 0);
+    assert!(source.len().is_multiple_of(16));
     let block_count = source.len() / 16;
     assert!(dest.len() >= block_count * 64);
 

src/codecs/jpeg/encoder.rs

@@ -85,17 +85,15 @@ impl PixelDensity {
     }
 
     /// Converts pixel density to the representation used by jpeg-encoder crate
-    fn to_encoder_repr(self) -> jpeg_encoder::Density {
-        match self.unit {
-            PixelDensityUnit::PixelAspectRatio => jpeg_encoder::Density::None, // TODO: https://github.com/vstroebel/jpeg-encoder/issues/21
-            PixelDensityUnit::Inches => jpeg_encoder::Density::Inch {
-                x: self.density.0,
-                y: self.density.1,
-            },
-            PixelDensityUnit::Centimeters => jpeg_encoder::Density::Centimeter {
-                x: self.density.0,
-                y: self.density.1,
-            },
+    fn to_encoder_repr(self) -> jpeg_encoder::PixelDensity {
+        let unit = match self.unit {
+            PixelDensityUnit::PixelAspectRatio => jpeg_encoder::PixelDensityUnit::PixelAspectRatio,
+            PixelDensityUnit::Inches => jpeg_encoder::PixelDensityUnit::Inches,
+            PixelDensityUnit::Centimeters => jpeg_encoder::PixelDensityUnit::Centimeters,
+        };
+        jpeg_encoder::PixelDensity {
+            density: self.density,
+            unit,
         }
     }
 }
@@ -238,11 +236,6 @@ impl<W: Write> JpegEncoder<W> {
     }
 }
 
-// E x i f \0 \0
-/// The header for an EXIF APP1 segment
-const EXIF_HEADER: [u8; 6] = [0x45, 0x78, 0x69, 0x66, 0x00, 0x00];
-const APP1: u8 = 1;
-
 impl<W: Write> ImageEncoder for JpegEncoder<W> {
     #[track_caller]
     fn write_image(
@@ -265,16 +258,12 @@ impl<W: Write> ImageEncoder for JpegEncoder<W> {
     }
 
     fn set_exif_metadata(&mut self, exif: Vec<u8>) -> Result<(), UnsupportedError> {
-        let mut formatted = EXIF_HEADER.to_vec();
-        formatted.extend_from_slice(&exif);
-        self.encoder
-            .add_app_segment(APP1, &formatted)
-            .map_err(|_| {
-                UnsupportedError::from_format_and_kind(
-                    ImageFormat::Jpeg.into(),
-                    UnsupportedErrorKind::GenericFeature("Exif chunk too large".to_string()),
-                )
-            })?;
+        self.encoder.add_exif_metadata(&exif).map_err(|_| {
+            UnsupportedError::from_format_and_kind(
+                ImageFormat::Jpeg.into(),
+                UnsupportedErrorKind::GenericFeature("Exif chunk too large".to_string()),
+            )
+        })?;
         Ok(())
     }
 

src/codecs/pnm/decoder.rs

@@ -786,7 +786,7 @@ impl Sample for PbmBit {
 
     fn bytelen(width: u32, height: u32, samples: u32) -> ImageResult<usize> {
         let count = width * samples;
-        let linelen = (count / 8) + u32::from((count % 8) != 0);
+        let linelen = (count / 8) + u32::from(!count.is_multiple_of(8));
         Ok((linelen * height) as usize)
     }
 

src/imageops/fast_blur.rs

@@ -128,7 +128,7 @@ fn boxes_for_gauss(sigma: f32, n: usize) -> Vec<usize> {
 
 #[inline]
 fn ceil_to_odd(x: usize) -> usize {
-    if x % 2 == 0 {
+    if x.is_multiple_of(2) {
         x + 1
     } else {
         x

src/imageops/sample.rs

@@ -1201,7 +1201,7 @@ impl GaussianBlurParameters {
     #[inline]
     fn round_to_nearest_odd(x: f32) -> u32 {
         let n = x.round() as u32;
-        if n % 2 != 0 {
+        if !n.is_multiple_of(2) {
             n
         } else {
             let lower = n - 1;
@@ -1225,7 +1225,7 @@ impl GaussianBlurParameters {
 
     fn kernel_size_from_sigma(sigma: f32) -> u32 {
         let possible_size = (((((sigma - 0.8) / 0.3) + 1.) * 2.) + 1.).max(3.) as u32;
-        if possible_size % 2 == 0 {
+        if possible_size.is_multiple_of(2) {
             return possible_size + 1;
         }
         possible_size

src/metadata/cicp.rs

@@ -1155,7 +1155,7 @@ impl CicpRgb {
     {
         use crate::traits::private::LayoutWithColor as Layout;
 
-        assert!(buffer.len() % from_layout.channels() == 0);
+        assert!(buffer.len().is_multiple_of(from_layout.channels()));
         let pixels = buffer.len() / from_layout.channels();
 
         let mut output: Vec<IntoSubpixel> = vec_try_with_capacity(pixels * into_layout.channels())

src/utils/mod.rs

@@ -40,7 +40,7 @@ pub(crate) fn expand_bits(bit_depth: u8, row_size: u32, buf: &[u8]) -> Vec<u8> {
     let mask = (1u8 << bit_depth as usize) - 1;
     let scaling_factor = 255 / ((1 << bit_depth as usize) - 1);
     let bit_width = row_size * u32::from(bit_depth);
-    let skip = if bit_width % 8 == 0 {
+    let skip = if bit_width.is_multiple_of(8) {
         0
     } else {
         (8 - bit_width % 8) / u32::from(bit_depth)