Roman Donchenko
|
4d06c4c7b6
|
Merge commit '43aec5ad^' into merge-2.4
Conflicts:
modules/contrib/src/inputoutput.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpuarithm/perf/perf_element_operations.cpp
modules/gpuarithm/src/element_operations.cpp
modules/ts/src/precomp.hpp
|
2013-08-27 13:23:26 +04:00 |
|
Vladislav Vinogradov
|
8461cb3f4b
|
refactored gpu::convolve function:
* converted it to Algorithm
* old API still can be used for source compatibility (marked as deprecated)
|
2013-06-11 17:58:05 +04:00 |
|
Vladislav Vinogradov
|
8fcef225fb
|
switched to Input/Output Array in reductions operations
|
2013-06-11 17:58:05 +04:00 |
|
Vladislav Vinogradov
|
3eeaa9189c
|
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
|
2013-06-07 13:05:39 +04:00 |
|
Andrey Kamaev
|
416fb50594
|
Revert "Merge pull request #836 from jet47:gpu-modules"
This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.
|
2013-04-18 15:03:50 +04:00 |
|
Vladislav Vinogradov
|
b4f3d08725
|
gpuarithm module fixes
|
2013-04-18 11:33:34 +04:00 |
|