Andrey Pavlenko
|
22146e4b18
|
Merge pull request #2234 from KonstantinMatskevich:ocl_tapi_hog
|
2014-02-04 16:35:12 +04:00 |
|
Andrey Pavlenko
|
bd6620fa87
|
Merge pull request #2252 from ilya-lavrenov:ocl_ref
|
2014-02-04 16:34:28 +04:00 |
|
Andrey Pavlenko
|
49db511882
|
Merge pull request #2268 from ilya-lavrenov:tapi_pow
|
2014-02-04 16:32:43 +04:00 |
|
Andrey Pavlenko
|
5968b8816e
|
Merge pull request #2275 from ElenaGvozdeva:ocl_matchTemplate
|
2014-02-04 16:32:11 +04:00 |
|
Alexander Smorkalov
|
0cd0e4749b
|
Tests install path fix for Android SDK.
|
2014-02-04 16:23:01 +04:00 |
|
Konstantin Matskevich
|
c684da3549
|
drawing
|
2014-02-04 11:09:29 +04:00 |
|
Elena Gvozdeva
|
85d519b6c3
|
fixed
|
2014-02-04 10:54:02 +04:00 |
|
Vladislav Vinogradov
|
286fe261d0
|
save previous values of LOCAL_* variables and restore them at the end
|
2014-02-04 10:29:43 +04:00 |
|
Vladislav Vinogradov
|
a098fb1803
|
fix path to CUDA libraries (use targets/armv7-linux-androideabi/lib)
|
2014-02-04 10:29:15 +04:00 |
|
Vadim Pisarevsky
|
8d5e952263
|
very preliminary port of SURF to T-API (compiles but certainly does not work)
|
2014-02-04 03:21:03 +04:00 |
|
Ilya Lavrenov
|
da5b316b4e
|
minor ocl.cpp refactoring
fix for cv::LUT and cv::transpose
|
2014-02-04 01:52:48 +04:00 |
|
Andrey Pavlenko
|
92c8b94ba9
|
Merge pull request #2265 from vpisarev:ocl_facedetect_amd3
|
2014-02-04 00:39:09 +04:00 |
|
Ilya Lavrenov
|
98b72ff389
|
optimized cv::pow for integer power
|
2014-02-03 22:36:57 +04:00 |
|
Andrey Pavlenko
|
9dede73d9f
|
Merge pull request #2153 from scottbreyfogle:constrained-hough-lines
|
2014-02-03 17:35:15 +04:00 |
|
Andrey Pavlenko
|
810dc262ad
|
Merge pull request #2196 from KonstantinMatskevich:ocl_bugcautching
|
2014-02-03 17:32:20 +04:00 |
|
Andrey Pavlenko
|
b3a48e1eed
|
Merge pull request #2264 from alalek:bug_fix_3470
|
2014-02-03 17:31:57 +04:00 |
|
Roman Donchenko
|
109e71e4ef
|
Merge pull request #2263 from ilya-lavrenov:include_fix
|
2014-02-03 17:25:12 +04:00 |
|
Vadim Pisarevsky
|
b5d8f4d5e5
|
Merge pull request #2031 from berak:b_flann_timer_30
|
2014-02-03 17:00:21 +04:00 |
|
Vadim Pisarevsky
|
7cfb7bc8cd
|
Merge pull request #2120 from prclibo:master
|
2014-02-03 16:59:04 +04:00 |
|
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
|
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 |
|