From c1032b6232cb56deafb4782d6443b78464afd7e5 Mon Sep 17 00:00:00 2001 From: Alexander Mordvintsev Date: Thu, 28 Aug 2014 19:15:43 +0400 Subject: [PATCH] remove structured_edge_detection.hpp from blacklist don't discard pure virtual methods in hdr_parser.py (was broken anyway) --- modules/python/common.cmake | 1 - modules/python/src2/hdr_parser.py | 5 ----- 2 files changed, 6 deletions(-) diff --git a/modules/python/common.cmake b/modules/python/common.cmake index 7f17ad9..d3f7008 100644 --- 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 index e0f8ecf..3e202fd 100755 --- a/modules/python/src2/hdr_parser.py +++ b/modules/python/src2/hdr_parser.py @@ -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") -- 2.7.4