gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix reading interlaced PNGs

Browse Source 
Either we let libpng handle the transform, or we don't.
But make up your mind!
This commit is contained in:
ISSOtm
2022-04-24 13:20:31 +02:00
committed by Eldred Habert
parent d569c6392c
commit 78e751f022
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gfx/process.cpp
View File

@@ -294,8 +294,7 @@ public:
png_set_packing(png); png_set_packing(png);
} }
// Set interlace handling (MUST be done before `png_read_update_info`) // Do NOT call `png_set_interlace_handling`. We want to expand the rows ourselves.
int nbPasses = png_set_interlace_handling(png);
// Update `info` with the transformations // Update `info` with the transformations
png_read_update_info(png, info); png_read_update_info(png, info);
@@ -323,8 +322,10 @@ public:
} }
} }
} else { } else {
assert(interlaceType == PNG_INTERLACE_ADAM7);
// For interlace to work properly, we must read the image `nbPasses` times // For interlace to work properly, we must read the image `nbPasses` times
for (int pass = 0; pass < nbPasses; ++pass) { for (int pass = 0; pass < PNG_INTERLACE_ADAM7_PASSES; ++pass) {
// The interlacing pass must be skipped if its width or height is reported as zero // The interlacing pass must be skipped if its width or height is reported as zero
if (PNG_PASS_COLS(width, pass) == 0 || PNG_PASS_ROWS(height, pass) == 0) { if (PNG_PASS_COLS(width, pass) == 0 || PNG_PASS_ROWS(height, pass) == 0) {
continue; continue;