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

fixed compilation of image test units when wxUSE_PALETTE is set to 0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2011-01-05 11:37:52 +00:00
parent 13830d6ff8
commit 5d875c119e
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/image/image.cpp
View File

@@ -980,6 +980,7 @@ void ImageTestCase::CompareSavedImage()
wxImage expected8 = expected24.ConvertToGreyscale(); wxImage expected8 = expected24.ConvertToGreyscale();
numColours = expected8.CountColours(); numColours = expected8.CountColours();
#if wxUSE_PALETTE
unsigned char greys[256]; unsigned char greys[256];
for (i = 0; i < 256; ++i) for (i = 0; i < 256; ++i)
{ {
@@ -987,6 +988,8 @@ void ImageTestCase::CompareSavedImage()
} }
wxPalette palette(256, greys, greys, greys); wxPalette palette(256, greys, greys, greys);
expected8.SetPalette(palette); expected8.SetPalette(palette);
#endif // #if wxUSE_PALETTE
expected8.SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_8BPP_PALETTE); expected8.SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_8BPP_PALETTE);
// Create an image with alpha based on the loaded image // Create an image with alpha based on the loaded image
@@ -1019,7 +1022,9 @@ void ImageTestCase::CompareSavedImage()
expected8.LoadFile("horse.gif"); expected8.LoadFile("horse.gif");
CPPUNIT_ASSERT( expected8.IsOk() ); CPPUNIT_ASSERT( expected8.IsOk() );
#if wxUSE_PALETTE
CPPUNIT_ASSERT( expected8.HasPalette() ); CPPUNIT_ASSERT( expected8.HasPalette() );
#endif // #if wxUSE_PALETTE
expected8.SetAlpha(); expected8.SetAlpha();