Initialize variables to fix valgrind warning in pnghandler.
Conditional jump or move depends on uninitialised value(s) ==7986== at 0x5B838E8: QPngHandlerPrivate::readPngImage(QImage*) (qpnghandler.cpp:617) Change-Id: Ie739ca1665ce600426e2816a6229145d814125cb Reviewed-by: aavit <eirik.aavitsland@digia.com>
This commit is contained in:
parent
b49327145e
commit
0ab3e290c4
@ -591,14 +591,14 @@ bool Q_INTERNAL_WIN_NO_THROW QPngHandlerPrivate::readPngImage(QImage *outImage)
|
||||
if (doScaledRead) {
|
||||
read_image_scaled(outImage, png_ptr, info_ptr, amp, scaledSize);
|
||||
} else {
|
||||
png_uint_32 width;
|
||||
png_uint_32 height;
|
||||
png_int_32 offset_x;
|
||||
png_int_32 offset_y;
|
||||
png_uint_32 width = 0;
|
||||
png_uint_32 height = 0;
|
||||
png_int_32 offset_x = 0;
|
||||
png_int_32 offset_y = 0;
|
||||
|
||||
int bit_depth;
|
||||
int color_type;
|
||||
int unit_type;
|
||||
int bit_depth = 0;
|
||||
int color_type = 0;
|
||||
int unit_type = PNG_OFFSET_PIXEL;
|
||||
png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, 0, 0, 0);
|
||||
png_get_oFFs(png_ptr, info_ptr, &offset_x, &offset_y, &unit_type);
|
||||
uchar *data = outImage->bits();
|
||||
|
Loading…
Reference in New Issue
Block a user