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

Fix build with wxUSE_PALETTE==0

Browse Source
This commit is contained in:
Paul Cornett
2021-03-21 12:16:01 -07:00
parent dc11bb18cf
commit ef5076f852
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/dib.cpp
View File

@@ -638,6 +638,10 @@ wxPalette *wxDIB::CreatePalette() const
bool wxDIB::Create(const wxImage& image, PixelFormat pf, int dstDepth) bool wxDIB::Create(const wxImage& image, PixelFormat pf, int dstDepth)
{ {
wxCHECK_MSG( image.IsOk(), false, wxT("invalid wxImage in wxDIB ctor") ); wxCHECK_MSG( image.IsOk(), false, wxT("invalid wxImage in wxDIB ctor") );
#if !wxUSE_PALETTE
wxCHECK_MSG(dstDepth != 1, false,
"wxImage conversion to monochrome bitmap requires wxUSE_PALETTE");
#endif
const int h = image.GetHeight(); const int h = image.GetHeight();
const int w = image.GetWidth(); const int w = image.GetWidth();
@@ -655,6 +659,7 @@ bool wxDIB::Create(const wxImage& image, PixelFormat pf, int dstDepth)
// if requested, convert wxImage's content to monochrome // if requested, convert wxImage's content to monochrome
wxScopedArray<unsigned char> eightBitData; wxScopedArray<unsigned char> eightBitData;
#if wxUSE_PALETTE
if ( dstDepth == 1 ) if ( dstDepth == 1 )
{ {
wxImage quantized; wxImage quantized;
@@ -695,6 +700,7 @@ bool wxDIB::Create(const wxImage& image, PixelFormat pf, int dstDepth)
return false; return false;
} }
} }
#endif // wxUSE_PALETTE
// DIBs are stored in bottom to top order (see also the comment above in // DIBs are stored in bottom to top order (see also the comment above in
// Create()) so we need to copy bits line by line and starting from the end // Create()) so we need to copy bits line by line and starting from the end