Skip to content

Commit d754e14

Browse files
committed
Remove unused planar configuration
1 parent 2b3fe03 commit d754e14

File tree

3 files changed

+3
-19
lines changed

3 files changed

+3
-19
lines changed

src/ifd.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,6 @@ impl ImageFileDirectory {
704704
},
705705
bits_per_sample: self.bits_per_sample[0],
706706
samples_per_pixel: self.samples_per_pixel,
707-
planar_configuration: self.planar_configuration,
708707
}
709708
}
710709

src/predictor.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,7 @@ mod test {
284284

285285
use bytes::Bytes;
286286

287-
use crate::{
288-
predictor::FloatingPointPredictor, reader::Endianness, tiff::tags::PlanarConfiguration,
289-
tile::PredictorInfo,
290-
};
287+
use crate::{predictor::FloatingPointPredictor, reader::Endianness, tile::PredictorInfo};
291288

292289
use super::{HorizontalPredictor, NoPredictor, Unpredict};
293290

@@ -299,7 +296,6 @@ mod test {
299296
chunk_height: 4,
300297
bits_per_sample: 8,
301298
samples_per_pixel: 1,
302-
planar_configuration: crate::tiff::tags::PlanarConfiguration::Chunky,
303299
};
304300
#[rustfmt::skip]
305301
const RES: [u8;16] = [
@@ -503,7 +499,6 @@ mod test {
503499
chunk_height: 4,
504500
bits_per_sample: 16,
505501
samples_per_pixel: 1,
506-
planar_configuration: PlanarConfiguration::Chunky,
507502
};
508503
let input = Bytes::from_owner(diffed);
509504
assert_eq!(
@@ -532,7 +527,6 @@ mod test {
532527
chunk_height: 4,
533528
bits_per_sample: 16,
534529
samples_per_pixel: 1,
535-
planar_configuration: PlanarConfiguration::Chunky,
536530
};
537531
let input = Bytes::from_owner(diffed);
538532
assert_eq!(
@@ -560,7 +554,6 @@ mod test {
560554
chunk_height: 2,
561555
bits_per_sample: 32,
562556
samples_per_pixel: 1,
563-
planar_configuration: PlanarConfiguration::Chunky,
564557
};
565558
let input = Bytes::from_owner(diffed);
566559
assert_eq!(
@@ -594,7 +587,6 @@ mod test {
594587
chunk_height: 2,
595588
bits_per_sample: 64,
596589
samples_per_pixel: 1,
597-
planar_configuration: PlanarConfiguration::Chunky,
598590
};
599591
let input = Bytes::from_owner(diffed);
600592
assert_eq!(

src/tile.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ use crate::decoder::DecoderRegistry;
44
use crate::error::AsyncTiffResult;
55
use crate::predictor::{FloatingPointPredictor, HorizontalPredictor, NoPredictor, Unpredict};
66
use crate::reader::Endianness;
7-
use crate::tiff::tags::{
8-
CompressionMethod, PhotometricInterpretation, PlanarConfiguration, Predictor,
9-
};
7+
use crate::tiff::tags::{CompressionMethod, PhotometricInterpretation, Predictor};
108
use crate::tiff::{TiffError, TiffUnsupportedError};
119

1210
/// All info that may be used by a predictor
@@ -36,10 +34,6 @@ pub(crate) struct PredictorInfo {
3634
pub(crate) bits_per_sample: u16,
3735
/// number of samples per pixel
3836
pub(crate) samples_per_pixel: u16,
39-
/// planar configuration
40-
///
41-
/// determines the bits per pixel
42-
pub(crate) planar_configuration: PlanarConfiguration,
4337
}
4438

4539
impl PredictorInfo {
@@ -257,7 +251,7 @@ impl Tile {
257251

258252
#[cfg(test)]
259253
mod test {
260-
use crate::{reader::Endianness, tiff::tags::PlanarConfiguration};
254+
use crate::reader::Endianness;
261255

262256
use super::PredictorInfo;
263257

@@ -271,7 +265,6 @@ mod test {
271265
chunk_height: 8,
272266
bits_per_sample: 8,
273267
samples_per_pixel: 1,
274-
planar_configuration: PlanarConfiguration::Chunky,
275268
};
276269
assert_eq!(info.chunks_across(), 2);
277270
assert_eq!(info.chunks_down(), 3);

0 commit comments

Comments
 (0)