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

Don't allocate colour tables if palletes are not in use

Browse Source
This commit is contained in:
Artur Wieczorek
2019-12-28 23:32:34 +01:00
parent a5934f33e2
commit c6e188610d
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/imagbmp.cpp
View File

@@ -586,10 +586,12 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
// Reading the palette, if it exists: // Reading the palette, if it exists:
if ( bpp < 16 && ncolors != 0 ) if ( bpp < 16 && ncolors != 0 )
{ {
#if wxUSE_PALETTE
wxScopedArray<unsigned char> wxScopedArray<unsigned char>
r(ncolors), r(ncolors),
g(ncolors), g(ncolors),
b(ncolors); b(ncolors);
#endif // wxUSE_PALETTE
for (int j = 0; j < ncolors; j++) for (int j = 0; j < ncolors; j++)
{ {
if (hasPalette) if (hasPalette)
@@ -600,18 +602,19 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
cmap[j].b = bbuf[0]; cmap[j].b = bbuf[0];
cmap[j].g = bbuf[1]; cmap[j].g = bbuf[1];
cmap[j].r = bbuf[2]; cmap[j].r = bbuf[2];
r[j] = cmap[j].r;
g[j] = cmap[j].g;
b[j] = cmap[j].b;
} }
else else
{ {
//used in reading .ico file mask //used in reading .ico file mask
r[j] = cmap[j].r = cmap[j].r =
g[j] = cmap[j].g = cmap[j].g =
b[j] = cmap[j].b = ( j ? 255 : 0 ); cmap[j].b = ( j ? 255 : 0 );
} }
#if wxUSE_PALETTE
r[j] = cmap[j].r;
g[j] = cmap[j].g;
b[j] = cmap[j].b;
#endif // wxUSE_PALETTE
} }
#if wxUSE_PALETTE #if wxUSE_PALETTE