diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-20 09:50:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-20 09:50:55 (GMT) |
| commit | a55e82b3525d6fee5d4e50441c6d268c23d24c40 (patch) | |
| tree | 14455a68e4793a7e93784a0335dbca5846370b9d /src | |
| parent | ff2e670f24f4d1c011e26745dc28e6f7187656b5 (diff) | |
| parent | fa717293080c9d00b02028bebece1935aef6e093 (diff) | |
| download | Qt-a55e82b3525d6fee5d4e50441c6d268c23d24c40.zip Qt-a55e82b3525d6fee5d4e50441c6d268c23d24c40.tar.gz Qt-a55e82b3525d6fee5d4e50441c6d268c23d24c40.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Avoid runtime warning about interlace handling from libpng 1.5
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/image/qpnghandler.cpp | 1 |
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 |