Change to pub(crate) fields

Author: kylebarron

src/ifd.rs

@@ -700,7 +700,6 @@ impl ImageFileDirectory {
             },
             bits_per_sample: &self.bits_per_sample,
             samples_per_pixel: self.samples_per_pixel,
-            sample_format: &self.sample_format,
             planar_configuration: self.planar_configuration,
         }
     }

src/predictor.rs

@@ -285,9 +285,7 @@ mod test {
     use bytes::Bytes;
 
     use crate::{
-        predictor::FloatingPointPredictor,
-        reader::Endianness,
-        tiff::tags::{PlanarConfiguration, SampleFormat},
+        predictor::FloatingPointPredictor, reader::Endianness, tiff::tags::PlanarConfiguration,
         tile::PredictorInfo,
     };
 
@@ -301,7 +299,6 @@ mod test {
         chunk_height: 4,
         bits_per_sample: &[8],
         samples_per_pixel: 1,
-        sample_format: &[SampleFormat::Uint],
         planar_configuration: crate::tiff::tags::PlanarConfiguration::Chunky,
     };
     #[rustfmt::skip]
@@ -382,7 +379,6 @@ mod test {
         for (x,y, input, expected) in cases {
             println!("uints littleendian");
             predictor_info.endianness = Endianness::LittleEndian;
-            predictor_info.sample_format = &[SampleFormat::Uint];
             predictor_info.bits_per_sample = &[8];
             assert_eq!(-1i32 as u8, 255);
             println!("testing u8");
@@ -409,7 +405,6 @@ mod test {
             assert_eq!(p.fix_endianness_and_unpredict(buffer, &predictor_info, x, y).unwrap(), res);
 
             println!("ints littleendian");
-            predictor_info.sample_format = &[SampleFormat::Int];
             predictor_info.bits_per_sample = &[8];
             println!("testing i8");
             let buffer = Bytes::from(input.iter().flat_map(|v| (*v as i8).to_le_bytes()).collect::<Vec<_>>());
@@ -434,7 +429,6 @@ mod test {
 
             println!("uints bigendian");
             predictor_info.endianness = Endianness::BigEndian;
-            predictor_info.sample_format = &[SampleFormat::Uint];
             predictor_info.bits_per_sample = &[8];
             assert_eq!(-1i32 as u8, 255);
             println!("testing u8");
@@ -509,7 +503,6 @@ mod test {
             chunk_height: 4,
             bits_per_sample: &[16],
             samples_per_pixel: 1,
-            sample_format: &[SampleFormat::IEEEFP],
             planar_configuration: PlanarConfiguration::Chunky,
         };
         let input = Bytes::from_owner(diffed);
@@ -539,7 +532,6 @@ mod test {
             chunk_height: 4,
             bits_per_sample: &[16],
             samples_per_pixel: 1,
-            sample_format: &[SampleFormat::IEEEFP],
             planar_configuration: PlanarConfiguration::Chunky,
         };
         let input = Bytes::from_owner(diffed);
@@ -568,7 +560,6 @@ mod test {
             chunk_height: 2,
             bits_per_sample: &[32],
             samples_per_pixel: 1,
-            sample_format: &[SampleFormat::IEEEFP],
             planar_configuration: PlanarConfiguration::Chunky,
         };
         let input = Bytes::from_owner(diffed);
@@ -603,7 +594,6 @@ mod test {
             chunk_height: 2,
             bits_per_sample: &[64],
             samples_per_pixel: 1,
-            sample_format: &[SampleFormat::IEEEFP],
             planar_configuration: PlanarConfiguration::Chunky,
         };
         let input = Bytes::from_owner(diffed);

src/tile.rs

@@ -5,7 +5,7 @@ use crate::error::AsyncTiffResult;
 use crate::predictor::{FloatingPointPredictor, HorizontalPredictor, NoPredictor, Unpredict};
 use crate::reader::Endianness;
 use crate::tiff::tags::{
-    CompressionMethod, PhotometricInterpretation, PlanarConfiguration, Predictor, SampleFormat,
+    CompressionMethod, PhotometricInterpretation, PlanarConfiguration, Predictor,
 };
 use crate::tiff::{TiffError, TiffUnsupportedError};
 
@@ -17,33 +17,29 @@ use crate::tiff::{TiffError, TiffUnsupportedError};
 /// Also provides convenience functions
 ///
 #[derive(Debug, Clone, Copy)]
-pub struct PredictorInfo<'a> {
+pub(crate) struct PredictorInfo<'a> {
     /// endianness
-    pub endianness: Endianness,
+    pub(crate) endianness: Endianness,
     /// width of the image in pixels
-    pub image_width: u32,
+    pub(crate) image_width: u32,
     /// height of the image in pixels
-    pub image_height: u32,
+    pub(crate) image_height: u32,
     /// chunk width in pixels
     ///
     /// If this is a stripped tiff, `chunk_width=image_width`
-    pub chunk_width: u32,
+    pub(crate) chunk_width: u32,
     /// chunk height in pixels
-    pub chunk_height: u32,
+    pub(crate) chunk_height: u32,
     /// bits per sample, as an array
     ///
     /// Can also be a single value, in which case it applies to all samples
-    pub bits_per_sample: &'a [u16], // maybe say that we only support a single bits_per_sample?
+    pub(crate) bits_per_sample: &'a [u16], // maybe say that we only support a single bits_per_sample?
     /// number of samples per pixel
-    pub samples_per_pixel: u16,
-    /// sample format for each sample
-    ///
-    /// There is no decoding implementation in this crate (or libtiff) for mixed sample formats
-    pub sample_format: &'a [SampleFormat], // and a single sample_format?
+    pub(crate) samples_per_pixel: u16,
     /// planar configuration
     ///
     /// determines the bits per pixel
-    pub planar_configuration: PlanarConfiguration,
+    pub(crate) planar_configuration: PlanarConfiguration,
 }
 
 impl PredictorInfo<'_> {
@@ -260,10 +256,7 @@ impl Tile<'_> {
 
 #[cfg(test)]
 mod test {
-    use crate::{
-        reader::Endianness,
-        tiff::tags::{PlanarConfiguration, SampleFormat},
-    };
+    use crate::{reader::Endianness, tiff::tags::PlanarConfiguration};
 
     use super::PredictorInfo;
 
@@ -277,7 +270,6 @@ mod test {
             chunk_height: 8,
             bits_per_sample: &[8],
             samples_per_pixel: 1,
-            sample_format: &[SampleFormat::Uint],
             planar_configuration: PlanarConfiguration::Chunky,
         };
         assert_eq!(info.bits_per_pixel(), 8);