Konstantin Matskevich
|
3495c5953c
|
fixes
|
2014-02-03 16:38:06 +04:00 |
|
Vadim Pisarevsky
|
de4b1c668d
|
hopefully fixed compile warnings and the doc builder warnings
|
2014-02-03 16:36:36 +04:00 |
|
Vadim Pisarevsky
|
b8c6adc569
|
Merge pull request #2178 from Nerei:viz_backport
|
2014-02-03 16:16:51 +04:00 |
|
Roman Donchenko
|
cd1ffd169c
|
Merge pull request #2261 from jet47:stitching-cuda-android
|
2014-02-03 15:35:55 +04:00 |
|
Roman Donchenko
|
652a0bd5ce
|
Merge pull request #2262 from SpecLad:merge-2.4
|
2014-02-03 15:33:41 +04:00 |
|
Vadim Pisarevsky
|
11926dafb2
|
eliminate crash in ipp-accelerated norm and mean functions (thanks to Matt Curfman and Aaron Kunze for the patch)
|
2014-02-03 15:31:32 +04:00 |
|
Vadim Pisarevsky
|
30593ee55e
|
3rd attempt to prepare patch with improved OpenCL kernels of CascadeClassifier.
|
2014-02-03 15:12:27 +04:00 |
|
Ilya Lavrenov
|
9a1e461450
|
fix for PR 2166
|
2014-02-03 14:47:32 +04:00 |
|
Konstantin Matskevich
|
5c38519c65
|
some changes
|
2014-02-03 14:46:53 +04:00 |
|
Konstantin Matskevich
|
3ea32b87bb
|
perf test
|
2014-02-03 14:46:52 +04:00 |
|
Konstantin Matskevich
|
9a62df1650
|
HOG
|
2014-02-03 14:46:52 +04:00 |
|
Alexander Alekhin
|
91ca834be9
|
bug fix for issue 3470
|
2014-02-03 14:46:22 +04:00 |
|
Andrey Pavlenko
|
0fef7f8b96
|
Merge pull request #2217 from ilya-lavrenov:tapi_superres
|
2014-02-03 14:38:59 +04:00 |
|
Konstantin Matskevich
|
ffeb223150
|
test for failure
|
2014-02-03 14:34:02 +04:00 |
|
Ilya Lavrenov
|
cc47edb850
|
more strict checks and reseting state
|
2014-02-03 14:32:25 +04:00 |
|
Konstantin Matskevich
|
aa23a842a1
|
test for failure
|
2014-02-03 14:32:25 +04:00 |
|
Andrey Pavlenko
|
13875b5fbc
|
Merge pull request #2257 from ilya-lavrenov:tapi_opencl_game2
|
2014-02-03 14:26:05 +04:00 |
|
Andrey Pavlenko
|
a1ad1f0800
|
Merge pull request #2259 from ilya-lavrenov:ocl_surf
|
2014-02-03 14:24:36 +04:00 |
|
Andrey Pavlenko
|
a2fcaccf8b
|
Merge pull request #2258 from ilya-lavrenov:tapi_video
|
2014-02-03 14:17:49 +04:00 |
|
Andrey Pavlenko
|
cb1e4b2ede
|
Merge pull request #2256 from ilya-lavrenov:tapi_matchTempl
|
2014-02-03 14:10:21 +04:00 |
|
Roman Donchenko
|
2bbda9d225
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/cudaimgproc/test/test_color.cpp
modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_imgproc.cpp
modules/java/generator/src/cpp/VideoCapture.cpp
samples/gpu/performance/CMakeLists.txt
samples/tapi/CMakeLists.txt
|
2014-02-03 13:23:59 +04:00 |
|
Vladislav Vinogradov
|
214cbabc40
|
update stitching sample
|
2014-02-03 12:55:03 +04:00 |
|
Vladislav Vinogradov
|
a138e5a6a5
|
turn on CUDA part of stitching module on Android for non-dynamic build
|
2014-02-03 12:35:24 +04:00 |
|
Roman Donchenko
|
206df7fdb1
|
Merge pull request #2255 from ilya-lavrenov:ocl_doc
|
2014-02-03 12:14:14 +04:00 |
|
Roman Donchenko
|
82330a51bd
|
Merge pull request #2253 from ilya-lavrenov:cuda
|
2014-02-03 12:12:12 +04:00 |
|
Roman Donchenko
|
c967069922
|
Merge pull request #2254 from ilya-lavrenov:opengl
|
2014-02-03 12:11:28 +04:00 |
|
Vladislav Vinogradov
|
d8f7377122
|
turn on CUDA part of nonfree module on Android for non-dynamic build
|
2014-02-03 11:52:43 +04:00 |
|
Ilya Lavrenov
|
ede5b23753
|
rewrote perf tests for SURF
|
2014-02-03 02:00:29 +04:00 |
|
Ilya Lavrenov
|
e844c08203
|
some fixes and improvements in cv::matchTemplate
|
2014-02-02 19:20:37 +04:00 |
|
Ilya Lavrenov
|
31b7cdc695
|
implemented OpenCL version of cv::updateMotionHistory
|
2014-02-02 17:52:57 +04:00 |
|
Anatoly Baksheev
|
1f5007f106
|
modified viz module header layout for 2.4 compatibility
|
2014-02-02 16:23:34 +04:00 |
|
Anatoly Baksheev
|
0a870faf28
|
added guard against linking qt5 and VTK together
|
2014-02-02 16:23:33 +04:00 |
|
Ilya Lavrenov
|
19f799ba1e
|
fix2 for OpenCL on/off
|
2014-02-02 15:35:13 +04:00 |
|
Ilya Lavrenov
|
02692f9ac0
|
fix MACRO
|
2014-02-01 22:43:41 +04:00 |
|
Andrey Pavlenko
|
75dde49b64
|
Merge pull request #2230 from ilya-lavrenov:tapi_openc_on-off_game
|
2014-02-01 22:32:39 +04:00 |
|
Ilya Lavrenov
|
f8dd9960af
|
one more ocl deletion
|
2014-02-01 21:50:14 +04:00 |
|
Ilya Lavrenov
|
66b2acc8ee
|
removed ocl from allmodules list
|
2014-02-01 20:55:50 +04:00 |
|
Ilya Lavrenov
|
ec3eb14138
|
unused function in case of unavailable OpenGL
|
2014-02-01 18:14:10 +04:00 |
|
Ilya Lavrenov
|
a6104bd025
|
fixed unused function in case of unavailable CUDA
|
2014-02-01 18:11:45 +04:00 |
|
Ilya Lavrenov
|
6ad4823f0c
|
ported superres to T-API
|
2014-02-01 17:20:18 +04:00 |
|
Scott Breyfogle
|
aaa9be7c65
|
Merge remote-tracking branch 'original/master' into constrained-hough-lines
|
2014-01-31 14:27:51 -08:00 |
|
Scott Breyfogle
|
b074c67a56
|
Add static cast to hough lines
|
2014-01-31 14:26:45 -08:00 |
|
Roman Donchenko
|
2bef73c968
|
Merge pull request #2249 from jet47:gpu-tests-disable
|
2014-01-31 20:49:05 +04:00 |
|
Roman Donchenko
|
a518d7a1cb
|
Merge pull request #2248 from jet47:gpu-npp-disable
|
2014-01-31 20:48:52 +04:00 |
|
Roman Donchenko
|
9ef8aeadd3
|
Merge pull request #2247 from jet47:gpu-test-cufft
|
2014-01-31 20:48:38 +04:00 |
|
Andrey Pavlenko
|
983799d398
|
Merge pull request #2219 from ilya-lavrenov:createHanningWindow
|
2014-01-31 19:38:57 +04:00 |
|
Ilya Lavrenov
|
0ebb3ab0ea
|
optimized createHanningWindow
|
2014-01-31 19:35:12 +04:00 |
|
Andrey Pavlenko
|
c909a21035
|
Merge pull request #2219 from ilya-lavrenov:createHanningWindow
|
2014-01-31 19:25:29 +04:00 |
|
Andrey Pavlenko
|
25d2ab8a68
|
Merge pull request #2218 from alalek:fix_defects_code_coverity
|
2014-01-31 19:23:02 +04:00 |
|
Andrey Pavlenko
|
6925dbd9f9
|
Merge pull request #2216 from ElenaGvozdeva:ocl_MOG2
|
2014-01-31 19:22:38 +04:00 |
|