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

maintenant compiling video et photo aussi

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/OpenCVModule.cmake
View File

@ -312,8 +312,7 @@ macro(ocv_glob_modules)
list(APPEND __directories_observed "${__path}") list(APPEND __directories_observed "${__path}")
# TODO: Undo this change to build all modules # TODO: Undo this change to build all modules
#file(GLOB __ocvmodules RELATIVE "${__path}" "${__path}/*") file(GLOB __ocvmodules RELATIVE "${__path}" "${__path}/*")
file(GLOB __ocvmodules RELATIVE "${__path}" "${__path}/core" "${__path}/imgproc" "${__path}/ml" "${__path}/highgui" "${__path}/matlab")
if(__ocvmodules) if(__ocvmodules)
list(SORT __ocvmodules) list(SORT __ocvmodules)
foreach(mod ${__ocvmodules}) foreach(mod ${__ocvmodules})

9
modules/matlab/CMakeLists.txt
View File

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

5
modules/matlab/include/bridge.hpp
View File

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