generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
11,771 Commits 3 Branches 47 Tags
Commit Graph

8398 Commits

Author SHA1 Message Date
Ilya Lavrenov
0c49360318 fixed typo 2014-01-01 19:41:14 +04:00
Vadim Pisarevsky
1c3bfae212 Merge pull request #1957 from Nerei:format_declaration_by_default 2013-12-31 15:55:00 +04:00
Roman Donchenko
cd576c7364 Merge pull request #2096 from kamjagin:master 2013-12-31 11:53:25 +04:00
Andrey Pavlenko
2d5723ccca Merge pull request #2095 from ilya-lavrenov:tapi_mixchannels_fix 2013-12-31 00:35:39 +04:00
Andrey Pavlenko
967703c3ac Merge pull request #2093 from SpecLad:merge-2.4 2013-12-31 00:26:22 +04:00
Andrey Pavlenko
8a456c5a6b Merge pull request #2073 from KonstantinMatskevich:ocl_tapi_clahe 2013-12-31 00:17:33 +04:00
Miroslav Kobetski
3f07655231 Fix for bug #3469 CV_XADD failing in clang+nvcc combination 2013-12-30 17:00:17 +01:00
Andrey Pavlenko
8151571dd6 Merge pull request #2091 from ilya-lavrenov:tapi_convertScaleAbs 2013-12-30 19:54:27 +04:00
Ilya Lavrenov
3e1bec5248 added OpenCL version of cv::patchNaNs 2013-12-30 19:53:03 +04:00
Ilya Lavrenov
a2e683d133 fixed umat access 2013-12-30 19:37:20 +04:00
Roman Donchenko
cdc10defa3 Merge commit '05b9c991dd' into merge-2.4 
Conflicts:
	modules/cuda/test/test_objdetect.cpp
	modules/gpu/perf/perf_core.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpu/test/test_core.cpp
 2013-12-30 17:30:59 +04:00
Roman Donchenko
1312eca220 Merge commit '0566ab4d3d' into merge-2.4 
Conflicts:
	modules/core/src/system.cpp
 2013-12-30 16:51:46 +04:00
Roman Donchenko
7f795e964f Merge commit 'ee36717d' into merge-2.4 2013-12-30 16:49:39 +04:00
Roman Donchenko
9dfb96389c Merge commit '4b885e206' into merge-2.4 2013-12-30 16:48:45 +04:00
Roman Donchenko
09e154d214 Merge commit '60906d917' into merge-2.4 
Conflicts:
	modules/ts/src/cuda_perf.cpp
 2013-12-30 16:47:05 +04:00
Roman Donchenko
0e552ea6e2 Merge commit '1acc1085d' into merge-2.4 2013-12-30 16:37:39 +04:00
Roman Donchenko
9b7e77ccda Merge commit '83cdd43a' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/version.hpp
 2013-12-30 16:36:35 +04:00
Konstantin Matskevich
55634c1f52 fix 2013-12-30 13:06:32 +04:00
Ilya Lavrenov
c4c913ff13 converted CPU-based example to T-API (Mat 2 UMat, etc) 2013-12-30 03:19:17 +04:00
Ilya Lavrenov
6b64257c81 added OpenCL version of cv::scaleAdd 2013-12-29 18:46:25 +04:00
Ilya Lavrenov
abcf8d9e61 implemented OpenCL version of cv::convertScaleAbs 2013-12-29 18:01:19 +04:00
Andrey Pavlenko
4a6c2ce378 Merge pull request #2081 from ilya-lavrenov:tapi_perf 2013-12-28 22:06:12 +04:00
Andrey Pavlenko
dbaf125fcd Merge pull request #2075 from ilya-lavrenov:tapi_mixchannels 2013-12-28 22:05:49 +04:00
Andrey Pavlenko
0913dd7ffa Merge pull request #2055 from vbystricky:ocl_sepFilter2D 2013-12-27 22:38:08 +04:00
Ilya Lavrenov
bb7e96311e disabled cv::split perf test 2013-12-27 21:57:20 +04:00
Roman Donchenko
05b9c991dd Merge pull request #2083 from jet47:gpu_android_tests 2013-12-27 21:09:18 +04:00
Roman Donchenko
46be47cb4b Merge pull request #2080 from asmorkalov:ocv_dynamic_cuda_deviceinfo_fix 2013-12-27 20:53:42 +04:00
Roman Donchenko
2d2312d742 Merge pull request #2077 from ilya-lavrenov:tapi_context 2013-12-27 20:23:57 +04:00
Ilya Lavrenov
31e6251793 added new perf tests to core 2013-12-27 20:02:12 +04:00
Roman Donchenko
4eb9b9d6cf Merge pull request #2082 from asmorkalov:dynamicuda_internal_fix 2013-12-27 19:58:57 +04:00
Vladislav Vinogradov
53494ba397 increase thresholds for some tests 2013-12-27 18:20:14 +04:00
Vladislav Vinogradov
15678efe84 disable 2 problematic tests 2013-12-27 18:20:01 +04:00
Vladislav Vinogradov
8399568edf disabled GEMM test if library was built without CUBLAS 2013-12-27 18:19:29 +04:00
Roman Donchenko
0566ab4d3d Merge pull request #2078 from ilya-lavrenov:warn 2013-12-27 18:17:21 +04:00
Alexander Smorkalov
df63060e4d Bugfix for DeviceInfoFuncTable in dynamicuda amd core modules. 2013-12-27 18:04:10 +04:00
Alexander Smorkalov
4175916b2a dynamicuda became private module. 2013-12-27 17:19:38 +04:00
vbystricky
26d53c7435 Change threshold from 2.0 to 1.0 in the test 2013-12-27 16:26:34 +04:00
vbystricky
b719ed79c2 Change sprintf to cv::format, and EXPECT_MAT_NEAR to OCL_EXPECT_MATS_NEAR 2013-12-27 16:21:32 +04:00
Andrey Pavlenko
80816f68f3 Merge pull request #2034 from pentschev:ocl_features2d_orb_master 2013-12-27 15:49:28 +04:00
Andrey Pavlenko
5c25d821b1 Merge pull request #2063 from vpisarev:ocl_moments 2013-12-27 15:44:12 +04:00
Andrey Pavlenko
d649f47eeb Merge pull request #2072 from pengx17:patch-3 2013-12-27 15:36:24 +04:00
Ilya Lavrenov
d014cb8fb4 fixed warning [-Wempty-body] 2013-12-27 14:44:58 +04:00
Ilya Lavrenov
f221f57c7c this commit prevents segfaults in case of opencl disabled 2013-12-27 14:02:03 +04:00
Ilya Lavrenov
73c96cbd50 some fixes of cv::mixChannels 2013-12-27 13:59:55 +04:00
Ilya Lavrenov
2eab07f0a4 disabled cv::dft opencl impl for CPU devices 2013-12-27 13:39:29 +04:00
Ilya Lavrenov
52b8bb6761 fixed getUMatIndex 2013-12-27 13:18:31 +04:00
Ilya Lavrenov
a7d2830d3f added cv::mixChannels to T-API 2013-12-27 13:14:37 +04:00
Roman Donchenko
c45492371a Merge pull request #2036 from GregoryMorse:patch-1 2013-12-27 12:44:02 +04:00
Roman Donchenko
719149877e Merge pull request #2074 from asmorkalov:android_nonfree_cuda 2013-12-27 12:43:49 +04:00
Roman Donchenko
ee36717db4 Merge pull request #2037 from GregoryMorse:patch-2 2013-12-27 12:11:52 +04:00