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
|
12f16b7a26
|
nonfree module fixes
|
2013-04-18 12:36:11 +04:00 |
|
Andrey Kamaev
|
8b294c6c90
|
Remove documentation for old python wrapper
|
2013-04-12 19:37:40 +04:00 |
|
Andrey Kamaev
|
3b364330ad
|
Merge branch '2.4'
|
2013-04-12 15:35:38 +04:00 |
|
Andrey Kamaev
|
36028bd8ad
|
Merge pull request #808 from bitwangyaoyao:2.4_mac
|
2013-04-12 14:59:45 +04:00 |
|
Andrey Kamaev
|
8406312571
|
Remove C API from OpenCL module
|
2013-04-12 14:37:02 +04:00 |
|
Andrey Kamaev
|
bd59bc3e4a
|
Remove ifdef __cplusplus from nonfree headers
|
2013-04-12 14:37:02 +04:00 |
|
yao
|
719e8674ad
|
fix the compile errors on Mac
|
2013-04-12 17:38:59 +08:00 |
|
Andrey Kamaev
|
e5a33723fc
|
Move C API of opencv_calib3d to separate file
|
2013-04-11 21:00:17 +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 |
|
Andrey Kamaev
|
913e6833d5
|
Merge pull request #785 from taka-no-me:split_c_cpp2
|
2013-04-09 08:53:50 +04:00 |
|
Vladislav Vinogradov
|
068fb03011
|
fixed compilation warnings
|
2013-04-08 17:25:16 +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
|
1bb141c465
|
fixed build
|
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 |
|
Andrey Kamaev
|
dd74a851f3
|
Fix build errors
|
2013-04-08 17:10:31 +04:00 |
|
Andrey Kamaev
|
288a0634c2
|
Make imgproc.hpp independent from C API
|
2013-04-08 15:47:28 +04:00 |
|
Andrey Kamaev
|
7ac0d86992
|
Merge pull request #786 from cuda-geek:fix-build-gpu-off-cuda-on
|
2013-04-08 15:11:28 +04:00 |
|
marina.kolpakova
|
780a8cc149
|
fix build without gpu module with cuda
|
2013-04-08 14:13:19 +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
|
642d7d6826
|
fixed nonfree test (run it only on one gpu device)
|
2013-04-02 13:24:39 +04:00 |
|
Vladislav Vinogradov
|
9086efa8e9
|
fixed warnings
|
2013-04-02 13:24:00 +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
|
56d62118d5
|
Merge pull request #707 from pengx17:2.4_surf
|
2013-03-29 18:20:45 +04:00 |
|
Vladislav Vinogradov
|
2661c2e213
|
fixed warnings
|
2013-03-28 11:49:47 +04:00 |
|
peng xiao
|
f2ecf4f905
|
Disable ocl::SURF accurate test
|
2013-03-27 13:25:08 +08:00 |
|
peng xiao
|
ad58c084a9
|
Fix compiler errors
|
2013-03-27 08:56:31 +08:00 |
|
peng xiao
|
8ffc15371d
|
Fix compiler errors
|
2013-03-26 17:23:38 +08:00 |
|
peng xiao
|
7476bf5cd7
|
Fix compiler errors
|
2013-03-26 16:40:30 +08: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 |
|
peng xiao
|
9698079ca5
|
Pass warp size into SURF
|
2013-03-26 15:48:15 +08:00 |
|
peng xiao
|
f7b40cdc63
|
Add a macro to call additional barrier function on the fly
|
2013-03-26 11:51:02 +08: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
|
2ad7b97f1c
|
All modules (except ocl and gpu) compiles and pass tests
|
2013-03-22 22:14:26 +04:00 |
|
Andrey Kamaev
|
82d7292ee7
|
Merge pull request #680 from vpisarev:c2cpp_video_take2
|
2013-03-22 19:34:53 +04:00 |
|
Andrey Kamaev
|
2c9f651230
|
Merge pull request #688 from jet47:fix-nonfree-compilation
|
2013-03-22 17:18:40 +04:00 |
|
Vladislav Vinogradov
|
f0b19d4659
|
updated license header in whole gpu module
|
2013-03-22 14:03:15 +04:00 |
|
Vladislav Vinogradov
|
3ef2e1136f
|
fixed nonfree compilation with gpu (perf tests)
|
2013-03-22 10:20:57 +04:00 |
|
Andrey Kamaev
|
1ca8f33b4e
|
Merge branch '2.4'
|
2013-03-21 23:11:54 +04:00 |
|
Andrey Kamaev
|
b6365699ee
|
Merge pull request #664 from taka-no-me/ocl
Move OpenCL SURF to nonfree module
|
2013-03-21 09:01:59 -07:00 |
|
Andrey Kamaev
|
4bd721ad3b
|
Fix build errors
|
2013-03-21 18:37:34 +04:00 |
|
Andrey Kamaev
|
1b4afcca30
|
Move OpenCl SURF perf tests to nonfree and fix build of samples
|
2013-03-21 18:19:52 +04:00 |
|
Andrey Kamaev
|
7b8ad4cb04
|
Refactor OpenCL initialization and allow to use ocl module witout explicit setup
|
2013-03-21 18:18:15 +04:00 |
|