Commit Graph

73 Commits

Author SHA1 Message Date
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
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
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
hbristow
d84ab09ab7 Updated documentation 2013-09-18 18:52:23 +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
7e5bbec895 Removing trailing whitespace and expanded tabs 2013-09-03 10:14:45 +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
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
153549c7f6 Added LICENSE and Americanizations 2013-08-30 01:09:29 +10:00
hbristow
9726346bc9 removed unused files from repo 2013-08-29 10:44:27 +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
fb41d7bf4e Commenting spree no.2 2013-08-12 00:52:27 +10:00
hbristow
7aaefd4dce Improved escaped character formatting in docs 2013-08-09 15:15:08 +10:00
hbristow
a659562c36 Changed command-line separator from module:file to module=file so that it works cross-platform 2013-08-08 05:26:56 +10:00
hbristow
3bf41c2832 Formatted URLs in the documentation so that they are redirected to the system browser instead of the builtin Matlab browser 2013-08-08 04:46:45 +10:00
hbristow
fad7b35b9a Updated documentation formatting 2013-08-08 03:51:44 +10:00
hbristow
059d63cceb Added diagnostic/build information function 2013-08-08 02:42:17 +10:00
hbristow
f705020348 Linked online documentation now opens a browser window to the exact function reference using div tags 2013-08-07 19:28:58 +10:00
hbristow
3483bf14b9 Added auto-generated docs to all OpenCV functions 2013-08-07 16:34:30 +10:00
hbristow
faeb0aa92a Now using python ArgumentParser to parse command line arguments in preparation for adding doc generation 2013-08-07 01:41:10 +10:00
hbristow
c5ffd1fdea Updated main Matlab help string 2013-08-07 01:10:51 +10:00
hbristow
7ef3be3429 By default, all function now export at least one return value back into the Matlab workspace, even if none are requested. This is in line with Matlab's calling convention, where functions called without an lvalue or a semicolon have their first output printed to the terminal 2013-08-07 00:14:13 +10:00
hbristow
8f92973b8c Started documentation skeleton 2013-08-06 21:16:38 +10:00
hbristow
48aac747ca removed pkg_resources (setuptools) dependency from jinja. Matlab module now has no python dependencies beyond the core python libs 2013-08-06 00:40:57 +10:00
hbristow
58ca8ed97f Improved finding Matlab on Windows machines. Needs testing on computers that have multiple version installed 2013-07-31 11:24:28 +10:00
hbristow
6549e5e052 Added flaky support for finding Matlab on Windows machines 2013-07-30 23:58:32 +10:00
hbristow
baa946c390 Split MxArray out of bridge into standalone file. Does not depend on bridge. Working to make it API complete with respect to mxArray, but with better calling syntax 2013-07-02 16:42:37 -07:00
hbristow
504558c0be Better C++11 and C++98 support/interop. Started writing map interface. Some core functions actually run 2013-07-01 16:33:55 -07:00
hbristow
538dbfe585 Now compiling under much more strigent warnings, with Clang and optional C++11 support 2013-06-29 14:24:53 -07:00
hbristow
53a7fbf74b Improved bridge. Fixed I/O problem in function template 2013-06-29 00:19:08 -07:00
hbristow
53c9c40eba started MxArray wrapper around mxArray class 2013-06-28 19:48:42 -07:00
hbristow
fc519aa3b3 Matlab constants now being parsed correctly. Over 700 constants correctly formatted :) 2013-06-27 20:03:38 -07:00
hbristow
ef6327bb89 Now building all OpenCV functions 2013-06-27 18:13:04 -07:00
hbristow
d6453cf051 Now builds all functions except those dependent on Features2d. Improved build detection if cmake is rerun 2013-06-27 16:25:18 -07:00
hbristow
5bc55a042e Now building all functions (not classes) in core, imgproc, ml and highgui 2013-06-27 11:45:19 -07:00
hbristow
bb56ac4ae6 Added delta builds of Matlab executables. Imgproc module now compiling 2013-06-27 00:25:48 -07:00
hbristow
136f205fb3 added handling of constants equaling constants for C++ map 2013-06-26 17:41:35 -07:00
hbristow
6b88a21be8 added handling of constants equaling constants. e.g. FMT_DEFAULT = FMT_MATLAB 2013-06-26 17:39:08 -07:00
hbristow
c5720213e4 Commented enum maps 2013-06-26 16:13:50 -07:00
hbristow
e51bdbeb2d All OpenCV constants being exported into matlab class and C++ map templates 2013-06-26 15:45:05 -07:00
hbristow
0b9ff11537 Fixed bug where expected number of input variables was incorrect if any of the inputs were also outputs 2013-06-24 13:11:29 -07:00
hbristow
da63919811 Improved error handling on entry to mex files 2013-06-24 12:42:28 -07:00
hbristow
b0285d92b4 Improved file installation 2013-06-23 13:34:01 -07:00