diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-29 09:59:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-29 10:00:01 +0200 |
| commit | 2670bdeee4b610be719caed841882babe7541ec9 (patch) | |
| tree | f490d43df0be0d4802edf8873a60ab2a7579e33d /src/gui | |
| parent | 18be63de2a5588ea6ac4b9ffe8de176aabe8bd83 (diff) | |
| parent | e3983c87280ade48b243d9c60bed639713851be9 (diff) | |
Merge remote-tracking branch 'origin/5.4.2' into 5.4
Change-Id: Ied2a227a25859163a924c7b5717492a1f974c5ca
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qpnghandler.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp index 17a0dd3eb9..304ab0cf3e 100644 --- a/src/gui/image/qpnghandler.cpp +++ b/src/gui/image/qpnghandler.cpp @@ -674,16 +674,9 @@ QImage::Format QPngHandlerPrivate::readImageFormat() && num_palette <= 256) { // 1-bit and 8-bit color - if (bit_depth != 1) - png_set_packing(png_ptr); - png_read_update_info(png_ptr, info_ptr); - png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, 0, 0, 0); format = bit_depth == 1 ? QImage::Format_Mono : QImage::Format_Indexed8; } else { // 32-bit - if (bit_depth == 16) - png_set_strip_16(png_ptr); - format = QImage::Format_ARGB32; // Only add filler if no alpha, or we can get 5 channel data. if (!(color_type & PNG_COLOR_MASK_ALPHA) |