diff --git a/tests/encode_images_with_compression.rs b/tests/encode_images_with_compression.rs index 1cf178f..2855c51 100644 --- a/tests/encode_images_with_compression.rs +++ b/tests/encode_images_with_compression.rs @@ -6,7 +6,7 @@ use tiff::{ encoder::{ colortype::{self, ColorType}, compression::*, - TiffEncoder, TiffValue, + Compression, TiffEncoder, TiffValue, }, }; @@ -18,15 +18,12 @@ trait TestImage: From: fn reference_data(&self) -> &[::Inner]; fn generate_pixel(x: u32, y: u32) -> [::Inner; NUM_CHANNELS]; - fn compress( - &self, - encoder: &mut TiffEncoder, - compression: C, - ) where + fn compress(&self, encoder: &mut TiffEncoder) + where [::Inner]: TiffValue, { let image = encoder - .new_image_with_compression::(Self::WIDTH, Self::HEIGHT, compression) + .new_image::(Self::WIDTH, Self::HEIGHT) .unwrap(); image.write_data(self.reference_data()).unwrap(); } @@ -94,7 +91,7 @@ impl TestImage<1> for TestImageGrayscale { } } -fn encode_decode_with_compression(compression: C) { +fn encode_decode_with_compression(compression: Compression) { let mut data = Cursor::new(Vec::new()); let image_rgb = TestImageColor::generate(); @@ -103,9 +100,11 @@ fn encode_decode_with_compression(compression: C) { // Encode tiff with compression { // Create a multipage image with 2 images - let mut encoder = TiffEncoder::new(&mut data).unwrap(); - image_rgb.compress(&mut encoder, compression.clone()); - image_grayscale.compress(&mut encoder, compression); + let mut encoder = TiffEncoder::new(&mut data) + .unwrap() + .with_compression(compression); + image_rgb.compress(&mut encoder); + image_grayscale.compress(&mut encoder); } // Decode tiff @@ -136,22 +135,22 @@ fn encode_decode_with_compression(compression: C) { #[test] fn encode_decode_without_compression() { - encode_decode_with_compression(Uncompressed::default()); + encode_decode_with_compression(Compression::Uncompressed); } #[test] fn encode_decode_with_lzw() { - encode_decode_with_compression(Lzw::default()); + encode_decode_with_compression(Compression::Lzw); } #[test] fn encode_decode_with_deflate() { - encode_decode_with_compression(Deflate::with_level(DeflateLevel::Fast)); - encode_decode_with_compression(Deflate::with_level(DeflateLevel::Balanced)); - encode_decode_with_compression(Deflate::with_level(DeflateLevel::Best)); + encode_decode_with_compression(Compression::Deflate(DeflateLevel::Fast)); + encode_decode_with_compression(Compression::Deflate(DeflateLevel::Balanced)); + encode_decode_with_compression(Compression::Deflate(DeflateLevel::Best)); } #[test] fn encode_decode_with_packbits() { - encode_decode_with_compression(Packbits::default()); + encode_decode_with_compression(Compression::Packbits); }