fixed meanShift test in gpu module

diff --git a/tests/gpu/src/meanshift.cpp b/tests/gpu/src/meanshift.cpp
index 42fc2cef958e7aa5198341bf33d8c12150e9224d..1c32550b68170eb5fda6b6f37622c17adb2e91d2 100644 (file)
--- a/tests/gpu/src/meanshift.cpp
+++ b/tests/gpu/src/meanshift.cpp
@@ -54,7 +54,15 @@ struct CV_GpuMeanShiftTest : public CvTest
         int colorRad = 30;\r
 \r
         cv::Mat img = cv::imread(std::string(ts->get_data_path()) + "meanshift/cones.png");\r
-        cv::Mat img_template = cv::imread(std::string(ts->get_data_path()) + "meanshift/con_result.png");\r
+        cv::Mat img_template;\r
+        \r
+        int major, minor;\r
+        cv::gpu::getComputeCapability(cv::gpu::getDevice(), major, minor);\r
+        \r
+        if (major == 1)\r
+            img_template = cv::imread(std::string(ts->get_data_path()) + "meanshift/con_result_CC1X.png");\r
+        else\r
+            img_template = cv::imread(std::string(ts->get_data_path()) + "meanshift/con_result.png");\r
 \r
         if (img.empty() || img_template.empty())\r
         {\r
@@ -69,6 +77,7 @@ struct CV_GpuMeanShiftTest : public CvTest
         {\r
             cv::gpu::GpuMat res;\r
             cv::gpu::meanShiftFiltering( cv::gpu::GpuMat(rgba), res, spatialRad, colorRad );\r
+\r
             if (res.type() != CV_8UC4)\r
             {\r
                 ts->set_failed_test_info(CvTS::FAIL_INVALID_OUTPUT);\r
@@ -197,7 +206,7 @@ struct CV_GpuMeanShiftProcTest : public CvTest
             cv::gpu::getComputeCapability(cv::gpu::getDevice(), major, minor);\r
 \r
             if (major == 1)\r
-                fs.open(std::string(ts->get_data_path()) + "meanshift/spmap_1x.yaml", cv::FileStorage::READ);\r
+                fs.open(std::string(ts->get_data_path()) + "meanshift/spmap_CC1X.yaml", cv::FileStorage::READ);\r
             else\r
                 fs.open(std::string(ts->get_data_path()) + "meanshift/spmap.yaml", cv::FileStorage::READ);\r
             fs["spmap"] >> spmap_template;\r