refactored gpu module

diff --git a/modules/gpu/src/initialization.cpp b/modules/gpu/src/initialization.cpp
index bb61331..4831fc1 100644 (file)
--- a/modules/gpu/src/initialization.cpp
+++ b/modules/gpu/src/initialization.cpp
@@ -57,6 +57,9 @@ CV_EXPORTS int cv::gpu::getNumberOfSMs(int /*device*/) { throw_nogpu(); return 0
 CV_EXPORTS void cv::gpu::getGpuMemInfo(size_t& /*free*/, size_t& /*total*/)  { throw_nogpu(); } \r
 CV_EXPORTS bool cv::gpu::hasNativeDoubleSupport(int /*device*/) { throw_nogpu(); return false; }\r
 CV_EXPORTS bool cv::gpu::hasAtomicsSupport(int /*device*/) { throw_nogpu(); return false; }\r
+CV_EXPORTS bool cv::gpu::ptxVersionIs(int major, int minor) { throw_nogpu(); return false; }\r
+CV_EXPORTS bool cv::gpu::ptxVersionIsLessOrEqual(int major, int minor) { throw_nogpu(); return false; }\r
+CV_EXPORTS bool cv::gpu::ptxVersionIsGreaterOrEqual(int major, int minor) { throw_nogpu(); return false; }\r
 \r
 \r
 #else /* !defined (HAVE_CUDA) */\r
@@ -133,33 +136,6 @@ CV_EXPORTS bool cv::gpu::hasAtomicsSupport(int device)
 \r
 namespace \r
 {\r
-    struct ComparerEqual \r
-    {\r
-        bool operator()(int lhs1, int lhs2, int rhs1, int rhs2) const\r
-        {\r
-            return lhs1 == rhs1 && lhs2 == rhs2;\r
-        }\r
-    };\r
-\r
-\r
-    struct ComparerLessOrEqual\r
-    {\r
-        bool operator()(int lhs1, int lhs2, int rhs1, int rhs2) const\r
-        {\r
-            return lhs1 < rhs1 || (lhs1 == rhs1 && lhs2 <= rhs2);\r
-        }\r
-    };\r
-\r
-\r
-    struct ComparerGreaterOrEqual\r
-    {\r
-        bool operator()(int lhs1, int lhs2, int rhs1, int rhs2) const\r
-        {\r
-            return lhs1 > rhs1 || (lhs1 == rhs1 && lhs2 >= rhs2);\r
-        }\r
-    };\r
-\r
-\r
     template <typename Comparer>\r
     bool checkPtxVersion(int major, int minor, Comparer cmp) \r
     {\r
@@ -194,18 +170,39 @@ namespace
 \r
 CV_EXPORTS bool cv::gpu::ptxVersionIs(int major, int minor)\r
 {\r
+    struct ComparerEqual \r
+    {\r
+        bool operator()(int lhs1, int lhs2, int rhs1, int rhs2) const\r
+        {\r
+            return lhs1 == rhs1 && lhs2 == rhs2;\r
+        }\r
+    };\r
     return checkPtxVersion(major, minor, ComparerEqual());\r
 }\r
 \r
 \r
 CV_EXPORTS bool cv::gpu::ptxVersionIsLessOrEqual(int major, int minor)\r
 {\r
+    struct ComparerLessOrEqual\r
+    {\r
+        bool operator()(int lhs1, int lhs2, int rhs1, int rhs2) const\r
+        {\r
+            return lhs1 < rhs1 || (lhs1 == rhs1 && lhs2 <= rhs2);\r
+        }\r
+    };\r
     return checkPtxVersion(major, minor, ComparerLessOrEqual());\r
 }\r
 \r
 \r
 CV_EXPORTS bool cv::gpu::ptxVersionIsGreaterOrEqual(int major, int minor)\r
 {\r
+    struct ComparerGreaterOrEqual\r
+    {\r
+        bool operator()(int lhs1, int lhs2, int rhs1, int rhs2) const\r
+        {\r
+            return lhs1 > rhs1 || (lhs1 == rhs1 && lhs2 >= rhs2);\r
+        }\r
+    };\r
     return checkPtxVersion(major, minor, ComparerGreaterOrEqual());\r
 }\r
 \r

diff --git a/tests/gpu/src/match_template.cpp b/tests/gpu/src/match_template.cpp
index 2adafdc..eb9116b 100644 (file)
--- a/tests/gpu/src/match_template.cpp
+++ b/tests/gpu/src/match_template.cpp
@@ -234,21 +234,21 @@ struct CV_GpuMatchTemplateFindPatternInBlackTest: CvTest
     {\r
         try\r
         {\r
-            Mat image = imread(std::string(ts->get_data_path()) + "matchtemplate/black.jpg");\r
+            Mat image = imread(std::string(ts->get_data_path()) + "matchtemplate/black.png");\r
             if (image.empty())\r
             {\r
                 ts->printf(CvTS::CONSOLE, "can't open file '%s'", (std::string(ts->get_data_path()) \r
-                                                                   + "matchtemplate/black.jpg").c_str());\r
-                ts->set_failed_test_info(CvTS::FAIL_INVALID_TEST_DATA);\r
+                                                                   + "matchtemplate/black.png").c_str());\r
+                ts->set_failed_test_info(CvTS::FAIL_MISSING_TEST_DATA);\r
                 return;\r
             }\r
 \r
-            Mat pattern = imread(std::string(ts->get_data_path()) + "matchtemplate/cat.jpg");\r
+            Mat pattern = imread(std::string(ts->get_data_path()) + "matchtemplate/cat.png");\r
             if (pattern.empty())\r
             {\r
                 ts->printf(CvTS::CONSOLE, "can't open file '%s'", (std::string(ts->get_data_path()) \r
-                                                                   + "matchtemplate/cat.jpg").c_str());\r
-                ts->set_failed_test_info(CvTS::FAIL_INVALID_TEST_DATA);\r
+                                                                   + "matchtemplate/cat.png").c_str());\r
+                ts->set_failed_test_info(CvTS::FAIL_MISSING_TEST_DATA);\r
                 return;\r
             }\r
 \r