Alexander Smorkalov
|
358e59e91b
|
Fake dependency from CUDA in case of satic linkage with OpenCV removed.
|
2013-12-26 13:07:53 +04:00 |
|
Roman Donchenko
|
b94963d381
|
Merge pull request #2052 from SpecLad:seporate
|
2013-12-26 12:22:46 +04:00 |
|
Alexander Smorkalov
|
e79c875fe2
|
Java wrappers for functions from cv::gpu namespace in core module added.
|
2013-12-26 12:13:23 +04:00 |
|
Roman Donchenko
|
24be7b26cd
|
Merge pull request #2049 from asmorkalov:android_cuda_warning_fix
|
2013-12-26 12:07:01 +04:00 |
|
Alexander Smorkalov
|
0206f419c1
|
ts dependency from CUDA runtime removed. All implicit CUDA calls replaced by calls from core module.
|
2013-12-26 11:36:00 +04:00 |
|
Konstantin Matskevich
|
52df2b346b
|
not synchronous kernel's run
|
2013-12-26 10:45:09 +04:00 |
|
Alexander Smorkalov
|
1e038e2837
|
CUDA warning fix/supporession for Android.
|
2013-12-26 10:17:38 +04:00 |
|
Alexander Smorkalov
|
4aa9f83100
|
Dynamic CUDA support library name fixed. Additional error messages added.
|
2013-12-26 10:16:29 +04:00 |
|
Konstantin Matskevich
|
7a186c72e1
|
some fixes
|
2013-12-26 09:55:18 +04:00 |
|
Konstantin Matskevich
|
f55c85fed3
|
morphology
|
2013-12-26 09:55:17 +04:00 |
|
Alexander Alekhin
|
217b2282b8
|
fixes
|
2013-12-26 03:06:58 +04:00 |
|
Vadim Pisarevsky
|
83f749afd2
|
moments work now and work more or less fast
|
2013-12-26 02:57:08 +04:00 |
|
Andrey Pavlenko
|
65b020f0d3
|
Merge pull request #2046 from ilya-lavrenov:tapi_inrange
|
2013-12-26 00:14:23 +04:00 |
|
Andrey Pavlenko
|
6e8386f705
|
Merge pull request #1984 from ilya-lavrenov:tapi_perf
|
2013-12-26 00:13:28 +04:00 |
|
Andrey Pavlenko
|
1aaeea9941
|
Merge pull request #2053 from KonstantinMatskevich:ocl_bugfix_eqhist
|
2013-12-26 00:05:13 +04:00 |
|
Vadim Pisarevsky
|
6035925f41
|
experimental moments implementation (does not work yet)
|
2013-12-25 21:09:23 +04:00 |
|
Roman Donchenko
|
1acc1085d2
|
Merge pull request #2017 from pemmanuelviel:flannMemoryLeak
|
2013-12-25 19:36:49 +04:00 |
|
Andrey Pavlenko
|
512ddcc804
|
Merge pull request #2043 from ilya-lavrenov:tapi_hack
|
2013-12-25 19:00:26 +04:00 |
|
Andrey Pavlenko
|
9ec4c20280
|
Merge pull request #2042 from vpisarev:ocl_facedetect8
|
2013-12-25 19:00:06 +04:00 |
|
Ilya Lavrenov
|
4c23059209
|
added cv::inRange to T-API
|
2013-12-25 18:22:41 +04:00 |
|
Ilya Lavrenov
|
d7c22343aa
|
added perf tests for T-API core functions
|
2013-12-25 18:19:40 +04:00 |
|
vbystricky
|
9e05d18d42
|
Fix compilation warnings
|
2013-12-25 18:05:07 +04:00 |
|
vbystricky
|
35dc26e0b9
|
Add ocl implementation of the sepFilter2D into img_proc module.
|
2013-12-25 16:48:32 +04:00 |
|
Roman Donchenko
|
faddd5b97f
|
Merge pull request #2045 from SpecLad:merge-2.4
|
2013-12-25 16:18:00 +04:00 |
|
Alexander Alekhin
|
e49065b1dc
|
core/ocl: temporary move device selection from ocl module
|
2013-12-25 16:17:40 +04:00 |
|
Konstantin Matskevich
|
9d04a7aba9
|
bugfix in equalizeHist
|
2013-12-25 15:16:26 +04:00 |
|
Roman Donchenko
|
83fe2f3b16
|
Fixed the seporate/seporator typo everywhere.
|
2013-12-25 14:04:44 +04:00 |
|
Roman Donchenko
|
1e27b07e29
|
Merge pull request #2051 from AlexWillisson:patch-2
|
2013-12-25 13:14:14 +04:00 |
|
Alex Willisson
|
4293a54447
|
Fixed typo in comment
|
2013-12-24 19:53:50 -05:00 |
|
Matthias Bady
|
928924d248
|
Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl
|
2013-12-23 19:47:06 +01:00 |
|
Ilya Lavrenov
|
a70467d7a2
|
removed unnecessary assert
|
2013-12-23 21:51:25 +04:00 |
|
Vadim Pisarevsky
|
bc730292bb
|
workaround for some strange bug on old Mac.
|
2013-12-23 21:29:31 +04:00 |
|
Andrey Pavlenko
|
0966e5ffa1
|
Merge pull request #2033 from ilya-lavrenov:tapi_normalize
|
2013-12-23 19:19:00 +04:00 |
|
Ilya Lavrenov
|
e3d23918fa
|
added cv::normalize to T-API; implemented missed UMat::copyTo with mask
|
2013-12-23 19:17:35 +04:00 |
|
Andrey Pavlenko
|
6a2fb8e5d1
|
Merge pull request #2041 from ilya-lavrenov:tapi_mul_div
|
2013-12-23 19:09:59 +04:00 |
|
Roman Donchenko
|
3c4b24d531
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
CMakeLists.txt
modules/highgui/src/cap.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/color.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/facedetect.cpp
|
2013-12-23 18:50:17 +04:00 |
|
Vadim Pisarevsky
|
8998186ce4
|
removed extra whitespaces and hopefully fixed the test failures
|
2013-12-23 18:41:54 +04:00 |
|
Roman Donchenko
|
edce617a58
|
Merge pull request #2040 from asmorkalov:android_mk_fix
|
2013-12-23 18:02:18 +04:00 |
|
Alexander Smorkalov
|
51d3138dff
|
OCV option ENABLE_DYNAMIC_CUDA mistake fix.
|
2013-12-23 16:40:31 +04:00 |
|
Roman Donchenko
|
83cdd43a4c
|
Merge pull request #2039 from asmorkalov:ocv_version_inc3
|
2013-12-23 15:53:11 +04:00 |
|
Vadim Pisarevsky
|
d084d19779
|
added OpenCL optimization for LBP-based face detector
|
2013-12-23 15:28:50 +04:00 |
|
Andrey Pavlenko
|
06e981f1ce
|
Merge pull request #2035 from ilya-lavrenov:tapi_CamShift
|
2013-12-23 13:00:22 +04:00 |
|
Alexander Smorkalov
|
58e7d9f32f
|
OpenCV.mk fixed for accurate CUDA support.
|
2013-12-23 12:58:12 +04:00 |
|
Roman Donchenko
|
f22d9a232d
|
Merge pull request #2022 from asmorkalov:ocv_dynamic_cuda
|
2013-12-23 12:45:49 +04:00 |
|
Alexander Smorkalov
|
4ec1930949
|
OpenCV version++; OpenCV Manager version++.
|
2013-12-23 12:35:06 +04:00 |
|
Alexander Smorkalov
|
bc72f4d2a2
|
Code review fixes.
|
2013-12-23 11:34:46 +04:00 |
|
GregoryMorse
|
08d8faf9da
|
Update system.cpp
Add native C++ support
|
2013-12-23 00:21:51 +08:00 |
|
Ilya Lavrenov
|
febb200eee
|
fixed cv::multuply, cv::divide
|
2013-12-22 15:49:36 +04:00 |
|
Ilya Lavrenov
|
6083efc111
|
refactored cv::CamShift and cv::meanShift
|
2013-12-21 14:40:59 +04:00 |
|
Andrey Pavlenko
|
f9268d34dc
|
Merge pull request #2023 from krodyush:pullreq/2.4-opt-131126-cvt
|
2013-12-21 12:44:06 +04:00 |
|