patch for the same size on Windows/Linux

diff --git a/src/HYDRO_tests/reference_data/LandCoverMap_Add_2_Objects.png b/src/HYDRO_tests/reference_data/LandCoverMap_Add_2_Objects.png
index f19fb73698cb4fdc4678efa014f1c1fb8f8e4044..1a912477f6766f28b82151334c219a71845a068e 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/LandCoverMap_Add_2_Objects.png and b/src/HYDRO_tests/reference_data/LandCoverMap_Add_2_Objects.png differ

diff --git a/src/HYDRO_tests/reference_data/LandCoverMap_Merge_1.png b/src/HYDRO_tests/reference_data/LandCoverMap_Merge_1.png
index aac1e901ed1026d6837434fda461d1505b2e19fd..861795273b0ae9bff42329653333085f1d21a12b 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/LandCoverMap_Merge_1.png and b/src/HYDRO_tests/reference_data/LandCoverMap_Merge_1.png differ

diff --git a/src/HYDRO_tests/reference_data/LandCoverMap_Remove_1.png b/src/HYDRO_tests/reference_data/LandCoverMap_Remove_1.png
index 86d933df3ad14f0513673df3909b69162b473f1f..4586e6d13220e633332580dd1afd36259379575a 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/LandCoverMap_Remove_1.png and b/src/HYDRO_tests/reference_data/LandCoverMap_Remove_1.png differ

diff --git a/src/HYDRO_tests/reference_data/LandCoverMap_Split_1.png b/src/HYDRO_tests/reference_data/LandCoverMap_Split_1.png
index 4f1b80a87070817fda3b12c14acbe7926a3dc935..44cf6fb00dcdaac119e695936a84703870adc0a0 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/LandCoverMap_Split_1.png and b/src/HYDRO_tests/reference_data/LandCoverMap_Split_1.png differ

diff --git a/src/HYDRO_tests/reference_data/LandCoverMap_Split_2.png b/src/HYDRO_tests/reference_data/LandCoverMap_Split_2.png
index 42f8dc1ddb5332b369118dea4c63c28af2f26fd8..9c4a83348a2a49698ff8a266972d589bcbc9d05f 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/LandCoverMap_Split_2.png and b/src/HYDRO_tests/reference_data/LandCoverMap_Split_2.png differ

diff --git a/src/HYDRO_tests/reference_data/_cs13.png b/src/HYDRO_tests/reference_data/_cs13.png
index c107613d42c7c97cddcd07b518201b9e6aabd40a..141bed64efb20818f08c70e0c433595358231af2 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/_cs13.png and b/src/HYDRO_tests/reference_data/_cs13.png differ

diff --git a/src/HYDRO_tests/reference_data/_cs23.png b/src/HYDRO_tests/reference_data/_cs23.png
index c107613d42c7c97cddcd07b518201b9e6aabd40a..141bed64efb20818f08c70e0c433595358231af2 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/_cs23.png and b/src/HYDRO_tests/reference_data/_cs23.png differ

diff --git a/src/HYDRO_tests/reference_data/cs11.png b/src/HYDRO_tests/reference_data/cs11.png
index 9b5b42397352c2972f39df483f46d6ec190527ef..5db2e8d83dad769527246c7f4c14460bc1d8328d 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/cs11.png and b/src/HYDRO_tests/reference_data/cs11.png differ

diff --git a/src/HYDRO_tests/reference_data/cs11_c.png b/src/HYDRO_tests/reference_data/cs11_c.png
index 35057305b635822ac4c8fc166fae521be34ac89f..972d1734a47551c7e1c60b0d9a12f397118ec143 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/cs11_c.png and b/src/HYDRO_tests/reference_data/cs11_c.png differ

diff --git a/src/HYDRO_tests/reference_data/cs12.png b/src/HYDRO_tests/reference_data/cs12.png
index eb5de6942d2989c5e191e5d22719fce2a18655fc..80400342818dcd529204619a6ea93c7ac60e4ac7 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/cs12.png and b/src/HYDRO_tests/reference_data/cs12.png differ

diff --git a/src/HYDRO_tests/reference_data/cs12_c.png b/src/HYDRO_tests/reference_data/cs12_c.png
index 26ce53c04307f6cd8a2a04cbac9a71298f602cf1..694a77df8dc2ef3e437dfdb6b307e3789e2311d9 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/cs12_c.png and b/src/HYDRO_tests/reference_data/cs12_c.png differ

diff --git a/src/HYDRO_tests/reference_data/cs13.png b/src/HYDRO_tests/reference_data/cs13.png
index 90b9e45b0d034d6011ace8bd89aa5e4554609154..8f609863a203cf2c6e87af232fafda8dd8fd8711 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/cs13.png and b/src/HYDRO_tests/reference_data/cs13.png differ

diff --git a/src/HYDRO_tests/reference_data/cs14.png b/src/HYDRO_tests/reference_data/cs14.png
index 51d20cccf234e334479e156d4a6b81c70cff722f..aa7f59712f0e61d0c5d4e7f79319394b592e01e3 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/cs14.png and b/src/HYDRO_tests/reference_data/cs14.png differ

diff --git a/src/HYDRO_tests/reference_data/cs14_c.png b/src/HYDRO_tests/reference_data/cs14_c.png
index c107613d42c7c97cddcd07b518201b9e6aabd40a..141bed64efb20818f08c70e0c433595358231af2 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/cs14_c.png and b/src/HYDRO_tests/reference_data/cs14_c.png differ

diff --git a/src/HYDRO_tests/reference_data/cs21.png b/src/HYDRO_tests/reference_data/cs21.png
index 9b5b42397352c2972f39df483f46d6ec190527ef..5db2e8d83dad769527246c7f4c14460bc1d8328d 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/cs21.png and b/src/HYDRO_tests/reference_data/cs21.png differ

diff --git a/src/HYDRO_tests/reference_data/cs21_c.png b/src/HYDRO_tests/reference_data/cs21_c.png
index 35057305b635822ac4c8fc166fae521be34ac89f..972d1734a47551c7e1c60b0d9a12f397118ec143 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/cs21_c.png and b/src/HYDRO_tests/reference_data/cs21_c.png differ

diff --git a/src/HYDRO_tests/reference_data/cs22.png b/src/HYDRO_tests/reference_data/cs22.png
index eb5de6942d2989c5e191e5d22719fce2a18655fc..80400342818dcd529204619a6ea93c7ac60e4ac7 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/cs22.png and b/src/HYDRO_tests/reference_data/cs22.png differ

diff --git a/src/HYDRO_tests/reference_data/cs22_c.png b/src/HYDRO_tests/reference_data/cs22_c.png
index 26ce53c04307f6cd8a2a04cbac9a71298f602cf1..694a77df8dc2ef3e437dfdb6b307e3789e2311d9 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/cs22_c.png and b/src/HYDRO_tests/reference_data/cs22_c.png differ

diff --git a/src/HYDRO_tests/reference_data/cs23.png b/src/HYDRO_tests/reference_data/cs23.png
index 90b9e45b0d034d6011ace8bd89aa5e4554609154..8f609863a203cf2c6e87af232fafda8dd8fd8711 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/cs23.png and b/src/HYDRO_tests/reference_data/cs23.png differ

diff --git a/src/HYDRO_tests/reference_data/cs24.png b/src/HYDRO_tests/reference_data/cs24.png
index 51d20cccf234e334479e156d4a6b81c70cff722f..aa7f59712f0e61d0c5d4e7f79319394b592e01e3 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/cs24.png and b/src/HYDRO_tests/reference_data/cs24.png differ

diff --git a/src/HYDRO_tests/reference_data/cs24_c.png b/src/HYDRO_tests/reference_data/cs24_c.png
index c107613d42c7c97cddcd07b518201b9e6aabd40a..141bed64efb20818f08c70e0c433595358231af2 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/cs24_c.png and b/src/HYDRO_tests/reference_data/cs24_c.png differ

diff --git a/src/HYDRO_tests/test_HYDROData_Main.cxx b/src/HYDRO_tests/test_HYDROData_Main.cxx
index 2ad810e282c0930bfd94bb6eda0b30f4aabc3393..fb731922dc38b5c1e851dc1c94a02184fc4dbed9 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_Main.cxx
+++ b/src/HYDRO_tests/test_HYDROData_Main.cxx
@@ -39,10 +39,18 @@ int main( int argc, char* argv[] )
   SUIT_Session aSession;
 
   OCCViewer_ViewWindow* aWindow = TestViewer::viewWindow();
-  aWindow->setGeometry( 200, 200, 800, 600 );
+
+  int W = 800, H = 600;
+  aWindow->setGeometry( 200, 200, W, H );
   aWindow->show();
   QTest::qWaitForWindowShown( aWindow );
 
+  QSize aSize = aWindow->dumpView().size();
+  int dx = W-aSize.width();
+  int dy = H-aSize.height();
+  aWindow->resize( W+dx, H+dy );
+  anApp.processEvents();
+
   std::string testPath = (argc > 1) ? std::string(argv[1]) : "";
 
   // Create the event manager and test controller