Merge pull request #680 from vpisarev:c2cpp_video_take2

2013-03-22 19:34:52 +04:00
parent 1ca8f33b4e 40dd25d6c2
commit 82d7292ee7
32 changed files with 2604 additions and 2462 deletions
--- a/modules/core/include/opencv2/core/internal.hpp
+++ b/modules/core/include/opencv2/core/internal.hpp
@@ -254,14 +254,14 @@ namespace cv
 } //namespace cv

 #define CV_INIT_ALGORITHM(classname, algname, memberinit) \
-    static ::cv::Algorithm* create##classname() \
+    static ::cv::Algorithm* create##classname##_hidden() \
    { \
        return new classname; \
    } \
    \
    static ::cv::AlgorithmInfo& classname##_info() \
    { \
-        static ::cv::AlgorithmInfo classname##_info_var(algname, create##classname); \
+        static ::cv::AlgorithmInfo classname##_info_var(algname, create##classname##_hidden); \
        return classname##_info_var; \
    } \
    \