Vladislav Vinogradov
12f16b7a26
nonfree module fixes
2013-04-18 12:36:11 +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
yao
719e8674ad
fix the compile errors on Mac
2013-04-12 17:38:59 +08: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
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
Andrey Kamaev
dd74a851f3
Fix build errors
2013-04-08 17:10:31 +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
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
Vladislav Vinogradov
2661c2e213
fixed warnings
2013-03-28 11:49:47 +04: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
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
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
Andrey Kamaev
4bd721ad3b
Fix build errors
2013-03-21 18:37:34 +04:00
Andrey Kamaev
dd678121b3
Trying to make ocl surf work
...
1. Added more sync to reduction.
2. Turned off Image2D feature. Probably its support is not detected correctly.
3. Temporary disabled descriptor tests - can't localize a problem of the ocl descriptor.
2013-03-21 18:16:59 +04:00
Andrey Kamaev
6846f881a2
Move OpenCL SURF to nonfree module
2013-03-21 17:59:35 +04:00
Vadim Pisarevsky
07e0f7bf59
refactored video module; use the new-style algorithms now
2013-03-20 19:51:49 +04:00
Andrey Kamaev
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
Vladislav Vinogradov
0a65f2f4af
merged gpunonfree and nonfree module
2013-03-18 16:14:37 +04:00
Andrey Kamaev
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
Andrey Kamaev
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
Vadim Pisarevsky
1f261c2f9d
changed default parameters of SURF, which improved its performance. Restored bi-linear interpolation in SURF descriptor extractor. Added test for SURF homography + check for non-zero (positive) responses.
2013-01-30 18:07:37 +04:00
Vadim Pisarevsky
c69312ea0d
fixed #2580 , #2210 . some work on #2025 .
...
modified SIFT to 1) double image before finding keypoints, 2) use floating-point internally instead of 16-bit integers, 3) set the keypoint response to the abs(interpolated_DoG_value). step 1) increases the number of detected keypoints significantly and together with 2) and 3) it improves some detection benchmarks. On the other hand, the stability of the small keypoints is lower, so the rotation and scale invariance tests now struggle a bit. In 2.5 need to make this feature optional and add some more intelligence to the algorithm.
added test that finds a planar object using SIFT.
2013-01-29 19:38:56 +04:00
Anna Kogan
608fab60fd
Added cleanup of keypoints vector
2013-01-22 18:05:18 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Andrey Kamaev
bcd0aefbca
Fix gcc build errors and warnings
2012-09-05 15:51:51 +04:00
marina.kolpakova
4fa282e1a9
fixed SURf according to clockwise descriptor convention
2012-07-25 13:08:05 +04:00
marina.kolpakova
fdfa402428
fixed surf for upright case
2012-07-25 12:19:08 +04:00
Maria Dimashova
2c0455da17
changed sift angles according to KeyPoint::angle specification in r9034
2012-07-14 16:02:45 +00:00
Alexander Mordvintsev
ffd283b7d5
fixed SURF orientations, broken in r8892
...
(see also r8895, r8887 and #2043 )
2012-07-11 16:26:52 +00:00
Andrey Kamaev
3869d38671
fixed typo in SURF detector #2149
2012-07-09 10:47:09 +00:00
