Commit Graph

1108 Commits

Author SHA1 Message Date
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
Maria Dimashova
ef6a79244d fixed compile error (with TBB) 2010-10-08 16:49:34 +00:00
Maria Dimashova
9f934363e5 added sample on BOW usage to image classification (training and testing is on Pascal VOC dataset) 2010-10-08 13:17:34 +00:00
Maria Dimashova
89935fc59b fixed FernDescriptorMatch; optimized keypoint regions matching in detector/descriptor evaluation; added CalonderDescriptorExtractor to evaluation tests 2010-10-04 14:12:36 +00:00
Maria Dimashova
d511e62021 fixed detector evaluation test 2010-10-01 09:02:54 +00:00
Maria Dimashova
1061fc6589 back to previous default params 2010-09-30 15:47:10 +00:00
Maria Dimashova
13b535ac19 added BOWTrainer::add() 2010-09-30 14:21:22 +00:00
Maria Dimashova
98763247d9 added DenseFeatureDetector 2010-09-24 16:55:12 +00:00
Maria Dimashova
26dbbcc070 added bag of words; did some renaming 2010-09-23 16:17:48 +00:00
Maria Dimashova
8462deed30 split descriptors.cpp 2010-09-23 13:44:23 +00:00
Maria Dimashova
9e9d4b9e49 added OpponentColorDescriptorExtractor 2010-09-23 10:53:36 +00:00
Ethan Rublee
8ee50c422b adding some small changes to support android build,
mainly cmake stuff, but in persistance the wcstombs
is not supported on android, and in
sift.cpp there was and ifdef that affected arm and this
causes undefined symbols on android.
2010-09-22 02:16:33 +00:00
Maria Dimashova
97f2972fc0 uncommented fix of write/read keypoints 2010-09-17 12:32:57 +00:00
Maria Dimashova
8ab3fdbcca merged regression tests for FeatureDetector, DescriptorExtractor from branch .features2d;
renamed createDetector to createFeatureDetector
2010-09-17 11:26:58 +00:00
Maria Dimashova
912f8ff34c commented fix write/read keypoints temporarily 2010-09-15 13:57:13 +00:00
Maria Dimashova
b8753db512 merged fix of write/read keypoints from branch 2010-09-15 12:14:35 +00:00
Vadim Pisarevsky
16ae6fa6ad excluded from Android build 2010-09-14 18:20:27 +00:00
Maria Dimashova
a2a3ec69cb Fixed FernClassifier 2010-09-10 11:40:28 +00:00
Maria Dimashova
601e9af9f8 added match() 2010-08-24 12:52:29 +00:00
Maria Dimashova
cd28d5d812 minor changes 2010-08-16 09:15:15 +00:00
Maria Dimashova
c56085917b added todo for descriptors evaluation 2010-08-09 16:33:44 +00:00
Maria Dimashova
4395bad911 fixed linker errors on Win and some warnings 2010-08-05 13:29:43 +00:00
Maria Dimashova
121e51d35b replaced detector/descriptor evaluation functions from test to features2d; modified VectorDescriptorMatch constructor; removed commented calonder descriptor implementation 2010-08-05 12:19:26 +00:00
Ilya Lysenkov
20e407b235 Fixed bugs in BruteForceMatcher and its specialization 2010-08-04 08:26:30 +00:00
Maria Dimashova
4e60decad3 added GridAdaptedFeatureDetector, PyramidAdaptedFeatureDetector and funcs to draw keypoints and matches 2010-08-03 16:28:52 +00:00
Maria Dimashova
f6c8e237f0 fixed compile error on VS2008 2010-07-30 14:36:04 +00:00
Maria Dimashova
5e84ab0222 replaced KeyPoint::overlap implementation by faster version (thanks to Suat Gedikli) 2010-07-30 14:21:55 +00:00
Vadim Pisarevsky
0faa75da11 inserted missing std:: (ticket #333). Thanks to trisk for the patch! 2010-07-29 10:55:09 +00:00
Maria Dimashova
7083f0f815 fixed compile error when HAVE_EIGEN2 (#500) 2010-07-29 08:24:51 +00:00
Maria Dimashova
cba926a428 added c++ interface for cvPyrMeanShiftFiltering; added sample on meanshift segmentation 2010-07-28 16:41:12 +00:00
Maria Dimashova
cdbf1f9ef5 fixed compile errors on VS 2008 2010-07-28 12:14:21 +00:00
Maria Dimashova
fb2a4a8345 added method to compute overlap for KeyPoint pair 2010-07-28 10:47:48 +00:00
Maria Dimashova
74300f5f42 fixed compile errors on VS2008 2010-07-27 13:28:21 +00:00
Maria Dimashova
e83c9b08d8 replaced Calonder descriptor implementation; added windowedMatchingMask() 2010-07-27 12:36:48 +00:00
Anatoly Baksheev
54081f262e fixed compiler error for win32 2010-07-26 14:16:19 +00:00
Maria Dimashova
b5a71db742 modified FernClassifier::train(); remove old RTreeClassifier and added new implementation CalonderClassifier; removed old find_obj_calonder and added new one 2010-07-26 08:58:46 +00:00
Vadim Pisarevsky
f78a3b4cc1 updated 3rd party libs: CLapack 3.1.1.1 => 3.2.1, zlib 1.2.3 => 1.2.5, libpng 1.2.x => 1.4.3, libtiff 3.7.x => 3.9.4. fixed many 64-bit related VS2010 warnings 2010-07-16 12:54:53 +00:00
Alexander Shishkov
fd16d49d85 Changed VectorDescriptorMatch interface to add factory capabilities and changed factory functions interface (return smart pointer) 2010-07-12 11:56:11 +00:00
Vadim Pisarevsky
db82906067 fix build with GCC 3.3 on Ubuntu 8.04 2010-07-09 09:09:20 +00:00
Victor Erukhimov
4187f11610 Fixing a win compilation problem 2010-07-09 09:08:08 +00:00
Vadim Pisarevsky
fd169e9716 fix warnings about missing destructors in FeatureDetector and DescriptorExtractor classes and their derivatives 2010-07-08 21:15:09 +00:00
Vadim Pisarevsky
796553d051 added some quaternion operations on Scalar's. 2010-07-07 15:25:42 +00:00
Vadim Pisarevsky
9cf319d504 fixed some MSVC2008 compiler errors & warnings 2010-07-05 08:11:52 +00:00
Stefano Fabri
bce9f54152 Corrected Mask operator (from documentation mask must be a char matrix with non-zero values in the region of interest) 2010-07-02 17:36:28 +00:00
Ilya Lysenkov
86ef7fab03 Fixed bug ticket #416 2010-07-02 06:58:17 +00:00
Ilya Lysenkov
0154b18a3d Speeded up BruteForceMatcher using matrix multiplication 2010-06-30 14:37:42 +00:00
Vadim Pisarevsky
7ec4b59fac added #include "cvconfig.h" to make TBB and other 3rd party libs work correctly 2010-06-29 15:12:07 +00:00
Maria Dimashova
69adf86afe fixed compile error; renamed createDescriptorMatch to createGenericDescriptorMatch 2010-06-28 16:03:01 +00:00
Ilya Lysenkov
add94f9bd6 Added L1 distance code and used factory functions in evaluation framework 2010-06-28 13:06:24 +00:00
Maria Dimashova
4a05af684f fixed 2010-06-24 08:18:29 +00:00
Maria Dimashova
4606638bb3 fixed 2010-06-21 10:40:32 +00:00
Ilya Lysenkov
276f3b8862 Added distance threshold-based matching 2010-06-16 08:56:53 +00:00
Ilya Lysenkov
673b4404a9 Fixed plot data generation for descriptors comparison 2010-06-16 07:06:14 +00:00
Maria Dimashova
400eb37189 added parameter keypointIndexes to KeyPoint::convert, updated sample 2010-06-15 15:19:11 +00:00
Maria Dimashova
dd72f2ec52 moved matchesMask 2010-06-12 14:39:56 +00:00
Maria Dimashova
008da75691 renamed parameter of drawMatches (mask to matchesMask) 2010-06-12 10:11:57 +00:00
Victor Erukhimov
c751e901ce Changed interface for drawMatches 2010-06-12 06:30:00 +00:00
Victor Erukhimov
7ce10e8c91 Modified a comment to DescriptorMatcher 2010-06-12 05:44:55 +00:00
Victor Erukhimov
c6a943b684 DescriptorMatching -> DMatch 2010-06-11 19:56:52 +00:00
Victor Erukhimov
c6750a0f45 Moved detector and descriptor class factory functions into features2d module 2010-06-11 18:44:22 +00:00
Maria Dimashova
17a8050fe2 added drawMatches function to features2d and documentation on this 2010-06-11 17:15:43 +00:00
Ilya Lysenkov
88bd1f1d1a Added plot data generation for visual descriptors comparison in the evaluation framework 2010-06-11 09:38:39 +00:00
Ilya Lysenkov
b251136e45 Added sample for GenericDescriptorMatch 2010-06-10 07:59:18 +00:00
Maria Dimashova
2780747fec fixed L2 used in BruteForceMatcher 2010-06-09 16:57:07 +00:00
Maria Dimashova
93dc0dbae5 moved sift parameters implementation from hpp file 2010-06-09 14:23:15 +00:00
Ilya Lysenkov
11f9dafdca Fixed FernDescriptorMatch 2010-06-09 10:03:56 +00:00
Ilya Lysenkov
892cc8aab7 Fixed FernDescriptorMatch and undid change of FernClassifier 2010-06-08 13:21:47 +00:00
Maria Dimashova
ab8861fa10 fixed assert() in BruteForceMatcher<Distance>::matchImpl() 2010-06-08 13:17:41 +00:00
Maria Dimashova
48e4f66ccf modified DescriptorMatcher 2010-06-08 12:18:22 +00:00
Ilya Lysenkov
454e346334 Added Fern Descriptor and Calonder Descriptor to the evaluation framework 2010-06-08 06:56:35 +00:00
Ilya Lysenkov
15413c8d40 Fixed bugs in FernDescriptorMatch and FernClassifier 2010-06-08 06:54:17 +00:00
Maria Dimashova
165f2520c9 fixed sift wrapper 2010-06-07 09:05:48 +00:00
Ilya Lysenkov
f4788b3645 Added read/write methods in detectors and some descriptors for XML/YAML persistence 2010-06-04 05:30:09 +00:00
Ilya Lysenkov
bb235220e7 Speeded up descriptors evaluations using clear () 2010-06-02 06:55:03 +00:00
Ilya Lysenkov
fe4896873b Fixed a potential memory leak in OneWayDescriptorBase hierarchy. 2010-06-02 05:39:29 +00:00
Ilya Lysenkov
a702e5b2dc Storing PCA components and One Way descriptors in one yml file. 2010-06-02 05:19:09 +00:00
Vadim Pisarevsky
5c4333d68c added some more Doxygen comments 2010-05-31 16:47:13 +00:00
Victor Erukhimov
c4631573a4 cv::cvflann -> cv::flann 2010-05-26 19:50:20 +00:00
Maria Dimashova
045402e481 override clear method to VectorDescriptorMatch 2010-05-26 15:00:03 +00:00
Victor Erukhimov
13523fd53a Fixing compiler errors for outlet_pose_estimation 2010-05-26 12:34:48 +00:00
Maria Dimashova
b4275e1987 added clear method to GenericDescriptorMatch 2010-05-26 11:27:56 +00:00
Vadim Pisarevsky
b94e09bfeb renamed cv::flann to cv::cvflann to avoid name conflicts 2010-05-21 20:37:05 +00:00
Maria Dimashova
60019422e8 fixed gftt wrapper, update testdata 2010-05-21 17:36:36 +00:00
Maria Dimashova
60f00f9f83 updated detectors and descriptors quality tests 2010-05-20 16:16:28 +00:00
Maria Dimashova
cd81db88d5 updated sift wrapper (recalculation angles mode) 2010-05-19 16:02:30 +00:00
Maria Dimashova
3b0243c51d fixed wrapper of sift descriptor 2010-05-18 12:21:45 +00:00
Liu Liu
a69804e158 fixed the error in SURF when no keypoint detected 2010-05-18 07:16:24 +00:00
Maria Dimashova
0043fe6fcd fixed wrapper of sift descriptor 2010-05-17 17:36:58 +00:00
Vadim Pisarevsky
4a073bd951 fixed build on Linux 2010-05-12 07:33:21 +00:00
Vadim Pisarevsky
127d6649a1 "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00