updated watershed test (regenerated the reference picture); added Lanczos check in...

git-svn-id: https://code.ros.org/svn/opencv/trunk@2359 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/tests/cv/src/aimgwarp.cpp b/opencv/tests/cv/src/aimgwarp.cpp
index 97ddd38e3af18560ad8236430eaa640ce640b76e..eed200e5e0bd77b3ae0f8cc9fc8ed615b76aca8a 100644 (file)
--- a/opencv/tests/cv/src/aimgwarp.cpp
+++ b/opencv/tests/cv/src/aimgwarp.cpp
@@ -81,7 +81,7 @@ CV_ImgWarpBaseTestImpl::CV_ImgWarpBaseTestImpl( const char* test_name, const cha
         test_array[INPUT].push(NULL);
     test_array[INPUT_OUTPUT].push(NULL);
     test_array[REF_INPUT_OUTPUT].push(NULL);
-    max_interpolation = 4;
+    max_interpolation = 5;
     interpolation = 0;
     element_wise_relative_error = false;
     spatial_scale_zoom = 0.01;

diff --git a/opencv/tests/cv/src/watershed.cpp b/opencv/tests/cv/src/watershed.cpp
index 647a178d8cd6e4e2089c76b9d68282b1b6cb44b2..91a9c34a44d33c394afc1e267d28ad06125f226b 100644 (file)
--- a/opencv/tests/cv/src/watershed.cpp
+++ b/opencv/tests/cv/src/watershed.cpp
@@ -62,13 +62,14 @@ CV_WatershedTest::~CV_WatershedTest() {}
 \r
 void CV_WatershedTest::run( int /* start_from */)\r
 {      \r
-    Mat orig = imread(string(ts->get_data_path()) + "inpaint/orig.jpg");    \r
-    Mat exp = imread(string(ts->get_data_path()) + "watershed/wshed_exp.png", 0); \r
+    string exp_path = string(ts->get_data_path()) + "watershed/wshed_exp.png"; \r
+    Mat exp = imread(exp_path, 0);\r
+    Mat orig = imread(string(ts->get_data_path()) + "inpaint/orig.jpg");\r
     FileStorage fs(string(ts->get_data_path()) + "watershed/comp.xml", FileStorage::READ);\r
             \r
-    if (orig.empty() || exp.empty() || orig.size() != exp.size() || !fs.isOpened())\r
+    if (orig.empty() || !fs.isOpened())\r
     {\r
-        ts->set_failed_test_info( CvTS::FAIL_INVALID_TEST_DATA );  \r
+        ts->set_failed_test_info( CvTS::FAIL_INVALID_TEST_DATA );\r
         return;\r
     }\r
               \r
@@ -86,7 +87,8 @@ void CV_WatershedTest::run( int /* start_from */)
 \r
         //expected image was added with 1 in order to save to png\r
         //so now we substract 1 to get real color\r
-        colors.push_back(exp.ptr(p->y)[p->x] - 1);     \r
+        if(exp.data)\r
+            colors.push_back(exp.ptr(p->y)[p->x] - 1);\r
     }\r
     fs.release();\r
     const int compNum = colors.size() - 1;\r
@@ -107,12 +109,19 @@ void CV_WatershedTest::run( int /* start_from */)
                 continue; // bad result, doing nothing and going to get error latter;\r
             \r
             // repaint in saved color to compare with expected;\r
-            pixel = colors[pixel];                                        \r
+            if(exp.data)\r
+                pixel = colors[pixel];                                        \r
         }\r
     }    \r
 \r
     Mat markers8U;\r
     markers.convertTo(markers8U, CV_8U, 1, 1);\r
+    \r
+    if( exp.empty() || orig.size() != exp.size() )\r
+    {\r
+        imwrite(exp_path, markers8U);\r
+        exp = markers8U;\r
+    }\r
                 \r
     if (0 != norm(markers8U, exp, NORM_INF))\r
     {    \r

diff --git a/opencv_extra/testdata/cv/watershed/wshed_exp.png b/opencv_extra/testdata/cv/watershed/wshed_exp.png
index abdf6f874363192ad690a0d11fbe7da195efa7af..c47f54c47819b86ea36ca243d5e4b6105f0b2d00 100644 (file)
Binary files a/opencv_extra/testdata/cv/watershed/wshed_exp.png and b/opencv_extra/testdata/cv/watershed/wshed_exp.png differ