X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15f345aad37f2f499f5e631d86238325bf232e36..c29c95fe24973b94fd724db767193171ca7c513d:/tests/image/image.cpp?ds=sidebyside diff --git a/tests/image/image.cpp b/tests/image/image.cpp index 958dd922a7..6b98ad4f3c 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; @@ -71,9 +72,11 @@ private: CPPUNIT_TEST( SizeImage ); CPPUNIT_TEST( CompareLoadedImage ); CPPUNIT_TEST( CompareSavedImage ); + CPPUNIT_TEST( SavePNG ); CPPUNIT_TEST( SaveAnimatedGIF ); CPPUNIT_TEST( ReadCorruptedTGA ); CPPUNIT_TEST( GIFComment ); + CPPUNIT_TEST( DibPadding ); CPPUNIT_TEST_SUITE_END(); void LoadFromSocketStream(); @@ -82,9 +85,11 @@ private: void SizeImage(); void CompareLoadedImage(); void CompareSavedImage(); + void SavePNG(); void SaveAnimatedGIF(); void ReadCorruptedTGA(); void GIFComment(); + void DibPadding(); DECLARE_NO_COPY_CLASS(ImageTestCase) }; @@ -828,12 +833,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 ); } } @@ -846,8 +849,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 @@ -963,12 +960,11 @@ 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 ); } @@ -1023,77 +1019,78 @@ void ImageTestCase::CompareSavedImage() CompareImage(*handler, expected24); CompareImage(*handler, expected32, wxIMAGE_HAVE_ALPHA); } +} +void ImageTestCase::SavePNG() +{ + wxImage expected24("horse.png"); + CPPUNIT_ASSERT( expected24.IsOk() ); +#if wxUSE_PALETTE + CPPUNIT_ASSERT( !expected24.HasPalette() ); +#endif // #if wxUSE_PALETTE - expected8.LoadFile("horse.gif"); - CPPUNIT_ASSERT( expected8.IsOk() ); + wxImage expected8 = expected24.ConvertToGreyscale(); + + /* + horse.png converted to greyscale should be saved without a palette. + */ + CompareImage(*wxImage::FindHandler(wxBITMAP_TYPE_PNG), expected8); + + /* + But if we explicitly ask for trying to save with a palette, it should work. + */ + expected8.SetOption(wxIMAGE_OPTION_PNG_FORMAT, wxPNG_TYPE_PALETTE); + + CompareImage(*wxImage::FindHandler(wxBITMAP_TYPE_PNG), + expected8, wxIMAGE_HAVE_PALETTE); + + + CPPUNIT_ASSERT( expected8.LoadFile("horse.gif") ); #if wxUSE_PALETTE CPPUNIT_ASSERT( expected8.HasPalette() ); #endif // #if wxUSE_PALETTE + CompareImage(*wxImage::FindHandler(wxBITMAP_TYPE_PNG), + expected8, wxIMAGE_HAVE_PALETTE); + + /* + Add alpha to the image in such a way that there will still be a maximum + of 256 unique RGBA combinations. This should result in a saved + PNG image still being palettised and having alpha. + */ expected8.SetAlpha(); - width = expected8.GetWidth(); - height = expected8.GetHeight(); + int x, y; + const int width = expected8.GetWidth(); + const int height = expected8.GetHeight(); for (y = 0; y < height; ++y) { for (x = 0; x < width; ++x) { - expected8.SetAlpha(x, y, (x*y) & wxIMAGE_ALPHA_OPAQUE); + expected8.SetAlpha(x, y, expected8.GetRed(x, y)); } } - /* - Explicitly make known we want a palettised PNG. If we don't then this - particular image gets saved as a true colour image because there's an - alpha channel present and the PNG saver prefers to keep the alpha over - saving as a palettised image that has alpha converted to a mask. - */ - expected8.SetOption(wxIMAGE_OPTION_PNG_FORMAT, wxPNG_TYPE_PALETTE); - - /* - The image contains 256 indexed colours and needs another palette entry - for storing the transparency index. This results in wanting 257 palette - entries but that amount is not supported by PNG, as such this image - should not contain a palette (but still have alpha) and be stored as a - true colour image instead. - */ CompareImage(*wxImage::FindHandler(wxBITMAP_TYPE_PNG), - expected8, wxIMAGE_HAVE_ALPHA); + expected8, wxIMAGE_HAVE_ALPHA|wxIMAGE_HAVE_PALETTE); -#if wxUSE_PALETTE /* - Now do the same test again but remove one (random) palette entry. This - should result in saving the PNG with a palette. + Now change the alpha of the first pixel so that we can't save palettised + anymore because there will be 256+1 entries which is beyond PNGs limit + of 256 entries. */ - unsigned char red[256], green[256], blue[256]; - const wxPalette& pal = expected8.GetPalette(); - const int paletteCount = pal.GetColoursCount(); - for (i = 0; i < paletteCount; ++i) - { - expected8.GetPalette().GetRGB(i, &red[i], &green[i], &blue[i]); - } - wxPalette newPal(paletteCount - 1, red, green, blue); - expected8.Replace( - red[paletteCount-1], green[paletteCount-1], blue[paletteCount-1], - red[paletteCount-2], green[paletteCount-2], blue[paletteCount-2]); + expected8.SetAlpha(0, 0, 1); - expected8.SetPalette(newPal); - - wxImage ref8 = expected8; + CompareImage(*wxImage::FindHandler(wxBITMAP_TYPE_PNG), + expected8, wxIMAGE_HAVE_ALPHA); /* - Convert the alpha channel to a mask like the PNG saver does. Also convert - the colour used for transparency from 1,0,0 to 2,0,0. The latter gets - done by the PNG loader in search of an unused colour to use for - transparency (this should be fixed). + Even if we explicitly ask for saving palettised it should not be done. */ - ref8.ConvertAlphaToMask(); - ref8.Replace(1, 0, 0, 2, 0, 0); - + expected8.SetOption(wxIMAGE_OPTION_PNG_FORMAT, wxPNG_TYPE_PALETTE); CompareImage(*wxImage::FindHandler(wxBITMAP_TYPE_PNG), - expected8, wxIMAGE_HAVE_PALETTE, &ref8); -#endif + expected8, wxIMAGE_HAVE_ALPHA); + } void ImageTestCase::SaveAnimatedGIF() @@ -1127,11 +1124,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 @@ -1248,6 +1245,23 @@ 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) ); +} + #endif //wxUSE_IMAGE