Commit Graph

8986 Commits

Author SHA1 Message Date
Dominik Rose
e32700cf8f dc1394-2: support for operation mode 1394b added 2013-06-27 15:05:32 +02:00
Roman Donchenko
d76468c223 Merge pull request #1040 from asmorkalov:winrt 2013-06-27 16:59:25 +04:00
Roman Donchenko
5d7419e658 Merge pull request #1056 from asmorkalov:android_old_remove 2013-06-27 16:29:56 +04:00
Roman Donchenko
51008322c5 Merge pull request #1057 from SpecLad:gtest-param-filter 2013-06-27 15:50:31 +04:00
Alexander Smorkalov
7c5bd78804 Test fixes
Calib3d badarg tests fixed. Default exception handling enabled;
Highgui Video I/O tests fixed on ARM;
Code cleanup.
2013-06-27 15:47:37 +04:00
Alexander Smorkalov
070a77ae0d TBB updated to version 4.1 update 4. 2013-06-27 15:47:23 +04:00
Roman Donchenko
4f19216e45 Merge pull request #1036 from jet47:fix-gpu-deviceinfo 2013-06-27 15:37:42 +04:00
Roman Donchenko
664b720e4d Extended Google Test to allow filtering by parameter value. 2013-06-27 13:14:37 +04:00
Roman Donchenko
f477696cc5 Merge pull request #1050 from pengx17:2.4_clach_mod 2013-06-27 12:22:01 +04:00
Alexander Smorkalov
e241c14b94 OpenCV Library and Manager version incremented.
OpenCV Version 2.4.6;
OpenCV Manager Version 2.8;
Doc fixes.
2013-06-27 12:05:25 +04:00
Roman Donchenko
c1f8d9e3d2 Merge pull request #1011 from wecacuee:master 2013-06-27 12:03:07 +04:00
Alexander Smorkalov
5de7627806 Old android folder removed.
The changes must be applied after buildbot update only!
2013-06-27 11:26:51 +04:00
peng xiao
b2da1cdcc2 Temporarily disable command queue release as it causes program hang at exit 2013-06-27 10:20:21 +08:00
peng xiao
fc64faa22e Remove empty cv::ocl::CLAHE class. 2013-06-27 10:06:37 +08:00
peng xiao
dcc4766129 Fix white-spacing 2013-06-27 09:57:42 +08:00
Vikas Dhiman
f15dc72b89 Removed misleading comment and added the divisibility test to ::run function. 2013-06-26 12:16:25 -04:00
Roman Donchenko
76efc9853a Merge pull request #1053 from snosov1:unreliable-results-fix 2013-06-26 17:00:15 +04:00
Roman Donchenko
bf6b119a3f Merge pull request #1045 from bitwangyaoyao:2.4_fix 2013-06-26 16:55:06 +04:00
Roman Donchenko
1cfe5aa41e Merge pull request #1048 from SpecLad:xls-conf 2013-06-26 16:53:50 +04:00
Alexander Smorkalov
347c86d9b5 Windows RT related code cleanup.
Windows RT sample cleanup.
Video I/O code cleanup.
2013-06-26 05:44:10 -07:00
Roman Donchenko
53afdb4b30 Merge pull request #1041 from abidrahmank:master 2013-06-26 16:38:54 +04:00
Roman Donchenko
a335fc591f Merge pull request #1052 from SpecLad:ocl-mingw-warnings 2013-06-26 16:13:47 +04:00
Sergei Nosov
29955620e0 multiruns added to avoid the 'unreliable results' error 2013-06-26 15:07:39 +04:00
Roman Donchenko
5b2b76763e Fix miscellaneous warnings from compiling with MinGW.
Note that MinGW defines NOMINMAX by default.
2013-06-26 14:59:00 +04:00
peng xiao
9270205947 Fix build errors 2013-06-26 17:24:09 +08:00
yao
2ec1140b25 fix pyrlk 2013-06-26 16:58:20 +08:00
peng xiao
132b885b24 Add opencl implementation of Farnback optical flow. 2013-06-26 16:35:19 +08:00
peng xiao
cc3fb3d182 Let CLAHE_OCL reuse cv::CLAHE abstract class. 2013-06-26 10:50:51 +08:00
Vladislav Vinogradov
3c32fc1329 removed obsolete methods from gpu::Stream 2013-06-25 17:45:23 +04:00
Roman Donchenko
f36f8067bc Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/calib3d/include/opencv2/calib3d/calib3d.hpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/cuda/limits.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/matrix.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/hog.cpp
	modules/ocl/test/test_haar.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/test_pyrup.cpp
	modules/ts/src/precomp.hpp
	samples/ocl/facedetect.cpp
	samples/ocl/hog.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/surf_matcher.cpp
2013-06-25 15:55:52 +04:00
Roman Donchenko
1dccf5743e Merge pull request #1024 from jet47:fix-gpuarithm-compilation 2013-06-25 14:38:18 +04:00
Alexander Smorkalov
91c519467d WinRT build fix for samples and static libs. 2013-06-25 03:36:07 -07:00
Alexander Smorkalov
b0854c605a Windows RT sample improved.
Corrent histogram output on YUV image implemented;
Some code refactoring done.
2013-06-25 03:36:05 -07:00
Alexander Smorkalov
bf22567c09 Transform selection implemented in sample GUI.
Gistogram output does not work propertly due color conversion problems.
2013-06-25 03:36:04 -07:00
Alexander Smorkalov
de9f659f1e Several transforms added to sample IMFTransform. 2013-06-25 03:36:03 -07:00
Alexander Smorkalov
9e06287121 Windows RT sample updated.
Unused scenarious removed.
Grey scale convertion replaced with cv::Canny call.
2013-06-25 03:36:01 -07:00
Alexander Smorkalov
4990336760 Base camera access sample for Windows RT added.
Microsoft Media Foundation Camera Sample for Windows RT added.
2013-06-25 03:36:00 -07:00
Alexander Smorkalov
ee591efb9f Build fix for Windows RT. 2013-06-25 03:35:58 -07:00
Alexander Smorkalov
34c6598752 Perf test failure fixes for Media Foundation. 2013-06-25 03:35:57 -07:00
Alexander Smorkalov
2bc1d3709c GetProperty method for MSMF VideoCapture implemented. 2013-06-25 03:35:56 -07:00
Alexander Smorkalov
08a0e1c91b TBB support for WinRT fixed.
Development release of TBB with WinRT support added;
TBB.dll is placed in bin folder now.
2013-06-25 03:35:54 -07:00
Alexander Smorkalov
43122939cb Media foundation video i/o fixes.
Bug in Video for Windows capture init fixed;
Media Foundation based capture finalization fixed;
Highgui tests for video i/o updated.
2013-06-25 03:35:30 -07:00
yao
1227e00f3d fix moments 2013-06-25 16:26:33 +08:00
Roman Donchenko
381057eaad Merge pull request #1002 from asmorkalov:doc_warning_fix 2013-06-25 11:42:00 +04:00
Roman Donchenko
f8e187e1e1 Merge pull request #1035 from SpecLad:cv-concurrency 2013-06-25 11:33:16 +04:00
Roman Donchenko
e6784ca8a0 Merge pull request #1021 from alekcac:platforms 2013-06-25 11:32:52 +04:00
yao
dbdeff2069 fix stereobm crash on some cpu ocl 2013-06-25 14:12:02 +08:00
yao
6db776f957 add "-c" for cpu ocl mode in perf tests 2013-06-25 14:11:28 +08:00
Roman Donchenko
c244f000ab Merge pull request #1030 from SpecLad:ts-impl-variants 2013-06-24 18:28:13 +04:00
Roman Donchenko
961251f0ca Merge pull request #1029 from SpecLad:have-qt-config 2013-06-24 17:03:51 +04:00