[Scummvm-cvs-logs] scummvm master -> 1f11ce6df2491e51c713278b6bfc6464a9aef965

bluegr bluegr at gmail.com
Thu Sep 6 00:37:37 CEST 2012


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1f11ce6df2 PNG: call png_set_interlace_handling() before calling png_read_update_info()


Commit: 1f11ce6df2491e51c713278b6bfc6464a9aef965
    https://github.com/scummvm/scummvm/commit/1f11ce6df2491e51c713278b6bfc6464a9aef965
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-09-05T15:35:58-07:00

Commit Message:
PNG: call png_set_interlace_handling() before calling png_read_update_info()

This matches the documentation, information from the PNG bug tracker and the
behavior of example decoders off the net. It fixes warnings thrown from the PNG
decoder

Changed paths:
    graphics/decoders/png.cpp



diff --git a/graphics/decoders/png.cpp b/graphics/decoders/png.cpp
index bfaab6d..4f917b4 100644
--- a/graphics/decoders/png.cpp
+++ b/graphics/decoders/png.cpp
@@ -191,6 +191,7 @@ bool PNGDecoder::loadStream(Common::SeekableReadStream &stream) {
 	}
 
 	// After the transformations have been registered, the image data is read again.
+	png_set_interlace_handling(pngPtr);
 	png_read_update_info(pngPtr, infoPtr);
 	png_get_IHDR(pngPtr, infoPtr, &w, &h, &bitDepth, &colorType, NULL, NULL, NULL);
 	width = w;






More information about the Scummvm-git-logs mailing list