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

Fix recently introduced compilation error in wxUSE_PALETTE==0 build.

Browse Source 
Add missing "#if wxUSE_PALETTE" tests.

Closes #16083.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-03-14 19:22:16 +00:00
parent 371928415a
commit c8a35a6f17
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/imagbmp.cpp
View File

@@ -271,7 +271,9 @@ bool wxBMPHandler::SaveDib(wxImage *image,
} }
} }
#if wxUSE_PALETTE
wxScopedPtr<wxPalette> palette; // entries for quantized images wxScopedPtr<wxPalette> palette; // entries for quantized images
#endif // wxUSE_PALETTE
wxScopedArray<wxUint8> rgbquad; // for the RGBQUAD bytes for the colormap wxScopedArray<wxUint8> rgbquad; // for the RGBQUAD bytes for the colormap
wxScopedPtr<wxImage> q_image; // destination for quantized image wxScopedPtr<wxImage> q_image; // destination for quantized image
@@ -287,10 +289,15 @@ bool wxBMPHandler::SaveDib(wxImage *image,
// I get a delete error using Quantize when desired colors > 236 // I get a delete error using Quantize when desired colors > 236
int quantize = ((palette_size > 236) ? 236 : palette_size); int quantize = ((palette_size > 236) ? 236 : palette_size);
// fill the destination too, it gives much nicer 4bpp images // fill the destination too, it gives much nicer 4bpp images
#if wxUSE_PALETTE
wxPalette* paletteTmp; wxPalette* paletteTmp;
wxQuantize::Quantize( *image, *q_image, &paletteTmp, quantize, 0, wxQuantize::Quantize( *image, *q_image, &paletteTmp, quantize, 0,
wxQUANTIZE_FILL_DESTINATION_IMAGE ); wxQUANTIZE_FILL_DESTINATION_IMAGE );
palette.reset(paletteTmp); palette.reset(paletteTmp);
#else // !wxUSE_PALETTE
wxQuantize::Quantize( *image, *q_image, NULL, quantize, 0,
wxQUANTIZE_FILL_DESTINATION_IMAGE );
#endif // wxUSE_PALETTE/!wxUSE_PALETTE
} }
else else
{ {