summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2011-03-25 12:50:41 (GMT)
committeraavit <qt-info@nokia.com>2011-09-20 09:20:53 (GMT)
commitfa717293080c9d00b02028bebece1935aef6e093 (patch)
tree9d87efbfa217d3c898dcfa88842f7c0e93e54281 /src
parentb62dc3277c4d41cc99d37c457e3a55842879e0b1 (diff)
downloadQt-fa717293080c9d00b02028bebece1935aef6e093.zip
Qt-fa717293080c9d00b02028bebece1935aef6e093.tar.gz
Qt-fa717293080c9d00b02028bebece1935aef6e093.tar.bz2
Avoid runtime warning about interlace handling from libpng 1.5
Task-number: QTBUG-13298, QTBUG-21408 (cherry picked from commit c8851ce8e109fb6b403ae80036d9f319f1b69d7a)
Diffstat (limited to 'src')
-rw-r--r--src/gui/image/qpnghandler.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
index 7f5cbe8..c0cebf9 100644
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
@@ -217,6 +217,7 @@ void setup_qt(QImage& image, png_structp png_ptr, png_infop info_ptr, float scre
png_colorp palette = 0;
int num_palette;
png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, 0, 0, 0);
+ png_set_interlace_handling(png_ptr);
if (color_type == PNG_COLOR_TYPE_GRAY) {
// Black & White or 8-bit grayscale