Vladislav Vinogradov
|
9eea9835ab
|
switched to Input/Output Array in Color Processing
|
2013-07-17 11:39:52 +04:00 |
|
Roman Donchenko
|
feaa12a274
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/include/opencv2/core/version.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/initialization.cpp
modules/ocl/test/main.cpp
modules/superres/CMakeLists.txt
modules/superres/src/input_array_utility.cpp
modules/superres/src/input_array_utility.hpp
modules/superres/src/optical_flow.cpp
|
2013-07-16 11:52:41 +04:00 |
|
Roman Donchenko
|
ac39bfb4cc
|
Remove HAVE_CVCONFIG_H - it's always defined.
|
2013-07-10 16:02:07 +04:00 |
|
peng xiao
|
9b3c318e85
|
Add super resolution's OpenCL implementation.
Accuracy and performance tests are also provided.
|
2013-06-26 08:43:23 +08:00 |
|
Vladislav Vinogradov
|
12ae11e2ff
|
refactored Separable Linear Filters
|
2013-06-14 17:25:56 +04:00 |
|
Vladislav Vinogradov
|
76211709a3
|
refactored VideoReader (convert it to abstract interface)
also refactored VideoSource interface (made it simplier, now it has only 2 abstract methods)
|
2013-06-11 17:57:40 +04:00 |
|
Vladislav Vinogradov
|
439c3574ed
|
renamed gpu_private.hpp to private.gpu.hpp
|
2013-06-10 12:40:32 +04:00 |
|
Vladislav Vinogradov
|
4c9773d55f
|
renamed gpu headers (made it more consistent)
|
2013-06-10 12:40:30 +04:00 |
|
Vladislav Vinogradov
|
2fae1d9507
|
removed ogl::Texture2D support from InputArray
|
2013-06-10 12:40:30 +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
|
033dd77504
|
superres module fixes
|
2013-04-18 12:36:11 +04:00 |
|
Vladislav Vinogradov
|
1b00a3ed54
|
gpucodec module for video decoding/encoding
|
2013-04-18 11:33:29 +04:00 |
|
Vladislav Vinogradov
|
54e7c76d99
|
fixed compilation errors
|
2013-04-17 15:24:53 +04:00 |
|
Andrey Kamaev
|
5e048d1fa5
|
Move C API of opencv_objdetect to separate file
Also move cv::linemod to own header
|
2013-04-12 14:37:01 +04:00 |
|
Roman Donchenko
|
e8721f1f6f
|
Automatically add CUDA support to a module if it has CUDA sources.
Backport from master.
|
2013-04-10 12:20:54 +04:00 |
|
Vladislav Vinogradov
|
b50090f850
|
restore cudaSafeCall
|
2013-04-08 17:25:16 +04:00 |
|
Vladislav Vinogradov
|
910ef57109
|
renamed cuda namespace to cudev
|
2013-04-08 17:25:15 +04:00 |
|
Vladislav Vinogradov
|
204a19b431
|
moved common gpu utility functionality to gpu_private.hpp
|
2013-04-08 17:25:15 +04:00 |
|
Vladislav Vinogradov
|
28b1e81883
|
renamed device -> cuda
|
2013-04-08 17:25:15 +04:00 |
|
Vladislav Vinogradov
|
a57707b8d8
|
moved device layer to core module
|
2013-04-08 17:25:15 +04:00 |
|
Vladislav Vinogradov
|
bf6c08a9ea
|
fixed compilation with CUDA
|
2013-04-08 13:29:04 +04:00 |
|
Andrey Kamaev
|
517062039e
|
Make core/internal.hpp a private header
|
2013-04-01 17:29:10 +04:00 |
|
Andrey Kamaev
|
f77a375354
|
Merge branch '2.4'
|
2013-03-29 19:38:35 +04:00 |
|
Andrey Kamaev
|
8c41c614eb
|
Merge pull request #700 from cuda-geek/fix_build_with_cuda
fix master build with CUDA after latest 2.4 merge
|
2013-03-25 03:27:31 -07:00 |
|
marina.kolpakova
|
84f45e1e03
|
fixed build with CUDA after latest merge
|
2013-03-25 08:08:36 +04:00 |
|
Andrey Kamaev
|
be7bbe3aa9
|
Drop cv:: prefix from cv::String used inside the cv namespace
|
2013-03-22 22:14:50 +04:00 |
|
Andrey Kamaev
|
75513a46dc
|
Remove all include directives for <string>
|
2013-03-22 22:14:47 +04:00 |
|
Andrey Kamaev
|
2ad7b97f1c
|
All modules (except ocl and gpu) compiles and pass tests
|
2013-03-22 22:14:26 +04:00 |
|
Vladislav Vinogradov
|
f0b19d4659
|
updated license header in whole gpu module
|
2013-03-22 14:03:15 +04:00 |
|
Andrey Kamaev
|
1ca8f33b4e
|
Merge branch '2.4'
|
2013-03-21 23:11:54 +04:00 |
|
Vladislav Vinogradov
|
0a65f2f4af
|
merged gpunonfree and nonfree module
|
2013-03-18 16:14:37 +04:00 |
|
Vladislav Vinogradov
|
7a0d6f7733
|
Super Resolution module
|
2013-02-27 13:41:15 +04:00 |
|