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
|
58c4d0eaeb
|
switched to Input/Output Array in cart<->polar operations
|
2013-06-11 17:58:04 +04:00 |
|
Vladislav Vinogradov
|
0a83817ace
|
switched to Input/Output Array in gpu::threshold
|
2013-06-11 17:58:04 +04:00 |
|
Vladislav Vinogradov
|
44ec450b53
|
switched to Input/Output Array in gpu::addWeighted
|
2013-06-11 17:58:04 +04:00 |
|
Vladislav Vinogradov
|
ec70282bf7
|
switched to Input/Output Array in min/max operations
|
2013-06-11 17:58:04 +04:00 |
|
Vladislav Vinogradov
|
f2aa6ebe15
|
switched to Input/Output Array in shift operations
|
2013-06-11 17:58:04 +04:00 |
|
Vladislav Vinogradov
|
d81f54db0b
|
switched to Input/Output Array in bitwise logical operations
|
2013-06-11 17:58:04 +04:00 |
|
Vladislav Vinogradov
|
04a1a6dd8f
|
switched to Input/Output Array in gpu::compare
|
2013-06-11 17:58:04 +04:00 |
|
Vladislav Vinogradov
|
b866890b27
|
switched to Input/Output Array in abs, sqr, sqrt, exp, log, pow
|
2013-06-11 17:58:04 +04:00 |
|
Vladislav Vinogradov
|
5ec8c51b98
|
switched to Input/Output Array in gpu::absdiff
|
2013-06-11 17:58:03 +04:00 |
|
Vladislav Vinogradov
|
3ee12cbeb4
|
switched to Input/Output Array in gpu::divide
|
2013-06-11 17:58:03 +04:00 |
|
Vladislav Vinogradov
|
4595e3aa3e
|
switched to Input/Output Array in gpu::multiply
|
2013-06-11 17:58:03 +04:00 |
|
Vladislav Vinogradov
|
ffa25be3d2
|
added arithm_op function to reduce code duplication
|
2013-06-11 17:58:03 +04:00 |
|
Vladislav Vinogradov
|
5330faf5a0
|
switched to Input/Output Array in gpu::subtract
|
2013-06-11 17:58:03 +04:00 |
|
Vladislav Vinogradov
|
4ebbf69134
|
switched to Input/Output Array in gpu::add
|
2013-06-11 17:58:03 +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 fba72cb60d27905cce9f1390250adf13d5355c03, reversing
changes made to 02131ffb620f349617a65da334591eca5d3cb23b.
|
2013-04-18 15:03:50 +04:00 |
|
Vladislav Vinogradov
|
b4f3d08725
|
gpuarithm module fixes
|
2013-04-18 11:33:34 +04:00 |
|
Vladislav Vinogradov
|
31c8b527c6
|
gpuarithm module for arithmetics operations on matrices
|
2013-04-18 11:33:30 +04:00 |
|