X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8529b0b909e478f0cf43aaafb262d1913d87c824..c29c95fe24973b94fd724db767193171ca7c513d:/tests/image/image.cpp diff --git a/tests/image/image.cpp b/tests/image/image.cpp index b1205843a7..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; @@ -75,6 +76,7 @@ private: CPPUNIT_TEST( SaveAnimatedGIF ); CPPUNIT_TEST( ReadCorruptedTGA ); CPPUNIT_TEST( GIFComment ); + CPPUNIT_TEST( DibPadding ); CPPUNIT_TEST_SUITE_END(); void LoadFromSocketStream(); @@ -87,6 +89,7 @@ private: void SaveAnimatedGIF(); void ReadCorruptedTGA(); void GIFComment(); + void DibPadding(); DECLARE_NO_COPY_CLASS(ImageTestCase) }; @@ -830,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 ); } } @@ -848,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 @@ -965,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 ); } @@ -1130,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 @@ -1251,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