diff --git a/qa/qa_utils/include/qa_utils/wx_utils/unit_test_utils.h b/qa/qa_utils/include/qa_utils/wx_utils/unit_test_utils.h index fbb1b1bf97..64d7cd8a7c 100644 --- a/qa/qa_utils/include/qa_utils/wx_utils/unit_test_utils.h +++ b/qa/qa_utils/include/qa_utils/wx_utils/unit_test_utils.h @@ -142,8 +142,6 @@ std::ostream& boost_test_print_type( std::ostream& os, std::pair const& aP */ std::ostream& boost_test_print_type( std::ostream& os, wxPoint const& aVec ); -std::ostream& boost_test_print_type( std::ostream& os, wxSize const& aSize ); - namespace KI_TEST { diff --git a/qa/qa_utils/wx_utils/unit_test_utils.cpp b/qa/qa_utils/wx_utils/unit_test_utils.cpp index 6ad4ba31c4..f7eee00e94 100644 --- a/qa/qa_utils/wx_utils/unit_test_utils.cpp +++ b/qa/qa_utils/wx_utils/unit_test_utils.cpp @@ -31,13 +31,6 @@ std::ostream& boost_test_print_type( std::ostream& os, wxPoint const& aPt ) } -std::ostream& boost_test_print_type( std::ostream& os, wxSize const& aSize ) -{ - os << "wxSize[ x=\"" << aSize.x << "\" y=\"" << aSize.y << "\" ]"; - return os; -} - - std::string KI_TEST::GetEeschemaTestDataDir() { const char* env = std::getenv( "KICAD_TEST_EESCHEMA_DATA_DIR" ); diff --git a/qa/tests/common/wximage_test_utils.cpp b/qa/tests/common/wximage_test_utils.cpp index 9da1108632..490e3c08bc 100644 --- a/qa/tests/common/wximage_test_utils.cpp +++ b/qa/tests/common/wximage_test_utils.cpp @@ -61,7 +61,10 @@ bool ImagesHaveSamePixels( const wxImage& aImgA, const wxImage& aImgB ) { if( aImgA.GetSize() != aImgB.GetSize() ) { - BOOST_TEST_INFO( "Image sizes differ: " << aImgA.GetSize() << " vs " << aImgB.GetSize() ); + BOOST_TEST_INFO( "Image sizes differ: " << aImgA.GetSize().GetWidth() << "x" + << aImgA.GetSize().GetHeight() << " vs " + << aImgB.GetSize().GetWidth() << "x" + << aImgB.GetSize().GetHeight() ); return false; }