diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-01 17:46:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-01 17:46:58 +0200 |
| commit | fcfd31c9fdd84b234cb9e42b97be62ec18389b61 (patch) | |
| tree | cbaa212790b49e024dae18ecbcead3bbf16a18cf /src/gui/image | |
| parent | 5b739a5b8cfbbedd9265b192d08b346d9b265590 (diff) | |
| parent | 0c5fbd397ceda4d9f0046f1204b5e49229d04312 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
qmake/generators/mac/pbuilder_pbx.cpp
src/corelib/global/qglobal.h
Change-Id: I2c0f7544bf194f2d0f59218fd583c822901487b0
Diffstat (limited to 'src/gui/image')
| -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 3c88d2e9c1..7fbd24787e 100644 --- a/src/gui/image/qpnghandler.cpp +++ b/src/gui/image/qpnghandler.cpp @@ -676,16 +676,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) |