maintenant compiling video et photo aussi

This commit is contained in:
hbristow
2013-06-27 13:58:40 -07:00
parent 5bc55a042e
commit 245bc5dcc0
3 changed files with 12 additions and 5 deletions

View File

@@ -43,9 +43,12 @@ endif()
set(the_description "The Matlab/Octave bindings")
ocv_add_module(matlab BINDINGS #TODO: does it actually NEED to depend on core?
OPTIONAL opencv_core
opencv_objdetect opencv_features2d opencv_video
opencv_highgui opencv_ml opencv_calib3d opencv_photo
opencv_nonfree opencv_calib opencv_imgproc)
opencv_imgproc opencv_ml opencv_highgui
#opencv_objdetect opencv_features2d
opencv_video opencv_photo
#opencv_calib opencv_calib3d
#opencv_nonfree
)
# TODO: Undo this when building all modules to find python properly
#set(HDR_PARSER_PATH ${OPENCV_MODULE_opencv_python_LOCATION}/src2)

View File

@@ -149,6 +149,11 @@ public:
double toDouble() { return 0; }
operator double() { return toDouble(); }
// --------------------------- float --------------------------------------
Bridge& operator=(const float& obj) { return *this; }
float toFloat() { return 0; }
operator float() { return toFloat(); }
// -------------------------- Point --------------------------------------
Bridge& operator=(const cv::Point& obj) { return *this; }
cv::Point toPoint() { return cv::Point(); }