remove structured_edge_detection.hpp from blacklist
don't discard pure virtual methods in hdr_parser.py (was broken anyway)
This commit is contained in:
parent
6ccb7e169d
commit
c1032b6232
@ -37,7 +37,6 @@ ocv_list_filterout(opencv_hdrs ".h$")
|
|||||||
ocv_list_filterout(opencv_hdrs "cuda")
|
ocv_list_filterout(opencv_hdrs "cuda")
|
||||||
ocv_list_filterout(opencv_hdrs "cudev")
|
ocv_list_filterout(opencv_hdrs "cudev")
|
||||||
ocv_list_filterout(opencv_hdrs "opencv2/objdetect/detection_based_tracker.hpp")
|
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
|
set(cv2_generated_hdrs
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/pyopencv_generated_include.h"
|
"${CMAKE_CURRENT_BINARY_DIR}/pyopencv_generated_include.h"
|
||||||
|
@ -557,11 +557,6 @@ class CppHeaderParser(object):
|
|||||||
args.append([arg_type, arg_name, defval, modlist])
|
args.append([arg_type, arg_name, defval, modlist])
|
||||||
npos = arg_start-1
|
npos = arg_start-1
|
||||||
|
|
||||||
npos = decl_str.replace(" ", "").find("=0", npos)
|
|
||||||
if npos >= 0:
|
|
||||||
# skip pure virtual functions
|
|
||||||
return []
|
|
||||||
|
|
||||||
if static_method:
|
if static_method:
|
||||||
func_modlist.append("/S")
|
func_modlist.append("/S")
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user