potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Merge branch 'master' into python2and3

Browse Source
This commit is contained in:
Michael Pratt
2014-08-06 01:45:07 -04:00
committed by arc
parent 52df3b232d d2f1c00719
commit 218b12c557
115 changed files with 23402 additions and 33378 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/python/common.cmake
+2 -1
View File
@@ -33,7 +33,8 @@ endforeach(m)
# header blacklist
ocv_list_filterout(opencv_hdrs ".h$")
ocv_list_filterout(opencv_hdrs "opencv2/core/cuda")
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/optim.hpp")