diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-02-08 14:27:19 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-02-08 14:27:19 +0000 |
| commit | 26ebdeff75d9f0f7b1ca2f82c35d7eaa013c0982 (patch) | |
| tree | 88626bb5c88436b0e206907f15224bb035481f6b /src/gui/image/qpnghandler.cpp | |
| parent | 30178a22ffde5d216a350910668df0d906aced3b (diff) | |
| parent | fbfacd33be482fa3cf0aa5cffaf7006d538a2f92 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13
Diffstat (limited to 'src/gui/image/qpnghandler.cpp')
| -rw-r--r-- | src/gui/image/qpnghandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp index 3655c39326..1a5e7718eb 100644 --- a/src/gui/image/qpnghandler.cpp +++ b/src/gui/image/qpnghandler.cpp @@ -233,8 +233,8 @@ void setup_qt(QImage& image, png_structp png_ptr, png_infop info_ptr, QSize scal png_uint_32 width; png_uint_32 height; - int bit_depth; - int color_type; + int bit_depth = 0; + int color_type = 0; png_bytep trans_alpha = 0; png_color_16p trans_color_p = 0; int num_trans; @@ -690,7 +690,7 @@ QImage::Format QPngHandlerPrivate::readImageFormat() { QImage::Format format = QImage::Format_Invalid; png_uint_32 width, height; - int bit_depth, color_type; + int bit_depth = 0, color_type = 0; png_colorp palette; int num_palette; png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, 0, 0, 0); |