generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3169 from znah:py_wrap

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-09-01 18:01:12 +00:00
commit a125cd6c6d
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/python/common.cmake
View File

@ -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"

5
modules/python/src2/hdr_parser.py
View File

@ -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")