haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QA: Adjust bitmap test bitmap 

For some reason, older WXs on Linux (e.g. Ubuntu 16.04) would
segfault on loading the 4-tile test image. Change one tile to
a circle to fix this (presumably an old and fixed image library
function).
This commit is contained in:
John Beard 2019-05-23 18:57:02 +01:00
parent 0daf14f9c3
commit 2c55091a74
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
qa/common/test_bitmap_base.cpp
View File

@ -40,17 +40,21 @@
// //
// green, black, // green, black,
// red, blue // red, blue
// ( the black tile is a a circle, otherwise older wx's seem to crash)
static const std::vector<unsigned char> png_data_4tile = { // static const std::vector<unsigned char> png_data_4tile = { //
0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x08, 0x02, 0x00, 0x00, 0x00, 0x4B, 0x6D, 0x29, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, 0x0F, 0xBE,
0xDC, 0x00, 0x00, 0x00, 0x03, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0xDB, 0xE1, 0x4F, 0xE0, 0x8B, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7C, 0x08, 0x64,
0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0E, 0xC4, 0x00, 0x00, 0x0E, 0xC4, 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0E, 0xC4, 0x00, 0x00, 0x0E,
0x01, 0x95, 0x2B, 0x0E, 0x1B, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6F, 0x66, 0xC4, 0x01, 0x95, 0x2B, 0x0E, 0x1B, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6F,
0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2E, 0x69, 0x6E, 0x6B, 0x73, 0x63, 0x61, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2E, 0x69, 0x6E, 0x6B, 0x73, 0x63,
0x70, 0x65, 0x2E, 0x6F, 0x72, 0x67, 0x9B, 0xEE, 0x3C, 0x1A, 0x00, 0x00, 0x00, 0x18, 0x49, 0x44, 0x61, 0x70, 0x65, 0x2E, 0x6F, 0x72, 0x67, 0x9B, 0xEE, 0x3C, 0x1A, 0x00, 0x00, 0x00, 0x40, 0x49,
0x41, 0x54, 0x08, 0x5B, 0x63, 0x60, 0xF8, 0xCF, 0x80, 0x40, 0x28, 0x80, 0x7A, 0x12, 0xA8, 0xE2, 0x44, 0x41, 0x54, 0x18, 0x95, 0xA5, 0xCD, 0x4B, 0x0A, 0xC0, 0x20, 0x14, 0x43, 0xD1, 0x63, 0x77,
0x48, 0x3C, 0xEA, 0x49, 0x00, 0x00, 0xF1, 0xA9, 0x2F, 0xD1, 0xB5, 0xC6, 0x95, 0xD0, 0x00, 0x00, 0xA7, 0xDD, 0xFF, 0x06, 0xD4, 0x7D, 0x3C, 0x07, 0x95, 0x42, 0x3F, 0xE0, 0xC0, 0x84, 0x0C, 0x02,
0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 0xE1, 0x86, 0x78, 0x99, 0x13, 0x1D, 0x0D, 0xC5, 0xCF, 0xA0, 0x21, 0x66, 0xEA, 0x61, 0xA9, 0x2F,
0xA1, 0x4C, 0x4A, 0x45, 0x4E, 0x71, 0xA1, 0x6E, 0xA5, 0x67, 0xB5, 0xBC, 0xD8, 0x1F, 0x0C, 0xA7,
0xFD, 0x23, 0x67, 0x70, 0xDA, 0x89, 0xA2, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE,
0x42, 0x60, 0x82
}; };
///< 4tile is an 8x8 image ///< 4tile is an 8x8 image
@ -173,9 +177,9 @@ BOOST_AUTO_TEST_CASE( BasicImage )
// red, blue // red, blue
const std::vector<TEST_PIXEL_CASE> exp_pixels = { const std::vector<TEST_PIXEL_CASE> exp_pixels = {
{ 1, 1, col_green }, { 1, 1, col_green },
{ 7, 1, col_black }, { 6, 1, col_black },
{ 1, 7, col_red }, { 1, 6, col_red },
{ 7, 7, col_blue }, { 6, 6, col_blue },
}; };
for( const auto& c : exp_pixels ) for( const auto& c : exp_pixels )
@ -200,9 +204,9 @@ BOOST_AUTO_TEST_CASE( RotateImage )
// green, red // green, red
const std::vector<TEST_PIXEL_CASE> exp_pixels = { const std::vector<TEST_PIXEL_CASE> exp_pixels = {
{ 1, 1, col_black }, { 1, 1, col_black },
{ 7, 1, col_blue }, { 6, 1, col_blue },
{ 1, 7, col_green }, { 1, 6, col_green },
{ 7, 7, col_red }, { 6, 6, col_red },
}; };
for( const auto& c : exp_pixels ) for( const auto& c : exp_pixels )
@ -226,9 +230,9 @@ BOOST_AUTO_TEST_CASE( MirrorImage )
// green, black // green, black
const std::vector<TEST_PIXEL_CASE> exp_pixels = { const std::vector<TEST_PIXEL_CASE> exp_pixels = {
{ 1, 1, col_red }, { 1, 1, col_red },
{ 7, 1, col_blue }, { 6, 1, col_blue },
{ 1, 7, col_green }, { 1, 6, col_green },
{ 7, 7, col_black }, { 6, 6, col_black },
}; };
for( const auto& c : exp_pixels ) for( const auto& c : exp_pixels )