Elena Gvozdeva
|
0edd0aaf69
|
fixed
|
2014-01-28 16:23:39 +04:00 |
|
Elena Gvozdeva
|
1391ca1da5
|
Added ocl_Mog2
|
2014-01-28 16:23:38 +04:00 |
|
Roman Donchenko
|
84c29745f2
|
Merge pull request #2211 from SpecLad:merge-2.4
|
2014-01-28 12:44:29 +04:00 |
|
Andrey Pavlenko
|
6deda99f07
|
Merge pull request #2207 from ilya-lavrenov:tapi_macro
|
2014-01-27 18:56:06 +04:00 |
|
Ilya Lavrenov
|
78c2b3ca2a
|
refactored imgproc
|
2014-01-27 18:47:16 +04:00 |
|
Andrey Pavlenko
|
d9b24457fa
|
Merge pull request #2208 from alalek:ocl_dynload_warn
|
2014-01-27 18:24:14 +04:00 |
|
Andrey Pavlenko
|
ce48b6afde
|
Merge pull request #2203 from ilya-lavrenov:tapi_umat_vectors
|
2014-01-27 16:06:12 +04:00 |
|
Andrey Pavlenko
|
4dd805b7a9
|
Merge pull request #2206 from ilya-lavrenov:ocl_warn_fix
|
2014-01-27 16:05:54 +04:00 |
|
Roman Donchenko
|
bbc35d609d
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectPython.cmake
cmake/OpenCVModule.cmake
modules/core/src/gpumat.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/CMakeLists.txt
modules/gpu/src/cuda/generalized_hough.cu
modules/gpu/src/generalized_hough.cpp
modules/python/CMakeLists.txt
|
2014-01-27 15:28:14 +04:00 |
|
Alexander Alekhin
|
1ff9a8ef52
|
core/ocl: added warning about incompatible configuration
|
2014-01-27 13:52:52 +04:00 |
|
Ilya Lavrenov
|
c8f2050cc2
|
warn fix
|
2014-01-27 12:34:30 +04:00 |
|
Ilya Lavrenov
|
321782b9b7
|
added macro with ability of returning values
|
2014-01-27 12:32:26 +04:00 |
|
Ilya Lavrenov
|
f767077a41
|
fixed condition
|
2014-01-27 12:00:53 +04:00 |
|
Ilya Lavrenov
|
2dd294cc84
|
fixed cv::split; enabled test
|
2014-01-27 12:00:53 +04:00 |
|
Ilya Lavrenov
|
fa5492343a
|
added STD_VECTOR_UMAT support to _OutputArray::create
|
2014-01-27 11:59:59 +04:00 |
|
Andrey Pavlenko
|
06acf7090c
|
Merge pull request #2027 from AD-530:brief_cl
|
2014-01-27 09:49:46 +04:00 |
|
Andrey Pavlenko
|
a64d3c1744
|
Merge pull request #2155 from vbystricky:ocl_calcOpticalFlowPyrLK
|
2014-01-25 17:08:07 +04:00 |
|
Andrey Pavlenko
|
1db8aa8628
|
Merge pull request #2204 from ilya-lavrenov:tapi_stitch_perf_fix
|
2014-01-25 16:54:00 +04:00 |
|
Andrey Pavlenko
|
3f61007563
|
Merge pull request #2191 from ilya-lavrenov:tapi_macro
|
2014-01-25 16:32:54 +04:00 |
|
Ilya Lavrenov
|
7184925105
|
fix
|
2014-01-25 11:50:28 +04:00 |
|
Ilya Lavrenov
|
7f785e0a11
|
refactored core using new macro
|
2014-01-24 23:59:00 +04:00 |
|
vbystricky
|
bb09d44e0a
|
Unused code removed
|
2014-01-24 17:37:54 +04:00 |
|
vbystricky
|
27fb7e1802
|
Change type of result vector of ocl version from row to column
|
2014-01-24 17:37:53 +04:00 |
|
vbystricky
|
094bc92318
|
Fix build error
|
2014-01-24 17:37:53 +04:00 |
|
vbystricky
|
a7e5a488a8
|
Change method of setting arguments to kernel to safe one
|
2014-01-24 17:37:52 +04:00 |
|
vbystricky
|
e96ba8140c
|
Grow up epsilon for sanity checks
|
2014-01-24 17:37:52 +04:00 |
|
vbystricky
|
3a798a27e5
|
Add perfomance test
|
2014-01-24 17:37:52 +04:00 |
|
vbystricky
|
ece635bf3c
|
Fix builds errors
|
2014-01-24 17:37:51 +04:00 |
|
vbystricky
|
3ba6636651
|
Fix builds errors
|
2014-01-24 17:37:51 +04:00 |
|
vbystricky
|
33fc46cdec
|
Validate parameters for using OpenCL version, before upload UMat
|
2014-01-24 17:37:50 +04:00 |
|
vbystricky
|
4152135e63
|
Fix error with some opencl functions on the build WITH_OPENCL=OFF
|
2014-01-24 17:37:50 +04:00 |
|
vbystricky
|
c57e427fba
|
Move OpticalFlowPyrLK from ocl module to video module
|
2014-01-24 17:37:50 +04:00 |
|
Andrey Pavlenko
|
ac3f06bc7f
|
Merge pull request #2149 from ElenaGvozdeva:ocl_matchTemplate
|
2014-01-24 17:33:06 +04:00 |
|
Ilya Lavrenov
|
cc514ac7a9
|
added new macros useful for tracking whether OpenCL impl run or not
|
2014-01-24 17:16:40 +04:00 |
|
Andrey Pavlenko
|
22c804d97c
|
Merge pull request #2182 from KonstantinMatskevich:ocl_tapi_samples
|
2014-01-24 17:03:42 +04:00 |
|
Andrey Pavlenko
|
5424c55565
|
Merge pull request #2142 from KonstantinMatskevich:ocl_tapi_bfmatcher
|
2014-01-24 16:50:03 +04:00 |
|
Andrey Pavlenko
|
b0caa588ec
|
Merge pull request #2190 from KonstantinMatskevich:ocl_dumpinfo
|
2014-01-24 16:44:19 +04:00 |
|
Konstantin Matskevich
|
c7a6537b83
|
add brackets
|
2014-01-24 16:35:51 +04:00 |
|
Andrey Pavlenko
|
d093cb54d5
|
Merge pull request #2194 from apavlenko:2.4_perf_haar_iter
|
2014-01-24 16:13:19 +04:00 |
|
Roman Donchenko
|
24caa80143
|
Merge pull request #2197 from asmorkalov:ocv_packaging2
|
2014-01-24 14:27:44 +04:00 |
|
Konstantin Matskevich
|
ae827a638c
|
fixes
|
2014-01-24 14:01:31 +04:00 |
|
Konstantin Matskevich
|
07778e1760
|
fixes
|
2014-01-24 13:37:19 +04:00 |
|
Konstantin Matskevich
|
450ea3131f
|
samples
|
2014-01-24 12:59:19 +04:00 |
|
Alexander Smorkalov
|
086792ec06
|
Improvements in package build.
|
2014-01-24 12:00:44 +04:00 |
|
Elena Gvozdeva
|
07a88d48e9
|
fixed
|
2014-01-24 11:41:23 +04:00 |
|
Andrey Pavlenko
|
0a4a1d7526
|
temporary disabling hanging test
|
2014-01-24 10:07:21 +04:00 |
|
Roman Donchenko
|
078d49609e
|
Merge pull request #2193 from apavlenko:2.4_lic_remove
|
2014-01-23 17:13:52 +04:00 |
|
Andrey Pavlenko
|
dca5684145
|
removing duplicated legacy license, the actual instance is in 'opencv/LICENSE'
|
2014-01-23 17:05:20 +04:00 |
|
Elena Gvozdeva
|
4d86804f11
|
Fixed merge conflicts
|
2014-01-23 15:31:32 +04:00 |
|
Elena Gvozdeva
|
7bd8f9294d
|
fixed
|
2014-01-23 14:50:30 +04:00 |
|