Merge pull request opencv#3169 from znah:py_wrap

flyskybingo · Sep 1, 2014 · a125cd6 · a125cd6
2 parents 6c3dd49 + c1032b6
commit a125cd6
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/modules/python/common.cmake b/modules/python/common.cmake
@@ -37,7 +37,6 @@ ocv_list_filterout(opencv_hdrs ".h$")
 ocv_list_filterout(opencv_hdrs "cuda")
 ocv_list_filterout(opencv_hdrs "cudev")
 ocv_list_filterout(opencv_hdrs "opencv2/objdetect/detection_based_tracker.hpp")
-ocv_list_filterout(opencv_hdrs "opencv2/ximgproc/structured_edge_detection.hpp")
 
 set(cv2_generated_hdrs
     "${CMAKE_CURRENT_BINARY_DIR}/pyopencv_generated_include.h"

diff --git a/modules/python/src2/hdr_parser.py b/modules/python/src2/hdr_parser.py
@@ -557,11 +557,6 @@ def parse_func_decl(self, decl_str):
                     args.append([arg_type, arg_name, defval, modlist])
                 npos = arg_start-1
 
-        npos = decl_str.replace(" ", "").find("=0", npos)
-        if npos >= 0:
-            # skip pure virtual functions
-            return []
-
         if static_method:
             func_modlist.append("/S")