No longer need to pass around is_jfif

Author: AlanRace

src/decoder.rs

@@ -685,7 +685,6 @@ impl<R: Read> Decoder<R> {
                 &frame.components,
                 planes,
                 frame.output_size,
-                self.is_jfif,
                 self.determine_color_transform(),
             )
         }
@@ -1294,7 +1293,6 @@ fn compute_image(
     components: &[Component],
     mut data: Vec<Vec<u8>>,
     output_size: Dimensions,
-    is_jfif: bool,
     color_transform: ColorTransform,
 ) -> Result<Vec<u8>> {
     if data.is_empty() || data.iter().any(Vec::is_empty) {
@@ -1325,13 +1323,12 @@ fn compute_image(
         decoded.resize(size, 0);
         Ok(decoded)
     } else {
-        compute_image_parallel(components, data, output_size, is_jfif, color_transform)
+        compute_image_parallel(components, data, output_size, color_transform)
     }
 }
 
 pub(crate) fn choose_color_convert_func(
     component_count: usize,
-    _is_jfif: bool,
     color_transform: ColorTransform,
 ) -> Result<fn(&[Vec<u8>], &mut [u8])> {
     match component_count {

src/worker/mod.rs

@@ -98,19 +98,17 @@ pub fn compute_image_parallel(
     components: &[Component],
     data: Vec<Vec<u8>>,
     output_size: Dimensions,
-    is_jfif: bool,
     color_transform: ColorTransform,
 ) -> Result<Vec<u8>> {
     #[cfg(all(
         not(any(target_arch = "asmjs", target_arch = "wasm32")),
         feature = "rayon"
     ))]
-    return rayon::compute_image_parallel(components, data, output_size, is_jfif, color_transform);
+    return rayon::compute_image_parallel(components, data, output_size, color_transform);
 
     #[allow(unreachable_code)]
     {
-        let color_convert_func =
-            choose_color_convert_func(components.len(), is_jfif, color_transform)?;
+        let color_convert_func = choose_color_convert_func(components.len(), color_transform)?;
         let upsampler = Upsampler::new(components, output_size.width, output_size.height)?;
         let line_size = output_size.width as usize * components.len();
         let mut image = vec![0u8; line_size * output_size.height as usize];

src/worker/rayon.rs

@@ -6,7 +6,7 @@ use rayon::slice::ParallelSliceMut;
 use crate::decoder::{choose_color_convert_func, ColorTransform};
 use crate::error::Result;
 use crate::idct::dequantize_and_idct_block;
-use crate::parser::{AdobeColorTransform, Component};
+use crate::parser::Component;
 use crate::upsampler::Upsampler;
 use crate::{decoder::MAX_COMPONENTS, parser::Dimensions};
 
@@ -196,10 +196,9 @@ pub fn compute_image_parallel(
     components: &[Component],
     data: Vec<Vec<u8>>,
     output_size: Dimensions,
-    is_jfif: bool,
     color_transform: ColorTransform,
 ) -> Result<Vec<u8>> {
-    let color_convert_func = choose_color_convert_func(components.len(), is_jfif, color_transform)?;
+    let color_convert_func = choose_color_convert_func(components.len(), color_transform)?;
     let upsampler = Upsampler::new(components, output_size.width, output_size.height)?;
     let line_size = output_size.width as usize * components.len();
     let mut image = vec![0u8; line_size * output_size.height as usize];