Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep actual number of allocated lines in numLines

Browse Source
This commit is contained in:
pavel-t
2018-07-23 09:21:40 +03:00
parent 58f0fd65fe
commit 5994248648
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/imagpng.cpp
View File

@@ -118,15 +118,16 @@ struct wxPNGImageData
bool Alloc(png_uint_32 width, png_uint_32 height) bool Alloc(png_uint_32 width, png_uint_32 height)
{ {
lines = (unsigned char **)calloc(height, sizeof(unsigned char *)); lines = (unsigned char **)malloc(height * sizeof(unsigned char *));
if ( !lines ) if ( !lines )
return false; return false;
numLines = height; for ( png_uint_32 n = 0; n < height; n++ )
for ( unsigned int n = 0; n < numLines; n++ )
{ {
lines[n] = (unsigned char *)malloc( (size_t)(width * 4)); lines[n] = (unsigned char *)malloc( (size_t)(width * 4));
if ( !lines[n] ) if ( lines[n] )
++numLines;
else
return false; return false;
} }
@@ -365,8 +366,6 @@ wxPNGImageData::DoLoadPNGFile(wxImage* image, wxPNGInfoStruct& wxinfo)
if (!image->IsOk()) if (!image->IsOk())
return; return;
// initialize all line pointers to NULL to ensure that they can be safely
// free()d if an error occurs before all of them could be allocated
if ( !Alloc(width, height) ) if ( !Alloc(width, height) )
return; return;