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

no real changes, just some cleanup: use wxON_BLOCK_EXIT instead of littering the code with delete[] statements; don't use identifiers starting with underscore

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-03 00:32:12 +00:00
parent 55a35cb0c1
commit ef5571c62a
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/imagbmp.cpp
View File

@@ -33,6 +33,7 @@
#include "wx/filefn.h" #include "wx/filefn.h"
#include "wx/wfstream.h" #include "wx/wfstream.h"
#include "wx/quantize.h" #include "wx/quantize.h"
#include "wx/scopeguard.h"
#include "wx/anidecod.h" #include "wx/anidecod.h"
// For memcpy // For memcpy
@@ -469,10 +470,12 @@ bool wxBMPHandler::SaveDib(wxImage *image,
} }
typedef struct struct BMPPalette
{ {
static void Free(BMPPalette* pal) { delete [] pal; }
unsigned char r, g, b; unsigned char r, g, b;
} _cmap; };
bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
int bpp, int ncolors, int comp, int bpp, int ncolors, int comp,
@@ -488,11 +491,11 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
wxUint16 aWord; wxUint16 aWord;
// allocate space for palette if needed: // allocate space for palette if needed:
_cmap *cmap; BMPPalette *cmap;
if ( bpp < 16 ) if ( bpp < 16 )
{ {
cmap = new _cmap[ncolors]; cmap = new BMPPalette[ncolors];
if ( !cmap ) if ( !cmap )
{ {
if (verbose) if (verbose)
@@ -500,8 +503,12 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
return false; return false;
} }
} }
else else // no palette
{
cmap = NULL; cmap = NULL;
}
wxON_BLOCK_EXIT1(&BMPPalette::Free, cmap);
// destroy existing here instead of: // destroy existing here instead of:
image->Destroy(); image->Destroy();
@@ -513,7 +520,6 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
{ {
if ( verbose ) if ( verbose )
wxLogError( _("BMP: Couldn't allocate memory.") ); wxLogError( _("BMP: Couldn't allocate memory.") );
delete[] cmap;
return false; return false;
} }
@@ -527,7 +533,6 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
{ {
if ( verbose ) if ( verbose )
wxLogError(_("BMP: Couldn't allocate memory.")); wxLogError(_("BMP: Couldn't allocate memory."));
delete[] cmap;
return false; return false;
} }
} }
@@ -879,8 +884,6 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
} }
} }
delete[] cmap;
image->SetMask(false); image->SetMask(false);
const wxStreamError err = stream.GetLastError(); const wxStreamError err = stream.GetLastError();