Commit Graph

129 Commits

Author SHA1 Message Date
Daniel Fernandes
b3655233f1 Changing #include to generic video.hpp
Per https://github.com/Itseez/opencv/pull/2783#discussion_r13573590
2014-06-11 02:00:21 -05:00
Daniel Fernandes
6598b97b96 Fixed MATLAB bridge
MATLAB bridge.hpp was missing definition for Ptr<DenseOpticalFlow>
2014-05-21 17:57:35 -05:00
Rok Mandeljc
c35fd55b0e Matlab bindings: CMakeLists.txt: use "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}" as MEX_LIB_DIR only when compiling with MSVC, otherwise, use only "${LIBRARY_OUTPUT_PATH}" 2014-05-03 17:37:48 +02:00
Rok Mandeljc
fa075c50a1 Matlab bindings: fixed the functional template to perform an explicit cast to the type of an input option that is expected. This avoids issues with ternary operator not having the same type in rvalue and lvalue, such as in the case below:
Ptr_FeatureDetector blobDetector = inputs[3].empty() ? makePtr<SimpleBlobDetector>() : inputs[3].toPtrFeatureDetector();

Which after the patch, would be:

Ptr_FeatureDetector blobDetector = inputs[3].empty() ? (Ptr_FeatureDetector) makePtr<SimpleBlobDetector>() : inputs[3].toPtrFeatureDetector();
2014-05-03 17:37:48 +02:00
Rok Mandeljc
2d47dd7038 Matlab bindings: added missing compound type declarations from photo module 2014-05-03 17:37:47 +02:00
Hilton Bristow
61c22d5899 removed experimental slots 2014-03-27 14:58:53 +10:00
Hilton Bristow
fc696a9ff3 Improved standalone importing behaviour and creation of nested directories 2014-03-27 14:52:23 +10:00
Hilton Bristow
6f190bb907 Generalized todict implementation 2014-03-27 14:51:17 +10:00
Hilton Bristow
068b1bc3d0 More generic todict 2014-03-27 11:34:20 +10:00
Hilton Bristow
72d5609a36 Merged upstream master 2014-03-04 11:14:03 +10:00
Yantao Xie
6b00c4e337 Use CMAKE_CFG_INTDIR meta-variable to get the library output directory of the opencv_matlab. 2014-02-13 23:53:58 +08:00
Hilton Bristow
483061e802 explicit string encoding when writing to file in python3 2013-12-29 17:10:52 +10:00
Hilton Bristow
2f45942adc converted necessary files for python3 compatibility using 2to3 2013-12-29 17:10:44 +10:00
ytxie
3d3b310ae1 Fix the bug 3440. 2013-12-26 17:54:05 +08:00
Leszek Swirski
6e4fb8f275 Replace $(Configuration) with $<CONFIGURATION> 2013-10-24 18:20:16 +01:00
hbristow
d84ab09ab7 Updated documentation 2013-09-18 18:52:23 +10:00
hbristow
1dd017e9d0 Fixed a memory leak in mxarray 2013-09-18 17:10:54 +10:00
hbristow
86b7e3d15d Moved Jinja2 into 3rdparty. Now using latest stable version from pypi (2.7.1) 2013-09-15 17:36:13 +10:00
hbristow
530ad447bc Added fixes to CMakeLists.txt 2013-09-13 17:22:12 +10:00
hbristow
74accbd969 Added <algorithm> to mxarray.hpp, which seems to be needed explictly by some compilers 2013-09-06 16:42:32 +10:00
hbristow
6964f6aacc Removed unused Dynamic from matlab namespace - clashing with Eigen 2013-09-06 15:26:05 +10:00
hbristow
7e5bbec895 Removing trailing whitespace and expanded tabs 2013-09-03 10:14:45 +10:00
hbristow
c112c9aa00 Made binding compilation less verbose 2013-09-02 16:43:58 +10:00
hbristow
31c95ff7f8 Added new OpenCV definitions to bridge 2013-09-02 14:29:46 +10:00
hbristow
1d25e5f1ba manually added optical flow header to build 2013-09-01 17:10:44 +10:00
hbristow
a64c34c3ec Updated cv help to include reference to named arguments 2013-08-30 16:48:41 +10:00
hbristow
d16d637eb2 Fixed handling of optional arguments under ArgumentParser. Fixed default constructor error in MxArray 2013-08-30 16:10:32 +10:00
hbristow
25ee1f9099 Improved error messages for incorrect arguments 2013-08-30 15:48:20 +10:00
hbristow
a780c3a7d1 Swapped out function assertions in favour of ArgumentParser 2013-08-30 15:06:57 +10:00
hbristow
8f62a52b9b Brought matlab module into cv namespace 2013-08-30 12:39:01 +10:00
hbristow
bc93edac34 Removed all OpenCV-specific functionality from mxarray into bridge. mxarray is now standalone 2013-08-30 11:18:08 +10:00
hbristow
153549c7f6 Added LICENSE and Americanizations 2013-08-30 01:09:29 +10:00
hbristow
33c377b305 complete rewrite of ArgumentParser 2013-08-30 01:04:43 +10:00
hbristow
d5abe79f74 untracked io for initial pull request 2013-08-29 10:49:15 +10:00
hbristow
9726346bc9 removed unused files from repo 2013-08-29 10:44:27 +10:00
hbristow
57505b9af9 Added LICENSE preamble to include files 2013-08-29 10:20:53 +10:00
hbristow
569e8006e3 updated README.md formatting 2013-08-28 17:58:08 +10:00
hbristow
2a0e357cd0 updated syntax highlighting 2013-08-28 17:56:39 +10:00
hbristow
b87197dc37 updated syntax highlighting 2013-08-28 17:53:25 +10:00
hbristow
eb83a9ed9f Enabled syntax highlighting 2013-08-28 17:49:20 +10:00
hbristow
2ac31a87c9 Added tutorial for writing your own mex files 2013-08-28 17:40:20 +10:00
hbristow
78dc2c5423 Upadated include tree to match the rest of opencv. Added install configuration for custom mex compiler 2013-08-28 17:06:19 +10:00
hbristow
52dc51a62c Added custom OpenCV mex compiler 2013-08-28 12:01:34 +10:00
hbristow
ef2c1e1a24 Changed bad cast in MxArray 2013-08-12 11:38:59 +10:00
hbristow
fb41d7bf4e Commenting spree no.2 2013-08-12 00:52:27 +10:00
hbristow
bfa88384c7 Updated documentation 2013-08-11 16:12:05 +10:00
hbristow
e63369fe64 Updated nest list in markdown 2013-08-11 15:14:09 +10:00
hbristow
1e78a187db Updated nest list in markdown 2013-08-11 14:49:33 +10:00
hbristow
7786ed7bcb Updated nest list in markdown 2013-08-11 14:48:29 +10:00
hbristow
a269e3216e Updated nest list in markdown 2013-08-11 14:46:28 +10:00