Skip to content

Commit

Permalink
Hide modules from documentation, and only export structs used in opti…
Browse files Browse the repository at this point in the history
…ons or return types
  • Loading branch information
Josh Holmer committed Jan 10, 2018
1 parent fe9fd95 commit 88f5bb0
Show file tree
Hide file tree
Showing 10 changed files with 148 additions and 94 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
### Version 0.18.4
- Bump dependencies, reduces binary size by a considerable amount
- Hide all modules from documentation, and only export the specific structures that should be public.
Previously there were too many implementation details made public. The modules are still public for the purposes of our integration tests,
but we strongly advice against using undocumented modules. These may become private in the future.

### Version 0.18.3
- Return exit code of 1 if an error occurred while processing a file using the CLI app ([#93](https://github.com/shssoichiro/oxipng/issues/93))

Expand Down
4 changes: 3 additions & 1 deletion benches/deflate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -237,5 +237,7 @@ fn 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, false).unwrap();

b.iter(|| { deflate::inflate(png.idat_data.as_ref()).ok(); });
b.iter(|| {
deflate::inflate(png.idat_data.as_ref()).ok();
});
}
120 changes: 90 additions & 30 deletions benches/filters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,19 @@ 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 = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(0); });
b.iter(|| {
png.filter_image(0);
});
}

#[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 = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(0); });
b.iter(|| {
png.filter_image(0);
});
}

#[bench]
Expand All @@ -30,7 +34,9 @@ fn filters_4_bits_filter_0(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(0); });
b.iter(|| {
png.filter_image(0);
});
}

#[bench]
Expand All @@ -40,7 +46,9 @@ fn filters_2_bits_filter_0(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(0); });
b.iter(|| {
png.filter_image(0);
});
}

#[bench]
Expand All @@ -50,23 +58,29 @@ fn filters_1_bits_filter_0(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(0); });
b.iter(|| {
png.filter_image(0);
});
}

#[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 = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(1); });
b.iter(|| {
png.filter_image(1);
});
}

#[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 = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(1); });
b.iter(|| {
png.filter_image(1);
});
}

#[bench]
Expand All @@ -76,7 +90,9 @@ fn filters_4_bits_filter_1(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(1); });
b.iter(|| {
png.filter_image(1);
});
}

#[bench]
Expand All @@ -86,7 +102,9 @@ fn filters_2_bits_filter_1(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(1); });
b.iter(|| {
png.filter_image(1);
});
}

#[bench]
Expand All @@ -96,23 +114,29 @@ fn filters_1_bits_filter_1(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(1); });
b.iter(|| {
png.filter_image(1);
});
}

#[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 = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(2); });
b.iter(|| {
png.filter_image(2);
});
}

#[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 = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(2); });
b.iter(|| {
png.filter_image(2);
});
}

#[bench]
Expand All @@ -122,7 +146,9 @@ fn filters_4_bits_filter_2(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(2); });
b.iter(|| {
png.filter_image(2);
});
}

#[bench]
Expand All @@ -132,7 +158,9 @@ fn filters_2_bits_filter_2(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(2); });
b.iter(|| {
png.filter_image(2);
});
}

#[bench]
Expand All @@ -142,23 +170,29 @@ fn filters_1_bits_filter_2(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(2); });
b.iter(|| {
png.filter_image(2);
});
}

#[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 = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(3); });
b.iter(|| {
png.filter_image(3);
});
}

#[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 = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(3); });
b.iter(|| {
png.filter_image(3);
});
}

#[bench]
Expand All @@ -168,7 +202,9 @@ fn filters_4_bits_filter_3(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(3); });
b.iter(|| {
png.filter_image(3);
});
}

#[bench]
Expand All @@ -178,7 +214,9 @@ fn filters_2_bits_filter_3(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(3); });
b.iter(|| {
png.filter_image(3);
});
}

#[bench]
Expand All @@ -188,23 +226,29 @@ fn filters_1_bits_filter_3(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(3); });
b.iter(|| {
png.filter_image(3);
});
}

#[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 = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(4); });
b.iter(|| {
png.filter_image(4);
});
}

#[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 = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(4); });
b.iter(|| {
png.filter_image(4);
});
}

#[bench]
Expand All @@ -214,7 +258,9 @@ fn filters_4_bits_filter_4(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(4); });
b.iter(|| {
png.filter_image(4);
});
}

#[bench]
Expand All @@ -224,7 +270,9 @@ fn filters_2_bits_filter_4(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(4); });
b.iter(|| {
png.filter_image(4);
});
}

#[bench]
Expand All @@ -234,23 +282,29 @@ fn filters_1_bits_filter_4(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(4); });
b.iter(|| {
png.filter_image(4);
});
}

#[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 = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(5); });
b.iter(|| {
png.filter_image(5);
});
}

#[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 = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(5); });
b.iter(|| {
png.filter_image(5);
});
}

#[bench]
Expand All @@ -260,7 +314,9 @@ fn filters_4_bits_filter_5(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(5); });
b.iter(|| {
png.filter_image(5);
});
}

#[bench]
Expand All @@ -270,7 +326,9 @@ fn filters_2_bits_filter_5(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(5); });
b.iter(|| {
png.filter_image(5);
});
}

#[bench]
Expand All @@ -280,5 +338,7 @@ fn filters_1_bits_filter_5(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { png.filter_image(5); });
b.iter(|| {
png.filter_image(5);
});
}
20 changes: 15 additions & 5 deletions benches/zopfli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,19 @@ fn zopfli_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, false).unwrap();

b.iter(|| { deflate::zopfli_deflate(png.raw_data.as_ref()).ok(); });
b.iter(|| {
deflate::zopfli_deflate(png.raw_data.as_ref()).ok();
});
}

#[bench]
fn zopfli_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, false).unwrap();

b.iter(|| { deflate::zopfli_deflate(png.raw_data.as_ref()).ok(); });
b.iter(|| {
deflate::zopfli_deflate(png.raw_data.as_ref()).ok();
});
}

#[bench]
Expand All @@ -31,7 +35,9 @@ fn zopfli_4_bits_strategy_0(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { deflate::zopfli_deflate(png.raw_data.as_ref()).ok(); });
b.iter(|| {
deflate::zopfli_deflate(png.raw_data.as_ref()).ok();
});
}

#[bench]
Expand All @@ -41,7 +47,9 @@ fn zopfli_2_bits_strategy_0(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { deflate::zopfli_deflate(png.raw_data.as_ref()).ok(); });
b.iter(|| {
deflate::zopfli_deflate(png.raw_data.as_ref()).ok();
});
}

#[bench]
Expand All @@ -51,5 +59,7 @@ fn zopfli_1_bits_strategy_0(b: &mut Bencher) {
));
let png = png::PngData::new(&input, false).unwrap();

b.iter(|| { deflate::zopfli_deflate(png.raw_data.as_ref()).ok(); });
b.iter(|| {
deflate::zopfli_deflate(png.raw_data.as_ref()).ok();
});
}
Loading

0 comments on commit 88f5bb0

Please sign in to comment.