Refactor aux chunk handling (#505)

shssoichiro · May 21, 2023 · ea5f188 · ea5f188
1 parent a583270
commit ea5f188
Show file tree

Hide file tree

Showing 32 changed files with 619 additions and 699 deletions.
diff --git a/benches/deflate.rs b/benches/deflate.rs
@@ -3,15 +3,15 @@
 extern crate oxipng;
 extern crate test;
 
+use oxipng::internal_tests::*;
+use oxipng::*;
 use std::path::PathBuf;
 use test::Bencher;
 
-use oxipng::internal_tests::*;
-
 #[bench]
 fn deflate_16_bits(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         let min = AtomicMin::new(None);
@@ -22,7 +22,7 @@ fn deflate_16_bits(b: &mut Bencher) {
 #[bench]
 fn deflate_8_bits(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png"));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         let min = AtomicMin::new(None);
@@ -35,7 +35,7 @@ fn deflate_4_bits(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_4_should_be_palette_4.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         let min = AtomicMin::new(None);
@@ -48,7 +48,7 @@ fn deflate_2_bits(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_2_should_be_palette_2.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         let min = AtomicMin::new(None);
@@ -61,7 +61,7 @@ fn deflate_1_bits(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_1_should_be_palette_1.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         let min = AtomicMin::new(None);
@@ -72,7 +72,7 @@ fn deflate_1_bits(b: &mut Bencher) {
 #[bench]
 fn inflate_generic(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| inflate(png.idat_data.as_ref(), png.raw.ihdr.raw_data_size()));
 }
diff --git a/benches/filters.rs b/benches/filters.rs
@@ -3,14 +3,15 @@
 extern crate oxipng;
 extern crate test;
 
-use oxipng::{internal_tests::*, RowFilter};
+use oxipng::internal_tests::*;
+use oxipng::*;
 use std::path::PathBuf;
 use test::Bencher;
 
 #[bench]
 fn filters_16_bits_filter_0(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::None, false);
@@ -20,7 +21,7 @@ fn filters_16_bits_filter_0(b: &mut Bencher) {
 #[bench]
 fn filters_8_bits_filter_0(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png"));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::None, false);
@@ -32,7 +33,7 @@ fn filters_4_bits_filter_0(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_4_should_be_palette_4.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::None, false);
@@ -44,7 +45,7 @@ fn filters_2_bits_filter_0(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_2_should_be_palette_2.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::None, false);
@@ -56,7 +57,7 @@ fn filters_1_bits_filter_0(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_1_should_be_palette_1.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::None, false);
@@ -66,7 +67,7 @@ fn filters_1_bits_filter_0(b: &mut Bencher) {
 #[bench]
 fn filters_16_bits_filter_1(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Sub, false);
@@ -76,7 +77,7 @@ fn filters_16_bits_filter_1(b: &mut Bencher) {
 #[bench]
 fn filters_8_bits_filter_1(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png"));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Sub, false);
@@ -88,7 +89,7 @@ fn filters_4_bits_filter_1(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_4_should_be_palette_4.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Sub, false);
@@ -100,7 +101,7 @@ fn filters_2_bits_filter_1(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_2_should_be_palette_2.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Sub, false);
@@ -112,7 +113,7 @@ fn filters_1_bits_filter_1(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_1_should_be_palette_1.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Sub, false);
@@ -122,7 +123,7 @@ fn filters_1_bits_filter_1(b: &mut Bencher) {
 #[bench]
 fn filters_16_bits_filter_2(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Up, false);
@@ -132,7 +133,7 @@ fn filters_16_bits_filter_2(b: &mut Bencher) {
 #[bench]
 fn filters_8_bits_filter_2(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png"));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Up, false);
@@ -144,7 +145,7 @@ fn filters_4_bits_filter_2(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_4_should_be_palette_4.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Up, false);
@@ -156,7 +157,7 @@ fn filters_2_bits_filter_2(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_2_should_be_palette_2.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Up, false);
@@ -168,7 +169,7 @@ fn filters_1_bits_filter_2(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_1_should_be_palette_1.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Up, false);
@@ -178,7 +179,7 @@ fn filters_1_bits_filter_2(b: &mut Bencher) {
 #[bench]
 fn filters_16_bits_filter_3(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Average, false);
@@ -188,7 +189,7 @@ fn filters_16_bits_filter_3(b: &mut Bencher) {
 #[bench]
 fn filters_8_bits_filter_3(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png"));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Average, false);
@@ -200,7 +201,7 @@ fn filters_4_bits_filter_3(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_4_should_be_palette_4.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Average, false);
@@ -212,7 +213,7 @@ fn filters_2_bits_filter_3(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_2_should_be_palette_2.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Average, false);
@@ -224,7 +225,7 @@ fn filters_1_bits_filter_3(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_1_should_be_palette_1.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Average, false);
@@ -234,7 +235,7 @@ fn filters_1_bits_filter_3(b: &mut Bencher) {
 #[bench]
 fn filters_16_bits_filter_4(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Paeth, false);
@@ -244,7 +245,7 @@ fn filters_16_bits_filter_4(b: &mut Bencher) {
 #[bench]
 fn filters_8_bits_filter_4(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png"));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Paeth, false);
@@ -256,7 +257,7 @@ fn filters_4_bits_filter_4(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_4_should_be_palette_4.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Paeth, false);
@@ -268,7 +269,7 @@ fn filters_2_bits_filter_4(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_2_should_be_palette_2.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Paeth, false);
@@ -280,7 +281,7 @@ fn filters_1_bits_filter_4(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_1_should_be_palette_1.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::Paeth, false);
@@ -290,7 +291,7 @@ fn filters_1_bits_filter_4(b: &mut Bencher) {
 #[bench]
 fn filters_16_bits_filter_5(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::MinSum, false);
@@ -300,7 +301,7 @@ fn filters_16_bits_filter_5(b: &mut Bencher) {
 #[bench]
 fn filters_8_bits_filter_5(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png"));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::MinSum, false);
@@ -312,7 +313,7 @@ fn filters_4_bits_filter_5(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_4_should_be_palette_4.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::MinSum, false);
@@ -324,7 +325,7 @@ fn filters_2_bits_filter_5(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_2_should_be_palette_2.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::MinSum, false);
@@ -336,7 +337,7 @@ fn filters_1_bits_filter_5(b: &mut Bencher) {
     let input = test::black_box(PathBuf::from(
         "tests/files/palette_1_should_be_palette_1.png",
     ));
-    let png = PngData::new(&input, false).unwrap();
+    let png = PngData::new(&input, &Options::default()).unwrap();
 
     b.iter(|| {
         png.raw.filter_image(RowFilter::MinSum, false);