danvics/oxipng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Keep fcTL after PLTE

Browse source
This commit is contained in:
Andrew 2024-06-20 09:58:50 +12:00
parent 90ceef9796
commit 1737b8f6d7
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/png/mod.rs
View file

@ -186,9 +186,11 @@ impl PngData {
// Ancillary chunks - split into those that come before IDAT and those that come after // Ancillary chunks - split into those that come before IDAT and those that come after
let mut aux_split = self.aux_chunks.split(|c| &c.name == b"IDAT"); let mut aux_split = self.aux_chunks.split(|c| &c.name == b"IDAT");
let aux_pre = aux_split.next().unwrap(); let aux_pre = aux_split.next().unwrap();
// Many chunks need to be before PLTE, so write all except those that explicitly need to be after
// Note: fcTL does not strictly need to be after PLTE but some software may expect it
for chunk in aux_pre for chunk in aux_pre
.iter() .iter()
.filter(|c| !(&c.name == b"bKGD" || &c.name == b"hIST" || &c.name == b"tRNS")) .filter(|c| !matches!(&c.name, b"bKGD" | b"hIST" | b"tRNS" | b"fcTL"))
{ {
write_png_block(&chunk.name, &chunk.data, &mut output); write_png_block(&chunk.name, &chunk.data, &mut output);
} }
@ -223,7 +225,7 @@ impl PngData {
// Special ancillary chunks that need to come after PLTE but before IDAT // Special ancillary chunks that need to come after PLTE but before IDAT
for chunk in aux_pre for chunk in aux_pre
.iter() .iter()
.filter(|c| &c.name == b"bKGD" || &c.name == b"hIST" || &c.name == b"tRNS") .filter(|c| matches!(&c.name, b"bKGD" | b"hIST" | b"tRNS" | b"fcTL"))
{ {
write_png_block(&chunk.name, &chunk.data, &mut output); write_png_block(&chunk.name, &chunk.data, &mut output);
} }