remove structured_edge_detection.hpp from blacklist
authorAlexander Mordvintsev <Alexander.Mordvintsev@transas.com>
Thu, 28 Aug 2014 15:15:43 +0000 (19:15 +0400)
committerAlexander Mordvintsev <Alexander.Mordvintsev@transas.com>
Mon, 1 Sep 2014 09:55:41 +0000 (13:55 +0400)
don't discard pure virtual methods in hdr_parser.py (was broken anyway)

modules/python/common.cmake
modules/python/src2/hdr_parser.py

index 7f17ad9..d3f7008 100644 (file)
@@ -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"
index e0f8ecf..3e202fd 100755 (executable)
@@ -557,11 +557,6 @@ class CppHeaderParser(object):
                     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")