X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8529b0b909e478f0cf43aaafb262d1913d87c824..fde8374482bc51ca0539b2db8f449c62a0d0d7e4:/tests/image/image.cpp diff --git a/tests/image/image.cpp b/tests/image/image.cpp index b1205843a7..f0f8ad2c4c 100644 --- a/tests/image/image.cpp +++ b/tests/image/image.cpp @@ -24,7 +24,6 @@ #endif // WX_PRECOMP #include "wx/anidecod.h" // wxImageArray -#include "wx/image.h" #include "wx/palette.h" #include "wx/url.h" #include "wx/log.h" @@ -32,6 +31,8 @@ #include "wx/zstream.h" #include "wx/wfstream.h" +#include "testimage.h" + struct testData { const char* file; wxBitmapType type; @@ -49,7 +50,7 @@ struct testData { { "horse.pcx", wxBITMAP_TYPE_PCX, 8 }, { "horse.pnm", wxBITMAP_TYPE_PNM, 24 }, { "horse.tga", wxBITMAP_TYPE_TGA, 8 }, - { "horse.tif", wxBITMAP_TYPE_TIF, 8 } + { "horse.tif", wxBITMAP_TYPE_TIFF, 8 } }; @@ -72,9 +73,12 @@ private: CPPUNIT_TEST( CompareLoadedImage ); CPPUNIT_TEST( CompareSavedImage ); CPPUNIT_TEST( SavePNG ); + CPPUNIT_TEST( SaveTIFF ); CPPUNIT_TEST( SaveAnimatedGIF ); CPPUNIT_TEST( ReadCorruptedTGA ); CPPUNIT_TEST( GIFComment ); + CPPUNIT_TEST( DibPadding ); + CPPUNIT_TEST( BMPFlippingAndRLECompression ); CPPUNIT_TEST_SUITE_END(); void LoadFromSocketStream(); @@ -84,9 +88,12 @@ private: void CompareLoadedImage(); void CompareSavedImage(); void SavePNG(); + void SaveTIFF(); void SaveAnimatedGIF(); void ReadCorruptedTGA(); void GIFComment(); + void DibPadding(); + void BMPFlippingAndRLECompression(); DECLARE_NO_COPY_CLASS(ImageTestCase) }; @@ -185,7 +192,7 @@ void ImageTestCase::LoadFromZipStream() case wxBITMAP_TYPE_GIF: case wxBITMAP_TYPE_PCX: case wxBITMAP_TYPE_TGA: - case wxBITMAP_TYPE_TIF: + case wxBITMAP_TYPE_TIFF: continue; // skip testing those wxImageHandlers which cannot // load data from non-seekable streams @@ -830,12 +837,10 @@ void ImageTestCase::SizeImage() CPPUNIT_ASSERT_EQUAL( actual.GetSize().x, expected.GetSize().x ); CPPUNIT_ASSERT_EQUAL( actual.GetSize().y, expected.GetSize().y ); - const unsigned data_len = 3 * expected.GetHeight() * expected.GetWidth(); - - WX_ASSERT_MESSAGE + WX_ASSERT_EQUAL_MESSAGE ( ("Resize test #%u: (%d, %d), (%d, %d)", i, st.w, st.h, st.dx, st.dy), - memcmp(actual.GetData(), expected.GetData(), data_len) == 0 + expected, actual ); } } @@ -848,8 +853,6 @@ void ImageTestCase::CompareLoadedImage() wxImage expected24("horse.png"); CPPUNIT_ASSERT( expected24.IsOk() ); - const size_t dataLen = expected8.GetWidth() * expected8.GetHeight() * 3; - for (size_t i=0; iGetSize() ); unsigned bitsPerPixel = testPalette ? 8 : (testAlpha ? 32 : 24); - WX_ASSERT_MESSAGE + WX_ASSERT_EQUAL_MESSAGE ( ("Compare test '%s (%d-bit)' for saving failed", handler.GetExtension(), bitsPerPixel), - - memcmp(actual.GetData(), expected->GetData(), - expected->GetWidth() * expected->GetHeight() * 3) == 0 + *expected, + actual ); #if wxUSE_PALETTE @@ -965,21 +958,36 @@ void CompareImage(const wxImageHandler& handler, const wxImage& image, return; } - WX_ASSERT_MESSAGE + WX_ASSERT_EQUAL_MESSAGE ( ("Compare alpha test '%s' for saving failed", handler.GetExtension()), - - memcmp(actual.GetAlpha(), expected->GetAlpha(), - expected->GetWidth() * expected->GetHeight()) == 0 + *expected, + actual ); } +static void SetAlpha(wxImage *image) +{ + image->SetAlpha(); + + unsigned char *ptr = image->GetAlpha(); + const int width = image->GetWidth(); + const int height = image->GetHeight(); + for (int y = 0; y < height; ++y) + { + for (int x = 0; x < width; ++x) + { + ptr[y*width + x] = (x*y) & wxIMAGE_ALPHA_OPAQUE; + } + } +} + void ImageTestCase::CompareSavedImage() { // FIXME-VC6: Pre-declare the loop variables for compatibility with // pre-standard compilers such as MSVC6 that don't implement proper scope // for the variables declared in the for loops. - int i, x, y; + int i; wxImage expected24("horse.png"); CPPUNIT_ASSERT( expected24.IsOk() ); @@ -1001,17 +1009,8 @@ void ImageTestCase::CompareSavedImage() // Create an image with alpha based on the loaded image wxImage expected32(expected24); - expected32.SetAlpha(); - int width = expected32.GetWidth(); - int height = expected32.GetHeight(); - for (y = 0; y < height; ++y) - { - for (x = 0; x < width; ++x) - { - expected32.SetAlpha(x, y, (x*y) & wxIMAGE_ALPHA_OPAQUE); - } - } + SetAlpha(&expected32); const wxList& list = wxImage::GetHandlers(); for ( wxList::compatibility_iterator node = list.GetFirst(); @@ -1099,6 +1098,62 @@ void ImageTestCase::SavePNG() } +static void TestTIFFImage(const wxString& option, int value, + const wxImage *compareImage = NULL) +{ + wxImage image; + if (compareImage) + { + image = *compareImage; + } + else + { + (void) image.LoadFile("horse.png"); + } + CPPUNIT_ASSERT( image.IsOk() ); + + wxMemoryOutputStream memOut; + image.SetOption(option, value); + + CPPUNIT_ASSERT(image.SaveFile(memOut, wxBITMAP_TYPE_TIFF)); + + wxMemoryInputStream memIn(memOut); + CPPUNIT_ASSERT(memIn.IsOk()); + + wxImage savedImage(memIn); + CPPUNIT_ASSERT(savedImage.IsOk()); + + WX_ASSERT_EQUAL_MESSAGE(("While checking for option %s", option), + true, savedImage.HasOption(option)); + + WX_ASSERT_EQUAL_MESSAGE(("While testing for %s", option), + value, savedImage.GetOptionInt(option)); + + WX_ASSERT_EQUAL_MESSAGE(("HasAlpha() not equal"), image.HasAlpha(), savedImage.HasAlpha()); +} + +void ImageTestCase::SaveTIFF() +{ + TestTIFFImage(wxIMAGE_OPTION_TIFF_BITSPERSAMPLE, 1); + TestTIFFImage(wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL, 1); + TestTIFFImage(wxIMAGE_OPTION_TIFF_PHOTOMETRIC, 0/*PHOTOMETRIC_MINISWHITE*/); + TestTIFFImage(wxIMAGE_OPTION_TIFF_PHOTOMETRIC, 1/*PHOTOMETRIC_MINISBLACK*/); + + wxImage alphaImage("horse.png"); + CPPUNIT_ASSERT( alphaImage.IsOk() ); + SetAlpha(&alphaImage); + + // RGB with alpha + TestTIFFImage(wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL, 4, &alphaImage); + + // Grey with alpha + TestTIFFImage(wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL, 2, &alphaImage); + + // B/W with alpha + alphaImage.SetOption(wxIMAGE_OPTION_TIFF_BITSPERSAMPLE, 1); + TestTIFFImage(wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL, 2, &alphaImage); +} + void ImageTestCase::SaveAnimatedGIF() { #if wxUSE_PALETTE @@ -1130,11 +1185,11 @@ void ImageTestCase::SaveAnimatedGIF() CPPUNIT_ASSERT( handler.LoadFile(&image, memIn, true, i) ); memIn.SeekI(pos); - WX_ASSERT_MESSAGE + WX_ASSERT_EQUAL_MESSAGE ( ("Compare test for GIF frame number %d failed", i), - memcmp(image.GetData(), images[i].GetData(), - images[i].GetWidth() * images[i].GetHeight() * 3) == 0 + images[i], + image ); } #endif // #if wxUSE_PALETTE @@ -1251,6 +1306,43 @@ void ImageTestCase::GIFComment() } } +void ImageTestCase::DibPadding() +{ + /* + There used to be an error with calculating the DWORD aligned scan line + pitch for a BMP/ICO resulting in buffer overwrites (with at least MSVC9 + Debug this gave a heap corruption assertion when saving the mask of + an ICO). Test for it here. + */ + wxImage image("horse.gif"); + CPPUNIT_ASSERT( image.IsOk() ); + + image = image.Scale(99, 99); + + wxMemoryOutputStream memOut; + CPPUNIT_ASSERT( image.SaveFile(memOut, wxBITMAP_TYPE_ICO) ); +} + +static void CompareBMPImage(const wxString& file1, const wxString& file2) +{ + wxImage image1(file1); + CPPUNIT_ASSERT( image1.IsOk() ); + + wxImage image2(file2); + CPPUNIT_ASSERT( image2.IsOk() ); + + CompareImage(*wxImage::FindHandler(wxBITMAP_TYPE_BMP), image1, 0, &image2); +} + +void ImageTestCase::BMPFlippingAndRLECompression() +{ + CompareBMPImage("image/horse_grey.bmp", "image/horse_grey_flipped.bmp"); + + CompareBMPImage("image/horse_rle8.bmp", "image/horse_grey.bmp"); + CompareBMPImage("image/horse_rle8.bmp", "image/horse_rle8_flipped.bmp"); + + CompareBMPImage("image/horse_rle4.bmp", "image/horse_rle4_flipped.bmp"); +} #endif //wxUSE_IMAGE