Commit Graph

6033 Commits

Author SHA1 Message Date
hbristow
603d949354 Improved string handling. Swapped transpose interface for slow but correct implementation. Will come back to optimized implementation later. imshow now works correctly 2013-07-12 15:48:03 +10:00
hbristow
346f7d0f3e Fast deep-copy-transpose implemented which attempts to not thrash the cache. Good first step for now, but no transpose at all would be preferrable. Started I/O. 2013-07-12 10:38:48 +10:00
hbristow
d126263983 implemented faster transpose with SEE auto vectorization 2013-07-03 23:34:02 -07: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
6fd296c0b0 More aggressive build warnings. The cmake configuration is quite fragile. Pay particular attention to quotes around variables 2013-06-29 16:30:17 -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
245bc5dcc0 maintenant compiling video et photo aussi 2013-06-27 13:58:40 -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
8cd48cf35a Added README and proposal. Staging for first public commit 2013-06-23 20:48:40 -07:00
hbristow
c8fdb2c1e0 Changed build locations so that the matlab module can be used in-place, without having to install 2013-06-23 13:54:54 -07:00
hbristow
b0285d92b4 Improved file installation 2013-06-23 13:34:01 -07:00
hbristow
3b77fa5e8c Improved dependency checking 2013-06-23 09:44:26 -07:00
hbristow
24d5adfd54 Added commenting to modules/matlab/CMakeLists.txt 2013-06-22 23:52:05 -07:00
hbristow
755ce9d654 Matlab bindings now only building once rather than every call to make, via the use of some proxies. Matlab build currently only happens in one thread, so it can be pretty slow 2013-06-22 23:26:27 -07:00
hbristow
3b4814a52e Started writing the Bridge interface. Mex wrappers now starting to compile for core 2013-06-22 12:38:40 -07:00
hbristow
0263727b53 Function templates now include the full skeleton, from input to output. Class templates need work 2013-06-21 23:39:28 -07:00
hbristow
f45bc35652 input/output assignment in templates is working for non-trivial cases. Updated parse_tree to handle '/IO' and '/S' modifiers 2013-06-21 22:55:48 -07:00
hbristow
1a15ed3279 Started handling trivial case of return references. Removed most modules from build tree while testing (cmake/OpenCVModule) 2013-06-21 17:33:24 -07:00
hbristow
d9cea3b8b0 Compiling matlab from sources now appears as a single target 2013-06-19 17:37:41 +10:00
hbristow
0c726a3fbe Improved exception handling and unit tests 2013-06-19 16:37:57 +10:00
hbristow
bbece095fb Starting writing Matlab testing framework 2013-06-19 15:04:52 +10:00
hbristow
31415e344f Matlab binding generation now at build time 2013-06-19 13:59:22 +10:00
hbristow
884f36ba65 Improved configure time tests. Added OpenCV specific exception handling 2013-06-19 11:54:14 +10:00
hbristow
4d135ac4d8 Improved exception handling in function template 2013-06-18 23:13:03 +10:00
hbristow
804d0924c9 cmake now attempts to generate and compile a simple mex file at configure time and reports the working status of the generator and compiler, rather than just naively saying Matlab exists 2013-06-18 23:00:48 +10:00
hbristow
fc16cfcf41 Improved template formatting 2013-06-18 17:29:04 +10:00
hbristow
304fd03e64 Updated jinja version 2013-06-18 17:27:09 +10:00
hbristow
28c90609c9 Stripped more unnecessary files out of jinja. Now down to 21 files at 352KB. Stripped files are in jinja-unused for the moment 2013-06-17 16:51:25 +10:00
Hilton Bristow
30aa710022 Removed some debug statements 2013-06-17 16:51:24 +10:00
Hilton Bristow
eda32520e2 Improved tempalte formatting 2013-06-17 16:51:24 +10:00
Hilton Bristow
66c40bee6f Template population now functional 2013-06-17 16:51:24 +10:00
Hilton Bristow
827b4f93e4 Stripped down jinja, added cmake support 2013-06-17 16:51:24 +10:00
Hilton Bristow
09e294711d Added class templates 2013-06-17 16:51:23 +10:00
Hilton Bristow
c29a98ef84 Added README 2013-06-17 16:51:23 +10:00
Hilton Bristow
8e9cdf8ca3 Updated print formatting 2013-06-17 16:51:23 +10:00
Hilton Bristow
808f9dbc93 Improved parse tree, now building within main opencv build system 2013-06-17 16:51:23 +10:00
Hilton Bristow
5d1944bace Added jinja framework for templates and base templates for functions and docs 2013-06-17 16:48:07 +10:00
Hilton Bristow
e8e537a1c7 Added matlab generator stub 2013-06-17 16:48:06 +10:00
Hilton Bristow
ded45b4d1a Added basic ability to find Matlab installations. Added test cpp file under modules/matlab/test to test mex compiler within cmake 2013-06-17 16:48:05 +10:00
Hilton Bristow
411604fa90 Initial matlab commit 2013-06-17 16:40:54 +10:00
Roman Donchenko
71db862dc2 Merge pull request #977 from jet47:gpucodec-refactoring 2013-06-14 16:24:24 +04:00
Roman Donchenko
2fc49ac564 Merge pull request #978 from jet47:gpuarithm-refactoring 2013-06-14 16:24:03 +04:00
Roman Donchenko
4bc4f4aa1f Merge pull request #1003 from vhdirk:gstreamerfixes 2013-06-14 15:51:03 +04:00
Roman Donchenko
d998e38a12 Merge pull request #983 from HapeMask:python3-compatibility 2013-06-14 15:48:37 +04:00
Roman Donchenko
130794d41c Merge pull request #990 from asmorkalov:pthread_build_fix 2013-06-14 11:48:05 +04:00
Roman Donchenko
83fa4d38a4 Merge pull request #976 from PeterMinin:num_detections 2013-06-14 11:24:00 +04:00
Peter Minin
7d70399d72 Add a new variant of detectMultiScale with output arguments 'objects' and 'numDetections'; factor most of detectMultiScale's code into 2 protected methods 2013-06-14 04:25:17 +04:00
Gabe Schwartz
bb209193c9 Updated usage of METH_X definitions for python 3.
Python 3 requires METH_VARARGS | METH_KEYWORDS, not just METH_KEYWORDS.
2013-06-13 20:10:01 -04:00
Gabe Schwartz
bce1b352e7 Updated cmake files to use print().
In these cases, just using print() is enough to ensure py2/3
compatibility.
2013-06-13 20:10:01 -04:00
Gabe Schwartz
fb9781b97b Updated cv2.cpp to support Python 3 API.
Added a header with defines to enable the module to compile with either
python 2 or 3 without changes.
2013-06-13 20:10:01 -04:00
Gabe Schwartz
931ebab822 Updated generator and parser to support Python 3. 2013-06-13 18:39:47 -04:00
Alexander Smorkalov
37b67fa50d Fix compiler error due to missing pthread header (Issue #2953) 2013-06-13 16:11:39 +04:00
Dirk Van Haerenborgh
30f7f9717f allow for arbitraty number of sources and sinks 2013-06-13 11:16:33 +02:00
Roman Donchenko
6faf00b8e5 Merge pull request #696 from znah:detect_method 2013-06-13 12:01:59 +04:00
Dirk Van Haerenborgh
6d66d11046 gstreamer: cleaning up resources 2013-06-12 16:58:16 +02:00
Roman Donchenko
1acbc7b7bd Merge pull request #966 from berak:master 2013-06-11 18:17:07 +04:00
Vladislav Vinogradov
a3341006ee updated documentation 2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
8461cb3f4b refactored gpu::convolve function:
* converted it to Algorithm
* old API still can be used for source compatibility (marked as deprecated)
2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
26a4be89b1 switched to Input/Output Array in Fourier operations 2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
948661d722 switched to Input/Output Array in gpu::gemm 2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
8fcef225fb switched to Input/Output Array in reductions operations 2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
c52d56964c switched to Input/Output Array in gpu::copyMakeBorder 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
539f367d0b refactored gpu::LUT function:
* converted it to Algorithm, because implementation uses inner buffers and
  requires preprocessing step
* new implementation splits preprocessing and transform,
  what is more effecient
* old API still can be used for source compatibility (marked as deprecated)
2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
0c50d0821f switched to Input/Output Array in transpose/flip operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
3d8ca010b7 switched to Input/Output Array in split/merge operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
58c4d0eaeb switched to Input/Output Array in cart<->polar operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
0a83817ace switched to Input/Output Array in gpu::threshold 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
44ec450b53 switched to Input/Output Array in gpu::addWeighted 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
ec70282bf7 switched to Input/Output Array in min/max operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
f2aa6ebe15 switched to Input/Output Array in shift operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
d81f54db0b switched to Input/Output Array in bitwise logical operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
04a1a6dd8f switched to Input/Output Array in gpu::compare 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
b866890b27 switched to Input/Output Array in abs, sqr, sqrt, exp, log, pow 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
5ec8c51b98 switched to Input/Output Array in gpu::absdiff 2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
3ee12cbeb4 switched to Input/Output Array in gpu::divide 2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
4595e3aa3e switched to Input/Output Array in gpu::multiply 2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
ffa25be3d2 added arithm_op function to reduce code duplication 2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
5330faf5a0 switched to Input/Output Array in gpu::subtract 2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
4ebbf69134 switched to Input/Output Array in gpu::add 2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
76211709a3 refactored VideoReader (convert it to abstract interface)
also refactored VideoSource interface (made it simplier, now it has only 2 abstract methods)
2013-06-11 17:57:40 +04:00
Vladislav Vinogradov
e9a74c17f8 refactored VideoWriter class (convert it to abstract interface) 2013-06-11 17:57:39 +04:00
Roman Donchenko
7a07f1a9e7 Merge pull request #899 from LeszekSwirski:fix-drawingdoc 2013-06-11 17:30:19 +04:00
Roman Donchenko
7c4e3715b3 Merge pull request #975 from SpecLad:merge-2.4 2013-06-11 17:28:26 +04:00
Roman Donchenko
81c6b46fc6 Merge pull request #974 from jet47:gpu-core-refactoring 2013-06-11 12:05:56 +04:00
Roman Donchenko
3bfc69740b Merge remote-tracking branch 'origin/2.4' into merge-2.4
Merged pull requests:
	#890 from caorong:patch-1
	#893 from jet47:gpu-arm-fixes
	#933 from pengx17:2.4_macfix_cont
	#935 from pengx17:2.4_filter2d_fix
	#936 from bitwangyaoyao:2.4_perf
	#937 from bitwangyaoyao:2.4_fixPyrLK
	#938 from pengx17:2.4_surf_sample
	#939 from pengx17:2.4_getDevice
	#940 from SpecLad:autolock
	#941 from apavlenko:signed_char
	#946 from bitwangyaoyao:2.4_samples2
	#947 from jet47:fix-gpu-arm-build
	#948 from jet47:cuda-5.5-support
	#952 from SpecLad:jepg
	#953 from jet47:fix-bug-3069
	#955 from SpecLad:symlink
	#957 from pengx17:2.4_fix_corner_detector
	#959 from SpecLad:qt4-build
	#960 from SpecLad:extra-modules

Conflicts:
	modules/core/include/opencv2/core/core.hpp
	modules/gpu/CMakeLists.txt
	modules/gpu/include/opencv2/gpu/device/vec_math.hpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuimgproc/src/cuda/hough.cu
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/pyrlk.cpp
	samples/gpu/driver_api_multi.cpp
	samples/gpu/driver_api_stereo_multi.cpp
	samples/ocl/surf_matcher.cpp
2013-06-10 18:18:01 +04:00
Vladislav Vinogradov
4f0d72bf43 added missing <iostream> header 2013-06-10 17:47:55 +04:00
Vladislav Vinogradov
564fd21e87 fixed documentation build 2013-06-10 15:52:01 +04:00