mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 11:40:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2685 from znah:ocl_control_py

Browse Source
This commit is contained in:
Roman Donchenko 2014-05-19 13:38:36 +04:00 committed by OpenCV Buildbot
commit f0b0d4e867
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/core/include/opencv2/core/ocl.hpp
View File

@ -46,12 +46,12 @@
namespace cv { namespace ocl {
CV_EXPORTS bool haveOpenCL();
CV_EXPORTS bool useOpenCL();
CV_EXPORTS bool haveAmdBlas();
CV_EXPORTS bool haveAmdFft();
CV_EXPORTS void setUseOpenCL(bool flag);
CV_EXPORTS void finish();
CV_EXPORTS_W bool haveOpenCL();
CV_EXPORTS_W bool useOpenCL();
CV_EXPORTS_W bool haveAmdBlas();
CV_EXPORTS_W bool haveAmdFft();
CV_EXPORTS_W void setUseOpenCL(bool flag);
CV_EXPORTS_W void finish();
class CV_EXPORTS Context;
class CV_EXPORTS Device;

1
modules/python/CMakeLists.txt
View File

@ -25,6 +25,7 @@ set(opencv_hdrs
"${OPENCV_MODULE_opencv_core_LOCATION}/include/opencv2/core/types.hpp"
"${OPENCV_MODULE_opencv_core_LOCATION}/include/opencv2/core/persistence.hpp"
"${OPENCV_MODULE_opencv_core_LOCATION}/include/opencv2/core/utility.hpp"
"${OPENCV_MODULE_opencv_core_LOCATION}/include/opencv2/core/ocl.hpp"
"${OPENCV_MODULE_opencv_flann_LOCATION}/include/opencv2/flann/miniflann.hpp"
"${OPENCV_MODULE_opencv_imgproc_LOCATION}/include/opencv2/imgproc.hpp"
"${OPENCV_MODULE_opencv_video_LOCATION}/include/opencv2/video/background_segm.hpp"

3
modules/python/src2/gen2.py
View File

@ -776,7 +776,7 @@ class PythonWrapperGenerator(object):
classname = bareclassname = ""
name = decl[0]
dpos = name.rfind(".")
if dpos >= 0 and name[:dpos] != "cv":
if dpos >= 0 and name[:dpos] not in ["cv", "cv.ocl"]:
classname = bareclassname = re.sub(r"^cv\.", "", name[:dpos])
name = name[dpos+1:]
dpos = classname.rfind(".")
@ -785,6 +785,7 @@ class PythonWrapperGenerator(object):
classname = classname.replace(".", "_")
cname = name
name = re.sub(r"^cv\.", "", name)
name = name.replace(".", "_")
isconstructor = cname == bareclassname
cname = cname.replace(".", "::")
isclassmethod = False

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

@ -6,6 +6,7 @@ import os, sys, re, string
# the list only for debugging. The real list, used in the real OpenCV build, is specified in CMakeLists.txt
opencv_hdr_list = [
"../../core/include/opencv2/core.hpp",
"../../core/include/opencv2/core/ocl.hpp",
"../../flann/include/opencv2/flann/miniflann.hpp",
"../../ml/include/opencv2/ml.hpp",
"../../imgproc/include/opencv2/imgproc.hpp",

8
modules/video/include/opencv2/video/tracking.hpp
View File

@ -177,11 +177,11 @@ public:
class CV_EXPORTS DenseOpticalFlow : public Algorithm
class CV_EXPORTS_W DenseOpticalFlow : public Algorithm
{
public:
virtual void calc( InputArray I0, InputArray I1, InputOutputArray flow ) = 0;
virtual void collectGarbage() = 0;
CV_WRAP virtual void calc( InputArray I0, InputArray I1, InputOutputArray flow ) = 0;
CV_WRAP virtual void collectGarbage() = 0;
};
// Implementation of the Zach, Pock and Bischof Dual TV-L1 Optical Flow method
@ -189,7 +189,7 @@ public:
// see reference:
// [1] C. Zach, T. Pock and H. Bischof, "A Duality Based Approach for Realtime TV-L1 Optical Flow".
// [2] Javier Sanchez, Enric Meinhardt-Llopis and Gabriele Facciolo. "TV-L1 Optical Flow Estimation".
CV_EXPORTS Ptr<DenseOpticalFlow> createOptFlow_DualTVL1();
CV_EXPORTS_W Ptr<DenseOpticalFlow> createOptFlow_DualTVL1();
} // cv