Merge pull request #70 from MichaelMcDonnell/fix-rust-png-bench

Fix Rust PNG benchmark
This commit is contained in:
Nigel Tao authored and GitHub committed 2022-01-18 12:31:29 +11:00
commit adfd2965cc
2 files changed
+7 -6

No files matched your search

+1 -1
View File
@@ -4,5 +4,5 @@ version = "0.0.1"
authors = ["Nigel Tao <nigeltao@golang.org>"]
[dependencies]
png = "*"
png = "0.17"
rustc_version_runtime = "*"
+6 -5
View File
@@ -145,19 +145,20 @@ fn bench(
// decode returns the number of bytes processed.
fn decode(dst0: &mut [u8], dst1: &mut [u8], src: &[u8]) -> u64 {
let decoder = png::Decoder::new(src);
let (info, mut reader) = decoder.read_info().unwrap();
let mut decoder = png::Decoder::new(src);
decoder.set_transformations(png::Transformations::normalize_to_color8());
let mut reader = decoder.read_info().unwrap();
let info = reader.next_frame(dst0).unwrap();
let num_bytes = info.buffer_size() as u64;
reader.next_frame(dst0).unwrap();
if info.color_type == png::ColorType::Grayscale {
// No conversion necessary.
return num_bytes;
} else if info.color_type == png::ColorType::RGB {
} else if info.color_type == png::ColorType::Rgb {
// Convert RGB => BGRA.
let new_size = ((num_bytes / 3) * 4) as usize;
rgb_to_bgra(&dst0[..num_bytes as usize], &mut dst1[..new_size]);
return new_size as u64;
} else if info.color_type == png::ColorType::RGBA {
} else if info.color_type == png::ColorType::Rgba {
// Convert RGBA => BGRA.
for i in 0..((num_bytes / 4) as usize) {
let d = dst0[(4 * i) + 0];