7824 Commits

Author SHA1 Message Date
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
kdrobnyh
f4aa7ff919 Add IPP support in meanStdDev, minMaxIdx, norm functions 2013-08-29 21:09:19 +04: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
Alexander Smorkalov
114e04ee12 OpenCV version++. Current OpenCv version 2.4.6.2 2013-08-29 19:00:13 +04:00
Alexander Smorkalov
ba26f6d48a Native camera libraries updated.
Android 4.3 support added;
ANY camera index support fixed;
applyProperties now uses camera->reconnect() instead close/connect for Android 4.x.
(cherry picked from commit fff91eef0bd301e791173259ccf884c23397c956)
2013-08-29 18:46:45 +04:00
ilya-lavrenov
a6084d2970 enabled some tests that failed before OCL_TEST_CYCLE*() macroses were defined and for some tests was disabled SANITY_CHECK, because plain and ocl results must not be completely equal 2013-08-29 18:39:09 +04:00
ilya-lavrenov
968c095403 gpu -> ocl 2013-08-29 18:32:06 +04:00
StevenPuttemans
caaf440bd8 Added fix in CMakeLists.txt for contrib module. 2013-08-29 16:09:48 +02:00
kdrobnyh
7a7aa148d4 Add IPP support in compare function 2013-08-29 17:55:57 +04:00
Roman Donchenko
fc37df05ec Merge pull request #1366 from asmorkalov:ocv_autobuffer_fix 2013-08-29 16:35:38 +04:00
Roman Donchenko
86f4cd253a Merge pull request #1309 from pengx17:master_retina_ocl 2013-08-29 16:26:55 +04:00
Alexander Smorkalov
5af2cc6223 AutoBuffer with initial zero size fixed. 2013-08-29 15:03:53 +04:00
Jin Ma
114f3266d8 Removed performance test. 2013-08-29 17:35:47 +08:00
Jin Ma
4f3349ffe4 Added perf namespace. 2013-08-29 16:24:26 +08:00
Jin Ma
0233c4c198 Removed whitespace. 2013-08-29 15:49:02 +08:00
Jin Ma
14e083f1e0 Removed trailing whitespace 2013-08-29 14:09:00 +08:00
Jin Ma
5728612f95 Removed the trailing whitespace 2013-08-29 14:06:03 +08:00
yao
ab235cda74 fix warnings 2013-08-29 11:59:19 +08:00
yao
26b5eb3e39 add adaptive bilateral filter (cpp and ocl version) 2013-08-29 10:48:15 +08: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
Vadim Pisarevsky
f12702be24 fixed bugs in rectangular morphology case 2013-08-28 19:53:40 +04:00
Roman Donchenko
11dcd4f4f3 Merge pull request #1356 from SpecLad:homography-uninit 2013-08-28 18:05:10 +04:00
Vadim Pisarevsky
771feb61c2 fixed building OpenCV with IPP 6.x (different DFT API); added Canny and rectangular morphology (based on Alex Kapustin patches) 2013-08-28 17:00:26 +04:00
Roman Donchenko
2b90b20be2 Merge pull request #1357 from SpecLad:less-precomps 2013-08-28 14:52:28 +04:00
Roman Donchenko
e59c74e1c7 Merge pull request #1348 from SpecLad:merge-2.4 2013-08-28 13:41:41 +04:00
Roman Donchenko
cdf6cf2cd8 Merge pull request #1213 from kdrobnyh:color 2013-08-28 13:31:09 +04:00
Roman Donchenko
122d0f8685 Deleted the now-empty ocl perf_precomp.cpp.
See pull request #1241 for why.
2013-08-28 13:26:30 +04:00
Roman Donchenko
5e4ebf3403 Fixed incomplete matrix initialization in HomographyRefineCallback. 2013-08-28 13:20:14 +04:00
Roman Donchenko
8bb9994094 Merge pull request #1349 from ilya-lavrenov:ocl_perf_finish 2013-08-28 12:46:01 +04:00
peng xiao
9f0a88c1d6 Remove trailing whitespace. 2013-08-28 16:23:46 +08:00
Roman Donchenko
10cb9a0c4a Merge pull request #1342 from nevion:master 2013-08-28 12:00:39 +04: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
Roman Donchenko
1840fd5f00 Merge pull request #1248 from vkocheganov:chi_square_alt 2013-08-28 11:44:41 +04: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
peng xiao
287c8a3330 Let ocl::context only be initialized once in retina_ocl test. 2013-08-28 09:17:05 +08:00
Fedor Morozov
9f9873017c HDR test changes 2013-08-28 02:17:49 +04:00
ilya-lavrenov
3c86aa4ae1 appended ocl::finish to test_cycle defines 2013-08-28 00:39:58 +04:00
Roman Donchenko
2d6f35d6ed Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/gpuwarping/src/cuda/resize.cu
	modules/gpuwarping/src/resize.cpp
	modules/gpuwarping/test/test_resize.cpp
	modules/ocl/perf/main.cpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_precomp.cpp
	modules/ocl/perf/perf_precomp.hpp
2013-08-27 19:15:47 +04:00
Roman Donchenko
dd25f416a6 War on Whitespace, master edition: tabs. 2013-08-27 17:13:53 +04:00
Roman Donchenko
9ed475cf52 War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00