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

Fix build with wxUSE_LIBTIFF==0

Browse Source
This commit is contained in:
Artur Wieczorek
2019-09-19 00:39:59 +02:00
parent 7f65e654ee
commit de5f8c69e5
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/image/image.cpp
View File

@@ -72,7 +72,9 @@ private:
CPPUNIT_TEST( CompareLoadedImage ); CPPUNIT_TEST( CompareLoadedImage );
CPPUNIT_TEST( CompareSavedImage ); CPPUNIT_TEST( CompareSavedImage );
CPPUNIT_TEST( SavePNG ); CPPUNIT_TEST( SavePNG );
#if wxUSE_LIBTIFF
CPPUNIT_TEST( SaveTIFF ); CPPUNIT_TEST( SaveTIFF );
#endif // wxUSE_LIBTIFF
CPPUNIT_TEST( ReadCorruptedTGA ); CPPUNIT_TEST( ReadCorruptedTGA );
#if wxUSE_GIF #if wxUSE_GIF
CPPUNIT_TEST( SaveAnimatedGIF ); CPPUNIT_TEST( SaveAnimatedGIF );
@@ -90,7 +92,9 @@ private:
void CompareLoadedImage(); void CompareLoadedImage();
void CompareSavedImage(); void CompareSavedImage();
void SavePNG(); void SavePNG();
#if wxUSE_LIBTIFF
void SaveTIFF(); void SaveTIFF();
#endif // wxUSE_LIBTIFF
void ReadCorruptedTGA(); void ReadCorruptedTGA();
#if wxUSE_GIF #if wxUSE_GIF
void SaveAnimatedGIF(); void SaveAnimatedGIF();
@@ -124,7 +128,9 @@ ImageTestCase::ImageTestCase()
wxImage::AddHandler(new wxPCXHandler); wxImage::AddHandler(new wxPCXHandler);
wxImage::AddHandler(new wxPNMHandler); wxImage::AddHandler(new wxPNMHandler);
wxImage::AddHandler(new wxTGAHandler); wxImage::AddHandler(new wxTGAHandler);
#if wxUSE_LIBTIFF
wxImage::AddHandler(new wxTIFFHandler); wxImage::AddHandler(new wxTIFFHandler);
#endif // wxUSE_LIBTIFF
} }
ImageTestCase::~ImageTestCase() ImageTestCase::~ImageTestCase()
@@ -1084,6 +1090,7 @@ void ImageTestCase::SavePNG()
} }
#if wxUSE_LIBTIFF
static void TestTIFFImage(const wxString& option, int value, static void TestTIFFImage(const wxString& option, int value,
const wxImage *compareImage = NULL) const wxImage *compareImage = NULL)
{ {
@@ -1139,6 +1146,7 @@ void ImageTestCase::SaveTIFF()
alphaImage.SetOption(wxIMAGE_OPTION_TIFF_BITSPERSAMPLE, 1); alphaImage.SetOption(wxIMAGE_OPTION_TIFF_BITSPERSAMPLE, 1);
TestTIFFImage(wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL, 2, &alphaImage); TestTIFFImage(wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL, 2, &alphaImage);
} }
#endif // wxUSE_LIBTIFF
void ImageTestCase::ReadCorruptedTGA() void ImageTestCase::ReadCorruptedTGA()
{ {