diff --git a/src/codecs/jpeg/encoder.rs b/src/codecs/jpeg/encoder.rs index ebf2532524..52390220a7 100644 --- a/src/codecs/jpeg/encoder.rs +++ b/src/codecs/jpeg/encoder.rs @@ -9,7 +9,7 @@ use crate::error::{ }; use crate::image::{ImageEncoder, ImageFormat}; use crate::utils::clamp; -use crate::{ExtendedColorType, GenericImageView, ImageBuffer, Luma, LumaA, Pixel, Rgb, Rgba}; +use crate::{ExtendedColorType, GenericImageView, ImageBuffer, Luma, Pixel, Rgb}; use super::entropy::build_huff_lut_const; use super::transform; @@ -461,21 +461,11 @@ impl JpegEncoder { ImageBuffer::from_raw(width, height, image).unwrap(); self.encode_image(&image) } - ExtendedColorType::La8 => { - let image: ImageBuffer, _> = - ImageBuffer::from_raw(width, height, image).unwrap(); - self.encode_image(&image) - } ExtendedColorType::Rgb8 => { let image: ImageBuffer, _> = ImageBuffer::from_raw(width, height, image).unwrap(); self.encode_image(&image) } - ExtendedColorType::Rgba8 => { - let image: ImageBuffer, _> = - ImageBuffer::from_raw(width, height, image).unwrap(); - self.encode_image(&image) - } _ => Err(ImageError::Unsupported( UnsupportedError::from_format_and_kind( ImageFormat::Jpeg.into(), @@ -577,7 +567,7 @@ impl JpegEncoder { build_scan_header(&mut buf, &self.components[..num_components]); self.writer.write_segment(SOS, &buf)?; - if let ExtendedColorType::Rgb8 = color_type { + if ExtendedColorType::Rgb8 == color_type || ExtendedColorType::Rgba8 == color_type { self.encode_rgb(image) } else { self.encode_gray(image)