Commit Graph

339 Commits

Author SHA1 Message Date
Andrey Kamaev
25213d88a8 fixed compilation problems with new SIFT on Android 2011-06-01 12:42:44 +00:00
Anatoly Baksheev
68a94665e5 compilation for windows 2011-06-01 08:19:21 +00:00
Vincent Rabaud
f21fadfa49 - serialize/deserialize the edge threshold too 2011-06-01 03:26:08 +00:00
Vincent Rabaud
7ca26c040f - make sure we rescale the input keypoints 2011-06-01 03:25:53 +00:00
Vincent Rabaud
211c112b91 - hide the patch size from the user (only one is used now as training was only done at that scale)
- enable a border_threshold just like for SIFt so that calling ORB, or descriptor after feature gives the same number of features
2011-06-01 02:09:31 +00:00
Ethan Rublee
ce94e4a994 Fix # of features in orb. 2011-06-01 00:25:32 +00:00
Alexander Shishkov
b644505bdf fixed compilation problems with new SIFT on Windows 2011-05-31 22:51:16 +00:00
Alexander Shishkov
389bd146c4 fixed compilation problems with new SIFT on MacOs 2011-05-31 22:03:55 +00:00
Maria Dimashova
035fd0019b replaced SIFT implementation (Some default parameters can be changed in the near future) 2011-05-31 18:18:02 +00:00
Maria Dimashova
8c0c773bf2 commented opponent descriptor test (temporarily) 2011-05-31 18:05:43 +00:00
Maria Dimashova
ef5d7278ea removed evaluation testbetch to sample 2011-05-31 15:30:49 +00:00
Vadim Pisarevsky
af2af3af9b added KeyPoint::hash() (ticket #1100) 2011-05-31 14:24:45 +00:00
Maria Dimashova
8a61375875 fixed drawKeypoints (keypoint orientation) 2011-05-30 09:11:27 +00:00
Ilya Lysenkov
5a3e7d041f Added drawing of a new image for debugging of the SimpleBlobDetector class. 2011-05-30 06:54:59 +00:00
Ethan Rublee
93326c7dc0 Adding a default constructor to ORB that initializes. Had segfaults on non
initialized orb detector.
2011-05-27 17:17:02 +00:00
Maria Dimashova
0b0baa0cf5 removed test output 2011-05-27 12:18:44 +00:00
Maria Dimashova
33493f4e19 renamed WITH(HAVE)_EIGEN2 to WITH(HAVE)_EIGEN, fixed compilation error if eigen3 is used (#805) 2011-05-27 12:15:36 +00:00
Vincent Rabaud
8a2c434260 - set the right comparison distance for ORB 2011-05-25 03:19:36 +00:00
Vincent Rabaud
9806306d3d - fix the test for ORB (it's a binary feature) 2011-05-25 00:34:25 +00:00
Vincent Rabaud
909e484e74 - fix a possible crash when only asking for features and not descriptors 2011-05-25 00:33:50 +00:00
Leonid Beynenson
555e9c64bc Small change in the SURF algorithm to be sure that without TBB the template parallel_for is not used
(the reason: the parallelization in the SURF algorithm conflicts with ThreadingFramework, which is a temporary substitute of TBB for ARMs)
2011-05-24 16:13:55 +00:00
Vadim Pisarevsky
76e4c2007b fixed vector resize in the ORB detector 2011-05-24 13:31:50 +00:00
Vincent Rabaud
974799acd8 - fix possible crash introduced by cvRound 2011-05-23 20:03:16 +00:00
Vadim Pisarevsky
145a76faf4 fixed features2d (ORB) compile errors on Windows 2011-05-23 07:58:35 +00:00
Vadim Pisarevsky
f2a337f990 fixed several typos, including the old ones from ticket #854 2011-05-21 20:17:45 +00:00
Vadim Pisarevsky
23768b1826 replaced #include <some_opencv_hdr> with #include "some_opencv_hdr" (ticket #719) 2011-05-21 18:32:34 +00:00
Vincent Rabaud
9170ff6f5e - assign some members outside the header (fixes #1081) 2011-05-21 17:27:38 +00:00
Kirill Kornyakov
92d1262f87 bugfix for Windows x64, Visual Studio 10 2011-05-21 15:09:54 +00:00
Vincent Rabaud
dc37ad803e - add missing tests for ORB
- remove useless code for 2.3
2011-05-20 23:53:22 +00:00
Vincent Rabaud
4b1f183bcd - adding ORB 2011-05-20 22:25:53 +00:00
Maria Dimashova
983f4f1621 minor changes of recall-precision output 2011-05-20 12:14:35 +00:00
Vadim Pisarevsky
62569f6926 fixed a few warnings on Windows; fixed critical bugs in cvMixChannels and AutoBuffer<>. 2011-05-17 15:44:01 +00:00
Elena Fedotova
f80c93aa82 Purpose: updated the feature2d chapter 2011-05-15 20:56:53 +00:00
Maria Dimashova
8acce4e31f some renames 2011-05-15 09:19:05 +00:00
Vadim Pisarevsky
facff37e82 reviewed ? marks in features2d 2011-05-11 23:31:50 +00:00
Anatoly Baksheev
c49dc37761 [+] added use_folders cmake feature if cmake version is greater then 2.8.0
[~] fixed warning in featuers2d under windows (can't generate assignment operator)
2011-05-11 13:37:20 +00:00
Maria Dimashova
c46b510f4c restored 2 methods (for backward compatibility) 2011-05-11 12:59:36 +00:00
Maria Dimashova
af28d19b3a extended the constructor parameters of AdjusterAdapter's inheritors 2011-05-11 12:13:58 +00:00
Maria Dimashova
c98c87d545 fixed DynamicAdaptedFeatureDetector 2011-05-11 11:53:53 +00:00
Elena Fedotova
12d98a7d18 Purpose: completed the feature2d chapter 2011-05-08 15:30:00 +00:00
Elena Fedotova
4f335d18fb Purpose: completed the feature2d chapter 2011-05-08 09:31:15 +00:00
Elena Fedotova
7ad698f076 Purpose: updated the feature2d chapter 2011-05-08 09:09:39 +00:00
Elena Fedotova
53e9d8354e Purpose: updated the feature2d chapter 2011-05-08 08:59:23 +00:00
Elena Fedotova
4a21c6d394 Purpose: updated the feature2d chapter 2011-05-08 08:35:08 +00:00
Anatoly Baksheev
1c18e5fef9 fixed ~300 warnings under windows (had to hack gtest a bit) 2011-05-06 21:45:48 +00:00
Elena Fedotova
dee0aba92e Purpose: updated the feature2d chapter 2011-05-06 20:08:11 +00:00
Andrey Kamaev
9f29506d2c Refactored NEON optimization usage 2011-05-06 12:24:56 +00:00
Vadim Pisarevsky
f39db3f15a fixed problems indicated with ? marks 2011-05-05 13:31:54 +00:00
Maria Dimashova
66c116ec6a fixed #1044 2011-05-05 10:10:46 +00:00
Elena Fedotova
916ec81d09 Purpose: updated the feature2d chapter 2011-05-04 19:22:51 +00:00
Elena Fedotova
af6072814c Purpose: updated the feature2d chapter 2011-05-03 20:41:11 +00:00
Vadim Pisarevsky
6432267de8 corrected angular difference check in MSER test (thanks to Pieter-Jan Busschaert for the patch) 2011-05-03 12:58:58 +00:00
Maria Dimashova
b9662e099c added the filtering of keypoints having zero size (#877) 2011-05-01 17:38:52 +00:00
Vadim Pisarevsky
23a9b7bb9c fixed several warnings from Xcode 4 LLVM compiler; fixed bug #920 2011-04-30 19:29:26 +00:00
Maria Dimashova
e7ef84b2c2 fixed #932 2011-04-29 17:12:55 +00:00
Maria Dimashova
fa6400843e fixed #982 2011-04-29 16:42:38 +00:00
Maria Dimashova
34a18f79e1 fixed #832 2011-04-29 14:37:02 +00:00
Maria Dimashova
e202b13069 fixed bug in knnMatch method 2011-04-29 14:12:17 +00:00
Alexander Shishkov
de93fdb1af fixed bug in knnMatch method 2011-04-29 13:23:22 +00:00
Andrey Kamaev
cc1c613313 Fixed #998 and #999: OpponentSIFT and OpponentSURF regression tests failure on Android 2011-04-20 07:33:05 +00:00
Vadim Pisarevsky
e9a5bbc003 fixed ?? marks; fixed missing highlighting in some of the sections 2011-04-19 11:41:12 +00:00
Vladimir Dudnik
8e7768379f minor changes: removed trailing spaces in some files 2011-04-18 19:34:51 +00:00
Vadim Pisarevsky
abeeb40d46 a big patch; use special proxy types (Input/OutputArray, Input/OutputArrayOfArrays) for passing in vectors, matrices etc. 2011-04-17 13:14:45 +00:00
Andrey Kamaev
b906ad3108 Test system included into Android build 2011-04-11 14:47:06 +00:00
Maria Dimashova
b1e0f2a45e to test buildbot (1) 2011-04-02 15:01:44 +00:00
Maria Dimashova
f9d9b3893b to test buildbot 2011-04-02 14:18:32 +00:00
Maria Dimashova
afd5683cb6 removed duplicated comments 2011-04-02 07:49:31 +00:00
Maria Dimashova
c820438b22 restored several tests on features2d after moving on google tests 2011-04-01 14:21:46 +00:00
Vincent Rabaud
3ac48de183 - speed up the Hamming distance 2011-03-28 04:36:39 +00:00
Ethan Rublee
6c2cdb6772 Applying fix described in ticket #910. sift was not being built for arm... 2011-03-15 16:31:53 +00:00
Vincent Rabaud
28c2d3b89f - replace the linear search in a sorted list by the appropriate algorithm 2011-03-13 00:31:17 +00:00
Vadim Pisarevsky
5c3447c125 added pictures for OpenCV 2.x reference manual; fixed some build problems and done some more cleanup work 2011-03-05 21:26:13 +00:00
Vadim Pisarevsky
f025e4739a some more doc cleanup 2011-03-03 07:29:55 +00:00
Vadim Pisarevsky
4bb893aa9f the first round of cleaning up the RST docs 2011-02-28 21:26:43 +00:00
Vadim Pisarevsky
24ccbccf63 cleaned RST formatting a bit 2011-02-26 11:05:10 +00:00
Vadim Pisarevsky
d7b3e254dd removed duplicated SIFT points (reported by Luca Del Tongo) 2011-02-25 11:14:00 +00:00
Vadim Pisarevsky
371aa08006 OpenCV reference manual (C++ part only for now) is now produced directly from RST, not from TeX. 2011-02-22 20:43:26 +00:00
Vadim Pisarevsky
65a7f13af3 replaced alloca() (a.k.a. cvStackAlloc) with AutoBuffer or vector() everywhere. cvStackAlloc() is still defined, but we do not need alloca() anymore to compile and run OpenCV (fixes #889 and may be some others) 2011-02-18 10:29:57 +00:00
Vadim Pisarevsky
d9ab1d2b92 fixed build on Windows with MSVC2010 2011-02-09 22:45:45 +00:00
Vadim Pisarevsky
061b49e0b2 reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine. 2011-02-09 20:55:11 +00:00
Ilya Lysenkov
f8e9f65ea8 Added detection of asymmetric circles' pattern 2011-02-07 07:57:32 +00:00
Ethan Rublee
885cef7660 Minor fix to pop count based hamming distance. Being consistent with type. 2011-02-07 05:10:14 +00:00
Maria Dimashova
8d36926271 moved flannIndex to protected section again 2011-02-02 15:47:08 +00:00
Maria Dimashova
3ae5a314e3 moved flannIndex to public section (temporarily) 2011-02-01 17:38:11 +00:00
Maria Dimashova
0e8bc8c71b changed border type to float 2011-01-31 17:10:47 +00:00
Maria Dimashova
c562d79121 changed border type to float 2011-01-31 16:45:12 +00:00
Maria Dimashova
fd1f644e39 fixed #772 (added empty implementation of SIFT class methods throwing exception if ARM) 2011-01-31 16:23:26 +00:00
Maria Dimashova
79d8d50cbe forgot to commit in the last time 2011-01-31 14:48:15 +00:00
Maria Dimashova
9b4c682623 added empty() method to common features2d classes; fixed #831 2011-01-31 14:18:50 +00:00
Maria Dimashova
1748f65f54 fixed ticket #823 2011-01-31 09:51:17 +00:00
Ethan Rublee
a47b6c23f5 revert the hamming distance to use unsigned long, on 64bit machines, using size_t
with __build_popcountl doesn't return correct number of bits. the ll version should work, but for simplicity,
locking it down to long for now.  TODO add a unit test for the Hamming distance.
2011-01-24 16:59:14 +00:00
Maria Dimashova
b63b3df522 minor fixed 2011-01-21 16:07:28 +00:00
Ethan Rublee
1e1a139270 fixing bug related to using the hamming distance on descriptors whose length is not divisible by sizeof(size_t). 2011-01-20 02:36:46 +00:00
Maria Dimashova
a16d304d52 fixed compile error 2011-01-12 12:46:26 +00:00
Maria Dimashova
96d88f0673 fixed FernDescriptorMatcher (#765) 2011-01-12 12:03:03 +00:00
Maria Dimashova
655120febc fixed collisions between std::transform() and cv::transform() (#781) 2011-01-12 06:39:08 +00:00
Ilya Lysenkov
2d5a984c28 Moved BlobDetector to features2d 2010-12-27 09:15:08 +00:00
Ilya Lysenkov
dc9e5eda19 Moved PlanarObjectDetector to the objdetect module 2010-12-27 08:25:31 +00:00
Vladimir Dudnik
8511c9fcb8 cosmetic changes, removed trailing spaces 2010-12-23 23:03:15 +00:00
Vladimir Dudnik
e92d0e4bc2 cosmetic changes 2010-12-23 23:01:18 +00:00
Vadim Pisarevsky
196d45bc3e undo the latest change in SURF 2010-11-30 16:36:26 +00:00
Vadim Pisarevsky
2c0015e765 temporarily turn off TBB threading when computing SURF descriptors (as the parallel version seems to produce different descriptors on each run) 2010-11-30 16:27:12 +00:00
Maria Dimashova
7c4cff994c fixed sift descriptor 2010-11-29 13:44:10 +00:00
Ethan Rublee
64f9f7f23c Adding optimization for brief and android using NEON SIMD intrinsics 2010-11-28 05:41:50 +00:00
Vadim Pisarevsky
01c1003d51 fixed warnings and errors reported by VS2010 2010-11-26 18:25:30 +00:00
Maria Dimashova
5802ea39b1 fixed warnings of gcc 2010-11-26 12:15:08 +00:00
Maria Dimashova
354be115f2 made MaskPredicate safer (#419) 2010-11-26 10:57:01 +00:00
Maria Dimashova
dfe4af9e1d fixed warnings under win32 2010-11-26 10:35:48 +00:00
Vadim Pisarevsky
1286c1db45 fixed multiple warnings from VS2010. 2010-11-25 16:55:46 +00:00
Maria Dimashova
7e5c11a920 added tests for some detectors; made features2d object create functions as static classes methods; fixed OpponentColorDescriptorExtractor, BriefDescriptorExtractor (on rgb); renamed DynamicDetector 2010-11-25 15:59:37 +00:00
Vadim Pisarevsky
b7e9c6229b fifixed compile problem on VS2010 64-bit. fixed L1 and L2 distances 2010-11-25 10:05:03 +00:00
Maria Dimashova
c46546203f fixed compile error under win32 2010-11-25 09:22:22 +00:00
Maria Dimashova
0a2881adcd added to DetectorExtractor test the check of compute() on empty data. Added test for BRIEF. 2010-11-24 16:03:11 +00:00
Ethan Rublee
6a689d82a3 Continue to refeactor the dynamic stuff - may have broken build on last commit.
Fairly certain that it builds now.
2010-11-23 22:45:49 +00:00
Ethan Rublee
f6b0818996 refactoring dynamic detectors 2010-11-23 22:26:36 +00:00
Maria Dimashova
c6e43c385d updated documentation on features2d; minor features2d changes 2010-11-23 17:00:55 +00:00
Vladislav Vinogradov
35e8d700c6 fixed compile errors 2010-11-23 09:00:32 +00:00
Ethan Rublee
da05e6609a Adding some dynamic feature detectors... 2010-11-22 23:59:25 +00:00
Maria Dimashova
e406dfee44 refactored features2d and sample on matching to many images 2010-11-22 18:27:08 +00:00
Vadim Pisarevsky
17a5e02eca integrated multi-threaded version of SURF (thanks to imahon and yvo2m for the patch; see ticket #275) 2010-11-22 17:02:51 +00:00
Maria Dimashova
0af4d09aa9 fixed linker error undo mingw (#657) 2010-11-16 15:42:31 +00:00
Maria Dimashova
0ad9edfbd5 removed unnecessary fix 2010-11-16 15:27:40 +00:00
Vadim Pisarevsky
6eb36a5569 keep the SURFPoint.laplacian as KeyPoint.class_id (ticket #341) 2010-11-15 21:08:28 +00:00
Vadim Pisarevsky
e20994d41c added range check in the keypoint interpolation in SURF algorithm (ticket #497) 2010-11-15 20:26:21 +00:00
Ethan Rublee
d84931e456 small brief edit, was trying to allow user to pass integral image but this introduced some bugs, so no longer doing this...
for now.
2010-11-15 18:14:14 +00:00
Vadim Pisarevsky
08b7855edc extended out << mat/vec operators; added opencv license 2010-11-15 17:40:57 +00:00
Maria Dimashova
7bd4ba990a fixed compile error undo win32 (due to int32_t using) 2010-11-15 10:24:38 +00:00
Ethan Rublee
d84b970bf2 adding the Brief descriptor, associated hamming distance functors for bruteforce matching. Also adding cout << cv::Mat functions in core. 2010-11-14 06:27:48 +00:00
Maria Dimashova
7192bf951c minor 2010-11-12 14:04:35 +00:00
Maria Dimashova
e3ee2677c7 added CV_EXPORTS to OpponentColorDescriptorExtractor 2010-11-12 08:20:51 +00:00
Victor Erukhimov
b4c38f905a Fixed a build problem in windows 2010-11-11 20:00:19 +00:00
Maria Dimashova
cb3711d51d fixed SURF::operator() (#423) 2010-11-11 16:06:22 +00:00
Maria Dimashova
b12588f702 fixed MserFeatureDetector 2010-11-11 15:45:54 +00:00
Maria Dimashova
d7c86bbcdc minor change of BOW 2010-11-08 15:21:56 +00:00
Vadim Pisarevsky
ced8192174 fixed several GCC warnings; fixed crash in kmeans test (because of cv::swap(Mat&a, Mat&b)) (ticket #616) 2010-11-04 15:59:10 +00:00
Vadim Pisarevsky
8a8ba57b20 fixed building Python wrappers when Numpy is not available 2010-11-03 17:57:51 +00:00
Maria Dimashova
37c1204d55 updated doc on common interfaces of features2d; added some method for GenericDescriptorMatcher 2010-11-03 16:39:58 +00:00
Maria Dimashova
4a43041309 minor changes 2010-11-03 10:00:24 +00:00
Vadim Pisarevsky
5b6a755719 almost finished Python wrappers 2010-11-02 17:58:22 +00:00
Ethan Rublee
40c05d8418 Brute force implementation had issues with the type of distances it was storing.
Rectified this, hopefully.
2010-11-01 05:34:51 +00:00
Maria Dimashova
755bb956d6 fixed compile error on Win 2010-10-29 14:39:23 +00:00
Maria Dimashova
69e329c9fd modified features2d interface; added algorithmic test for DescriptorMatcher; added sample on matching to many images 2010-10-29 08:44:42 +00:00
Vadim Pisarevsky
83f6085773 added more helper macros to the function declarations, to assist the Python wrapper generator. Fixed memleak in Mat::operator()(Range,Range) and the related functions (Mat::row, Mat::col etc.) 2010-10-27 18:26:39 +00:00
Victor Erukhimov
094a63c838 Fixing a problem with SURF detector crash due to large keypoint sizes 2010-10-24 12:36:47 +00:00
Vadim Pisarevsky
1b1eab8e67 added helper macros to the function declarations 2010-10-16 20:34:34 +00:00
Marius Muja
16b1f61c83 Updated FLANN to version 1.5 2010-10-12 19:47:50 +00:00
Vadim Pisarevsky
939b6ad72f small fix in DefaultRngAuto class for easier parsing with Python wrapper generator 2010-10-12 12:36:20 +00:00
Anatoly Baksheev
c09254cf67 fixed some warning under VS2008 2010-10-11 15:46:12 +00:00
Maria Dimashova
a22f74c362 fixed area computing 2010-10-09 10:01:19 +00:00
Ethan Rublee
244a537d54 _S happens to be a bad variable name for android 2010-10-09 02:15:08 +00:00