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

Fix comparing wxImages in tests

Browse Source 
Iterate through pixels instead of individual RGB components to report
proper coordinates of found mismatch.
This commit is contained in:
Artur Wieczorek
2021-02-05 23:03:59 +01:00
parent 49fcd34335
commit c8a47a4313
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/testimage.h
View File

@@ -50,27 +50,30 @@ public:
const unsigned char* d1 = m_image.GetData(); const unsigned char* d1 = m_image.GetData();
const unsigned char* d2 = other.GetData(); const unsigned char* d2 = other.GetData();
for ( int x = 0; x < m_image.GetWidth(); ++x ) for ( int y = 0; y < m_image.GetHeight(); ++y )
{ {
for ( int y = 0; y < m_image.GetHeight(); ++y ) for ( int x = 0; x < m_image.GetWidth(); ++x )
{ {
const unsigned char diff = *d1 > * d2 ? *d1 - *d2 : *d2 - *d1; for ( int i = 0; i < 3; i++ )
if (diff > m_tolerance)
{ {
m_diffDesc.Printf const unsigned char diff = d1[i] > d2[i] ? d1[i] - d2[i] : d2[i] - d1[i];
( if ( diff > m_tolerance )
"first mismatch is at (%d, %d) which " {
"has value 0x%06x instead of the " m_diffDesc.Printf
"expected 0x%06x", (
x, y, *d2, *d1 "first mismatch is at (%d, %d) which "
); "has value 0x%02x%02x%02x instead of the "
"expected 0x%02x%02x%02x",
x, y, d2[0], d2[1], d2[2], d1[0], d1[1], d1[2]
);
// Don't show all mismatches, there may be too many of them. // Don't show all mismatches, there may be too many of them.
return false; return false;
}
} }
++d1; d1 += 3;
++d2; d2 += 3;
} }
} }