From 15e41c9c6de1cdaac9046359b9c636dd1b229345 Mon Sep 17 00:00:00 2001 From: Joshua Holmer Date: Mon, 2 May 2016 13:20:27 -0400 Subject: [PATCH] Fix benchmarks broken by adding --fix --- benches/deflate.rs | 42 ++++++++++++++--------------- benches/filters.rs | 60 +++++++++++++++++++++--------------------- benches/interlacing.rs | 20 +++++++------- benches/reductions.rs | 40 ++++++++++++++-------------- 4 files changed, 81 insertions(+), 81 deletions(-) diff --git a/benches/deflate.rs b/benches/deflate.rs index ee033246..11e4a1e5 100644 --- a/benches/deflate.rs +++ b/benches/deflate.rs @@ -11,7 +11,7 @@ use std::path::PathBuf; #[bench] fn bench_deflate_16_bits_strategy_0(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 0, 15).ok(); @@ -21,7 +21,7 @@ fn bench_deflate_16_bits_strategy_0(b: &mut Bencher) { #[bench] fn bench_deflate_8_bits_strategy_0(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 0, 15).ok(); @@ -31,7 +31,7 @@ fn bench_deflate_8_bits_strategy_0(b: &mut Bencher) { #[bench] fn bench_deflate_4_bits_strategy_0(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_4.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 0, 15).ok(); @@ -41,7 +41,7 @@ fn bench_deflate_4_bits_strategy_0(b: &mut Bencher) { #[bench] fn bench_deflate_2_bits_strategy_0(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_2_should_be_palette_2.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 0, 15).ok(); @@ -51,7 +51,7 @@ fn bench_deflate_2_bits_strategy_0(b: &mut Bencher) { #[bench] fn bench_deflate_1_bits_strategy_0(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_1_should_be_palette_1.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 0, 15).ok(); @@ -61,7 +61,7 @@ fn bench_deflate_1_bits_strategy_0(b: &mut Bencher) { #[bench] fn bench_deflate_16_bits_strategy_1(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 1, 15).ok(); @@ -71,7 +71,7 @@ fn bench_deflate_16_bits_strategy_1(b: &mut Bencher) { #[bench] fn bench_deflate_8_bits_strategy_1(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 1, 15).ok(); @@ -81,7 +81,7 @@ fn bench_deflate_8_bits_strategy_1(b: &mut Bencher) { #[bench] fn bench_deflate_4_bits_strategy_1(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_4.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 1, 15).ok(); @@ -91,7 +91,7 @@ fn bench_deflate_4_bits_strategy_1(b: &mut Bencher) { #[bench] fn bench_deflate_2_bits_strategy_1(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_2_should_be_palette_2.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 1, 15).ok(); @@ -101,7 +101,7 @@ fn bench_deflate_2_bits_strategy_1(b: &mut Bencher) { #[bench] fn bench_deflate_1_bits_strategy_1(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_1_should_be_palette_1.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 1, 15).ok(); @@ -111,7 +111,7 @@ fn bench_deflate_1_bits_strategy_1(b: &mut Bencher) { #[bench] fn bench_deflate_16_bits_strategy_2(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 2, 15).ok(); @@ -121,7 +121,7 @@ fn bench_deflate_16_bits_strategy_2(b: &mut Bencher) { #[bench] fn bench_deflate_8_bits_strategy_2(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 2, 15).ok(); @@ -131,7 +131,7 @@ fn bench_deflate_8_bits_strategy_2(b: &mut Bencher) { #[bench] fn bench_deflate_4_bits_strategy_2(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_4.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 2, 15).ok(); @@ -141,7 +141,7 @@ fn bench_deflate_4_bits_strategy_2(b: &mut Bencher) { #[bench] fn bench_deflate_2_bits_strategy_2(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_2_should_be_palette_2.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 2, 15).ok(); @@ -151,7 +151,7 @@ fn bench_deflate_2_bits_strategy_2(b: &mut Bencher) { #[bench] fn bench_deflate_1_bits_strategy_2(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_1_should_be_palette_1.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 2, 15).ok(); @@ -161,7 +161,7 @@ fn bench_deflate_1_bits_strategy_2(b: &mut Bencher) { #[bench] fn bench_deflate_16_bits_strategy_3(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 3, 15).ok(); @@ -171,7 +171,7 @@ fn bench_deflate_16_bits_strategy_3(b: &mut Bencher) { #[bench] fn bench_deflate_8_bits_strategy_3(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 3, 15).ok(); @@ -181,7 +181,7 @@ fn bench_deflate_8_bits_strategy_3(b: &mut Bencher) { #[bench] fn bench_deflate_4_bits_strategy_3(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_4.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 3, 15).ok(); @@ -191,7 +191,7 @@ fn bench_deflate_4_bits_strategy_3(b: &mut Bencher) { #[bench] fn bench_deflate_2_bits_strategy_3(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_2_should_be_palette_2.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 3, 15).ok(); @@ -201,7 +201,7 @@ fn bench_deflate_2_bits_strategy_3(b: &mut Bencher) { #[bench] fn bench_deflate_1_bits_strategy_3(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_1_should_be_palette_1.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::deflate(png.raw_data.as_ref(), 9, 9, 3, 15).ok(); @@ -211,7 +211,7 @@ fn bench_deflate_1_bits_strategy_3(b: &mut Bencher) { #[bench] fn bench_inflate_generic(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { deflate::inflate(png.idat_data.as_ref()).ok(); diff --git a/benches/filters.rs b/benches/filters.rs index 130be027..faea5f50 100644 --- a/benches/filters.rs +++ b/benches/filters.rs @@ -10,7 +10,7 @@ use std::path::PathBuf; #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(0); @@ -20,7 +20,7 @@ fn bench_16_bits_filter_0(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(0); @@ -30,7 +30,7 @@ fn bench_8_bits_filter_0(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(0); @@ -40,7 +40,7 @@ fn bench_4_bits_filter_0(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(0); @@ -50,7 +50,7 @@ fn bench_2_bits_filter_0(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(0); @@ -60,7 +60,7 @@ fn bench_1_bits_filter_0(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(1); @@ -70,7 +70,7 @@ fn bench_16_bits_filter_1(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(1); @@ -80,7 +80,7 @@ fn bench_8_bits_filter_1(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(1); @@ -90,7 +90,7 @@ fn bench_4_bits_filter_1(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(1); @@ -100,7 +100,7 @@ fn bench_2_bits_filter_1(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(1); @@ -110,7 +110,7 @@ fn bench_1_bits_filter_1(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(2); @@ -120,7 +120,7 @@ fn bench_16_bits_filter_2(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(2); @@ -130,7 +130,7 @@ fn bench_8_bits_filter_2(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(2); @@ -140,7 +140,7 @@ fn bench_4_bits_filter_2(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(2); @@ -150,7 +150,7 @@ fn bench_2_bits_filter_2(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(2); @@ -160,7 +160,7 @@ fn bench_1_bits_filter_2(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(3); @@ -170,7 +170,7 @@ fn bench_16_bits_filter_3(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(3); @@ -180,7 +180,7 @@ fn bench_8_bits_filter_3(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(3); @@ -190,7 +190,7 @@ fn bench_4_bits_filter_3(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(3); @@ -200,7 +200,7 @@ fn bench_2_bits_filter_3(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(3); @@ -210,7 +210,7 @@ fn bench_1_bits_filter_3(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(4); @@ -220,7 +220,7 @@ fn bench_16_bits_filter_4(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(4); @@ -230,7 +230,7 @@ fn bench_8_bits_filter_4(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(4); @@ -240,7 +240,7 @@ fn bench_4_bits_filter_4(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(4); @@ -250,7 +250,7 @@ fn bench_2_bits_filter_4(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(4); @@ -260,7 +260,7 @@ fn bench_1_bits_filter_4(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(5); @@ -270,7 +270,7 @@ fn bench_16_bits_filter_5(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(5); @@ -280,7 +280,7 @@ fn bench_8_bits_filter_5(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(5); @@ -290,7 +290,7 @@ fn bench_4_bits_filter_5(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(5); @@ -300,7 +300,7 @@ fn bench_2_bits_filter_5(b: &mut Bencher) { #[bench] fn bench_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 = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { png.filter_image(5); diff --git a/benches/interlacing.rs b/benches/interlacing.rs index 2c6b7f71..886b6efb 100644 --- a/benches/interlacing.rs +++ b/benches/interlacing.rs @@ -10,7 +10,7 @@ use std::path::PathBuf; #[bench] fn bench_interlace_16_bits(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -21,7 +21,7 @@ fn bench_interlace_16_bits(b: &mut Bencher) { #[bench] fn bench_interlace_8_bits(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -32,7 +32,7 @@ fn bench_interlace_8_bits(b: &mut Bencher) { #[bench] fn bench_interlace_4_bits(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_4.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -43,7 +43,7 @@ fn bench_interlace_4_bits(b: &mut Bencher) { #[bench] fn bench_interlace_2_bits(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_2_should_be_palette_2.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -54,7 +54,7 @@ fn bench_interlace_2_bits(b: &mut Bencher) { #[bench] fn bench_interlace_1_bits(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_1_should_be_palette_1.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -65,7 +65,7 @@ fn bench_interlace_1_bits(b: &mut Bencher) { #[bench] fn bench_deinterlace_16_bits(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/interlaced_rgb_16_should_be_rgb_16.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -76,7 +76,7 @@ fn bench_deinterlace_16_bits(b: &mut Bencher) { #[bench] fn bench_deinterlace_8_bits(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/interlaced_rgb_8_should_be_rgb_8.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -87,7 +87,7 @@ fn bench_deinterlace_8_bits(b: &mut Bencher) { #[bench] fn bench_deinterlace_4_bits(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/interlaced_palette_4_should_be_palette_4.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -98,7 +98,7 @@ fn bench_deinterlace_4_bits(b: &mut Bencher) { #[bench] fn bench_deinterlace_2_bits(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/interlaced_palette_2_should_be_palette_2.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -109,7 +109,7 @@ fn bench_deinterlace_2_bits(b: &mut Bencher) { #[bench] fn bench_deinterlace_1_bits(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/interlaced_palette_1_should_be_palette_1.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); diff --git a/benches/reductions.rs b/benches/reductions.rs index 4db63e9d..4114da7e 100644 --- a/benches/reductions.rs +++ b/benches/reductions.rs @@ -10,7 +10,7 @@ use std::path::PathBuf; #[bench] fn bench_16_to_8_bits(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_8.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -21,7 +21,7 @@ fn bench_16_to_8_bits(b: &mut Bencher) { #[bench] fn bench_8_to_4_bits(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_8_should_be_palette_4.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -32,7 +32,7 @@ fn bench_8_to_4_bits(b: &mut Bencher) { #[bench] fn bench_8_to_2_bits(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_8_should_be_palette_2.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -43,7 +43,7 @@ fn bench_8_to_2_bits(b: &mut Bencher) { #[bench] fn bench_8_to_1_bits(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_8_should_be_palette_1.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -54,7 +54,7 @@ fn bench_8_to_1_bits(b: &mut Bencher) { #[bench] fn bench_4_to_2_bits(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_2.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -65,7 +65,7 @@ fn bench_4_to_2_bits(b: &mut Bencher) { #[bench] fn bench_4_to_1_bits(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_1.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -76,7 +76,7 @@ fn bench_4_to_1_bits(b: &mut Bencher) { #[bench] fn bench_2_to_1_bits(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_2_should_be_palette_1.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -87,7 +87,7 @@ fn bench_2_to_1_bits(b: &mut Bencher) { #[bench] fn bench_rgba_to_rgb_16(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgba_16_should_be_rgb_16.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -98,7 +98,7 @@ fn bench_rgba_to_rgb_16(b: &mut Bencher) { #[bench] fn bench_rgba_to_rgb_8(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgba_8_should_be_rgb_8.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -109,7 +109,7 @@ fn bench_rgba_to_rgb_8(b: &mut Bencher) { #[bench] fn bench_rgba_to_grayscale_alpha_16(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgba_16_should_be_grayscale_alpha_16.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -120,7 +120,7 @@ fn bench_rgba_to_grayscale_alpha_16(b: &mut Bencher) { #[bench] fn bench_rgba_to_grayscale_alpha_8(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgba_8_should_be_grayscale_alpha_8.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -131,7 +131,7 @@ fn bench_rgba_to_grayscale_alpha_8(b: &mut Bencher) { #[bench] fn bench_rgba_to_grayscale_16(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgba_16_should_be_grayscale_16.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -142,7 +142,7 @@ fn bench_rgba_to_grayscale_16(b: &mut Bencher) { #[bench] fn bench_rgba_to_grayscale_8(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgba_8_should_be_grayscale_8.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -153,7 +153,7 @@ fn bench_rgba_to_grayscale_8(b: &mut Bencher) { #[bench] fn bench_rgb_to_grayscale_16(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_grayscale_16.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -164,7 +164,7 @@ fn bench_rgb_to_grayscale_16(b: &mut Bencher) { #[bench] fn bench_rgb_to_grayscale_8(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_grayscale_8.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -175,7 +175,7 @@ fn bench_rgb_to_grayscale_8(b: &mut Bencher) { #[bench] fn bench_rgba_to_palette_8(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgba_8_should_be_palette_8.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -186,7 +186,7 @@ fn bench_rgba_to_palette_8(b: &mut Bencher) { #[bench] fn bench_rgb_to_palette_8(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_palette_8.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -197,7 +197,7 @@ fn bench_rgb_to_palette_8(b: &mut Bencher) { #[bench] fn bench_palette_duplicate_reduction(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_should_be_reduced_with_dupes.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -208,7 +208,7 @@ fn bench_palette_duplicate_reduction(b: &mut Bencher) { #[bench] fn bench_palette_unused_reduction(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_should_be_reduced_with_unused.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone(); @@ -219,7 +219,7 @@ fn bench_palette_unused_reduction(b: &mut Bencher) { #[bench] fn bench_palette_full_reduction(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/palette_should_be_reduced_with_both.png")); - let png = png::PngData::new(&input).unwrap(); + let png = png::PngData::new(&input, false).unwrap(); b.iter(|| { let mut safe_png = png.clone();