Commit Graph

174 Commits

Author SHA1 Message Date
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
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
1be58f9a00 SURF accuracy test is moved to nonfree 2013-03-21 18:15:46 +04:00
Andrey Kamaev
6846f881a2 Move OpenCL SURF to nonfree module 2013-03-21 17:59:35 +04:00
Vladislav Vinogradov
0149969463 disable tests that requires video support if it is not available 2013-03-21 13:40:07 +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
a42a0f5fca Added compatibility headers 2013-03-13 17:26:56 +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
Andrey Kamaev
61079547f0 Merge branch '2.4' 2013-02-01 14:59:40 +04:00
Andrey Kamaev
e3b45910aa Temporary disable unstable Features2d_RotationInvariance_Detector_SIFT test 2013-01-31 16:06:22 +04:00
Andrey Kamaev
57d3152cd0 Merge branch '2.4' 2013-01-31 14:35:27 +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
Andrey Kamaev
7572b4d400 Merge branch '2.4' 2013-01-30 15:12:50 +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
Andrey Kamaev
f4e27bcbbc Merge branch '2.4' 2013-01-25 16:30:36 +04:00
Andrey Kamaev
78dc44a7fd Merge pull request #295 from apavlenko:test_surf_keypoints_invariance 2013-01-23 14:40:05 +04:00
Anna Kogan
608fab60fd Added cleanup of keypoints vector 2013-01-22 18:05:18 +04:00
Andrey Pavlenko
9f0d5f60b5 fixinf warning on non-Windows systems 2013-01-14 18:15:51 +04:00
Andrey Pavlenko
8e42ca1764 SURF keypoints rotation invariance test.
It calcs kpts for a cross and checks that 4 kpts at the edges have equal responce.
2013-01-14 14:06:00 +04:00
Andrey Kamaev
f5cd20d80b Merge branch 2.4 2012-12-14 14:46:41 +04:00
Andrey Kamaev
932204d197 Added thresholds to some sanity checks 2012-12-12 20:14:20 +04:00
Andrey Kamaev
9719ea93b6 Merge branch 2.4 2012-11-13 19:54:48 +04:00
Andrey Kamaev
a126532cb7 Fix OS X build warnings 2012-11-09 11:29:52 +04:00
Andrey Kamaev
4d059e9e5b Merge release 2.4.3 2012-11-02 17:58:02 +04:00
marina.kolpakova
7a5b9a6b7f replase __APPLE__ marco with __clang__ 2012-11-01 19:34:05 +04:00
Andrey Kamaev
2b0072d823 Suppress more warnings in gtest on OS X 2012-10-24 20:36:30 +04:00
Andrey Kamaev
73bbabf207 Eliminate discrepancies between signatures in documentation and OpenCV headers
All errors were found by doc/check_docs2.py
2012-10-18 13:03:12 +04:00
Andrey Kamaev
461b69f6ee Eliminate discrepancies between signatures in documentation and OpenCV headers
All errors were found by doc/check_docs2.py
2012-10-17 21:24:55 +04:00
OpenCV Buildbot
81f826db2b Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Andrey Kamaev
a07cc84436 Fix binary compatibility of opencv_nonfree 2012-10-17 02:09:31 +04:00
Andrey Kamaev
d970a9159e Add sanity checks to nonfree module 2012-10-09 19:17:58 +04:00
Vadim Pisarevsky
06a13d9ba0 replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet 2012-10-02 23:07:46 +04:00
Vadim Pisarevsky
84087a8566 fixed crash in Python's SURF wrapper (bug #2325) 2012-09-11 16:47:25 +04:00
Andrey Kamaev
bcd0aefbca Fix gcc build errors and warnings 2012-09-05 15:51:51 +04:00
Andrey Kamaev
1a621c2916 Fix build warnings 2012-08-19 19:36:43 +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
cfeb28f2ba fixed tests for scale invariance (uncommented sift test, it's ok now) 2012-07-16 16:21:40 +00:00
Maria Dimashova
2556bb04f0 changed tests for rotation/scale invariance of descriptors 2012-07-16 13:01:55 +00:00
Maria Dimashova
ec23d9bb5e added tests on scale invariance of detectors and descriptors 2012-07-15 17:42:41 +00:00
Maria Dimashova
e4e00498a8 fixed typo in test class names 2012-07-14 20:32:31 +00:00
Maria Dimashova
0c6480d89b added tests to check rotation invariance of descriptors (features2d and nonfree) 2012-07-14 20:03:07 +00:00
Maria Dimashova
5120d690f0 fixed nonfree rotation invariance tests for detectors 2012-07-14 16:07:48 +00:00
Maria Dimashova
2c0455da17 changed sift angles according to KeyPoint::angle specification in r9034 2012-07-14 16:02:45 +00:00
Maria Dimashova
2bd86e2541 fixed compile errors under win 2012-07-14 13:25:41 +00:00
Maria Dimashova
30c611f1d5 added tests to check rotation invariance of detectors 2012-07-13 18:03:20 +00:00
Maria Dimashova
438c1444eb added test to check keypoints returned by FeatureDetector (center, size, angle) 2012-07-12 17:52:49 +00:00
Alexander Mordvintsev
c5669448a3 work on features2d python interface 2012-07-11 17:13:43 +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
Vincent Rabaud
c52d620817 update the docs for cvExtractSURF and initModule_nonfree() 2012-07-10 19:09:00 +00:00