Sample format should not be a Vec (#226)

image-rs · Mar 23, 2024 · 9b06e37 · 9b06e37
1 parent 895c70a
commit 9b06e37
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/src/decoder/image.rs b/src/decoder/image.rs
@@ -67,7 +67,7 @@ pub(crate) struct Image {
     pub bits_per_sample: u8,
     #[allow(unused)]
     pub samples: u16,
-    pub sample_format: Vec<SampleFormat>,
+    pub sample_format: SampleFormat,
     pub photometric_interpretation: PhotometricInterpretation,
     pub compression_method: CompressionMethod,
     pub predictor: Predictor,
@@ -155,9 +155,9 @@ impl Image {
                     return Err(TiffUnsupportedError::UnsupportedSampleFormat(sample_format).into());
                 }
 
-                sample_format
+                sample_format[0]
             }
-            None => vec![SampleFormat::Uint],
+            None => SampleFormat::Uint,
         };
 
         let bits_per_sample: Vec<u8> = tag_reader

diff --git a/src/decoder/mod.rs b/src/decoder/mod.rs
@@ -574,7 +574,7 @@ impl<R: Read + Seek> Decoder<R> {
                 height: 0,
                 bits_per_sample: 1,
                 samples: 1,
-                sample_format: vec![SampleFormat::Uint],
+                sample_format: SampleFormat::Uint,
                 photometric_interpretation: PhotometricInterpretation::BlackIsZero,
                 compression_method: CompressionMethod::None,
                 jpeg_tables: None,
@@ -1065,12 +1065,7 @@ impl<R: Read + Seek> Decoder<R> {
         };
 
         let max_sample_bits = self.image().bits_per_sample;
-        match self
-            .image()
-            .sample_format
-            .first()
-            .unwrap_or(&SampleFormat::Uint)
-        {
+        match self.image().sample_format {
             SampleFormat::Uint => match max_sample_bits {
                 n if n <= 8 => DecodingResult::new_u8(buffer_size, &self.limits),
                 n if n <= 16 => DecodingResult::new_u16(buffer_size, &self.limits),
@@ -1096,7 +1091,7 @@ impl<R: Read + Seek> Decoder<R> {
                     TiffUnsupportedError::UnsupportedBitsPerChannel(n),
                 )),
             },
-            format => Err(TiffUnsupportedError::UnsupportedSampleFormat(vec![*format]).into()),
+            format => Err(TiffUnsupportedError::UnsupportedSampleFormat(vec![format]).into()),
         }
     }