add png_decode comments

This commit is contained in:
nworbnhoj 2022-08-09 06:18:49 +10:00
parent 76bb796610
commit d96faec4eb
2 changed files with 20 additions and 4 deletions

15
Cargo.lock generated
View file

@ -1209,7 +1209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
dependencies = [
"crc32fast",
"miniz_oxide",
"miniz_oxide 0.5.1",
]
[[package]]
@ -1387,6 +1387,7 @@ dependencies = [
"locales",
"log",
"log-server",
"miniz_oxide 0.4.4",
"num-derive",
"num-traits",
"qrcode",
@ -2049,6 +2050,16 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
dependencies = [
"adler",
"autocfg",
]
[[package]]
name = "miniz_oxide"
version = "0.5.1"
@ -2477,7 +2488,7 @@ dependencies = [
"bitflags",
"crc32fast",
"deflate",
"miniz_oxide",
"miniz_oxide 0.5.1",
]
[[package]]

View file

@ -219,6 +219,7 @@ impl<R: Read> DecodePng<R> {
// png filter specification calls for initial prior_line = [0u8]
// see: https://www.w3.org/TR/PNG/#9Filters
// but [0u8] results in distortion???????
// TODO fix this properly (probably a byte overflow or bad cast)
self.prior_line = vec![125u8; self.bytes_per_line];
self.prior_px = vec![0u8; self.bytes_per_pixel];
}
@ -425,7 +426,7 @@ impl<R: Read> DecodePng<R> {
self.inflated_index += 1;
if filter_type <= 4 {
log::trace!(
"png decode prior_line {} filter type = {}",
"png decode line {} filter type = {}",
self.byte_index / self.bytes_per_line,
filter_type
);
@ -440,6 +441,7 @@ impl<R: Read> DecodePng<R> {
// Get an inflated byte from the png idat
// Note: this fn() updates inflated_index, byte_index, line_index & filter_type
// a scanline of rgb begins with a filterbyte FRGBRGBRGBRGB...
fn get_inflated_byte(&mut self) -> Option<u8> {
match self.inflated_length() {
0 => None,
@ -462,6 +464,9 @@ impl<R: Read> DecodePng<R> {
}
// in the notation from https://www.w3.org/TR/PNG/#9Filters
// note that a & c relate to the equivalent byte in the prior pixel
// prior_line R G B R G B c G B b G B R G B
// current_line R G B R G B a G B x
fn unfilter(&mut self) -> Option<u8> {
let filter = self.filter_type;
let index = self.line_index;
@ -497,7 +502,7 @@ impl<R: Read> DecodePng<R> {
// in the notation from https://www.w3.org/TR/PNG/#9Filters
fn average(a: u8, b: u8) -> u8 {
((a as i16 + b as i16) >> 1) as u8
((a as u16 + b as u16) >> 1) as u8
}
// in the notation from https://www.w3.org/TR/PNG/#9Filters