Roman Donchenko
|
029fce10c9
|
Merge remote-tracking branch 'origin/2.4'
Conflicts:
3rdparty/libjasper/CMakeLists.txt
cmake/OpenCVDetectOpenCL.cmake
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/imgproc/src/floodfill.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_or.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor.cl
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
modules/ocl/src/stereobm.cpp
modules/ocl/test/precomp.hpp
modules/python/src2/api
modules/ts/src/ts_func.cpp
samples/gpu/bgfg_segm.cpp
|
2013-05-21 17:19:23 +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
|
84de6ce036
|
gpufilters module for image filtering
|
2013-04-18 11:33:30 +04:00 |
|
Vladislav Vinogradov
|
31c8b527c6
|
gpuarithm module for arithmetics operations on matrices
|
2013-04-18 11:33:30 +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
|
67073daf19
|
Merge branch '2.4'
|
2013-04-05 21:11:59 +04:00 |
|
Vladislav Vinogradov
|
870563ba25
|
fixed compilation warning for CUDA files
command line option '-Wsign-promo' is valid for C++/ObjC++ but not for C [enabled by default]
|
2013-04-03 13:47:59 +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 |
|
Vladislav Vinogradov
|
4dbd0f0e8f
|
fixed compilation issues with gpu modules:
* disabled warnings from thrust
* fixed warnings from ts_gtest.h
* possibly fixed superres compilation in Debug mode on Windows
|
2013-03-26 12:33:13 +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
|
abc9ef6809
|
moved utility functions from gpu_perf_test and gpu_test to ts module
|
2013-03-18 14:06:19 +04:00 |
|
Vladislav Vinogradov
|
7a0d6f7733
|
Super Resolution module
|
2013-02-27 13:41:15 +04:00 |
|