Andrey Kamaev
2b1ef95415
Completely separate C and C++ API of OpenCV core
2013-04-01 15:24:34 +04:00
Andrey Kamaev
49f6dad13f
Move cv::KeyPoint and cv::DMatch to core
2013-03-26 16:08:43 +04:00
Alexander Mordvintsev
4d510be2c9
added compute function to Feature2D (dirty workaround for #2699 )
2013-03-23 14:06:33 +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
762aefd71b
Compile opencv_test_core with cv::String instead of std::string
...
All tests passed!
2013-03-22 22:14:22 +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
891d7da6ee
Merge branch '2.4'
2013-02-28 11:17:06 +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
LeonidBeynenson
b85a098d9c
Added float, uint64, and uchar params to Algorithm
...
Made changes to work in cv::Algorithm with parameters of these types.
Also fixed SimpleBlobDetector -- now it can be created by
cv::Algorithm::create and it can work with cv::Algorithm::set/get.
2013-02-04 20:25:18 +04:00
Andrey Kamaev
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
Ilya Lysenkov
7745c8806c
Added info() method in descriptor matchers ( #2330 )
2013-02-01 02:23:40 +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
5a730d09cd
Fix binary compatibility of opencv_features2d
2012-10-17 02:09:14 +04:00
Andrey Kamaev
18ab16dbd3
Revert "some more fixes towards binary compatibility"
...
This reverts commit a8c5e35619
.
Conflicts:
modules/imgproc/src/imgwarp.cpp
2012-10-16 19:35:28 +04:00
Vadim Pisarevsky
a8c5e35619
some more fixes towards binary compatibility
2012-10-09 15:56:16 +04:00
Vadim Pisarevsky
84087a8566
fixed crash in Python's SURF wrapper (bug #2325 )
2012-09-11 16:47:25 +04:00
Vincent Rabaud
84c4797030
revert orientation computation in jeypoint detection for efficiency (like done originally)
2012-08-30 16:28:39 +04:00
Vincent Rabaud
13ded36ecb
initial addition of BRISK with some tests
2012-08-30 16:28:39 +04:00
Vadim Pisarevsky
633a8bfacc
fixed many warnings (modified pull request 13)
2012-08-28 18:15:14 +04:00
Vadim Pisarevsky
640408ebe7
added FAST<5/8> & FAST<7/12> (by Vincent Rabaud)
2012-07-31 17:17:58 +04:00
Maria Dimashova
6dc5cd15ed
specified KeyPoint::angle in rst doc and code comment
2012-07-14 15:36:35 +00:00
Maria Dimashova
017895dd93
filtered MSER keypoints that have centers out of image
2012-07-12 17:51:12 +00:00
Alexander Mordvintsev
c5669448a3
work on features2d python interface
2012-07-11 17:13:43 +00:00
Alexander Mordvintsev
c6705fbe20
exposed ORB features to python
2012-07-06 15:41:57 +00:00
Andrey Kamaev
d9c74f63e1
All tests writing temporary files are updated to use cv::tempfile() function
2012-06-25 11:24:06 +00:00
Vadim Pisarevsky
74707ec7ae
added FREAK (by Kirell Benzi, Raphael Ortiz, Alexandre Alahi and Pierre Vandergheynst)
2012-06-24 01:37:55 +00:00
Vadim Pisarevsky
2990f23e0c
grid-adapted feature detector made a proper Algorithm (ticket #1874 )
2012-06-01 09:10:53 +00:00
Andrey Kamaev
05de6302fd
Fixed documentation: corrected parameter names
2012-05-29 10:36:19 +00:00
Andrey Kamaev
eb2f1f81ed
Fixed hundreds of documentation problems
2012-05-28 07:36:14 +00:00
Alexander Mordvintsev
e703e8f5a6
exposed MSER to python again
2012-05-22 15:53:39 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Andrey Kamaev
ce89d00fcf
Implemented missed AlgorithmInfo for BRIEF
2012-03-29 03:06:59 +00:00
Vadim Pisarevsky
0c381e2a9f
increased the default number of pyramid layers in ORB; updated test data
2012-03-20 14:20:06 +00:00
Vadim Pisarevsky
d60623279c
switched to non-constant references in Algorithm::addParam, which is more safe.
2012-03-17 09:50:47 +00:00
Vadim Pisarevsky
957e80abbd
lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.
2012-03-15 14:36:01 +00:00
Ilya Lysenkov
df6a95ed87
Wraped SimpleBlobDetector for Python
2012-03-12 11:39:48 +00:00
Alexander Mordvintsev
f2d2c8db77
exposed SurfFeatureDetector and SurfDescriptorExtractor to python
2011-11-29 12:24:38 +00:00
Vadim Pisarevsky
2e9f5c434b
added improved ORB implementation, convex-convex polygon intersection, eigen2x2 low-level function ...
2011-11-08 12:01:49 +00:00
Vadim Pisarevsky
b74116e694
unified norm computing; added generalized Hamming distance
2011-10-11 15:13:53 +00:00
Alexander Mordvintsev
028c44531f
wrapped FlannBasedMatcher (and extended DescriptorMatcher wrapper)
...
updated feature_homography.py sample to use new features
2011-09-15 11:10:06 +00:00
Alexander Mordvintsev
b679ebc1b4
python DescriptorExtractor.compute now returns filtered keypoints
...
wrapped StarFeatureDetector and GridAdaptedFeatureDetector
2011-09-15 08:07:37 +00:00
Vadim Pisarevsky
82da7f18d8
replaced "unsigned int" -> "unsigned" to make Python/Java wrapper generator work correctly
2011-09-14 14:29:30 +00:00
Alexander Mordvintsev
d50cc51070
handling Ptr<> arguments and return values in Python wrappers
...
partially wrapped features2d framework
added feature_homography.py sample
2011-09-07 09:38:22 +00:00
Maria Dimashova
81cb7b2c5e
added read/write methods for SimpleBlobDetector and DenseFeatureDetector; added their creation to FeatureDetector::create method ( #1290 )
2011-08-10 09:17:37 +00:00
Maria Dimashova
4839bfb1a5
fixed grammar of the comment
2011-08-08 14:03:37 +00:00
Maria Dimashova
fcd999ae6e
added SL2 (squared L2 distance) and implemented the descriptors matching in L2 using SL2
2011-08-08 13:18:12 +00:00
Maria Dimashova
7db3dd4f0a
fixed comment and doc on L2
2011-08-05 14:05:41 +00:00
Andrey Kamaev
874196e384
Implemented read/write methods for FlannBasedMatcher; fixed features2d wrappers for java
2011-08-04 14:13:07 +00:00
Andrey Kamaev
13185ad8f7
Implemented read/write methods for BriefDescriptorExtractor class
2011-08-04 09:56:10 +00:00
Andrey Kamaev
1523cb04d1
Added CV_EXPORTS to OrbDescriptorExtractor (ticket #1276 )
2011-08-04 06:19:52 +00:00
Andrey Kamaev
6935e95c2a
Fixed crash in BruteForceMatcher::clone
2011-08-03 11:30:09 +00:00
Vadim Pisarevsky
562914e33b
upgraded to FLANN 1.6. Added miniflann interface, which is now used in the rest of OpenCV. Added Python bindings for FLANN.
2011-07-13 23:04:39 +00:00
Vladimir Dudnik
6e38b6aaed
removed trailing backspaces, reduced number of warnings (under MSVC2010 x64) for size_t to int conversion, added handling of samples launch without parameters (should not have abnormal termination if there was no paramaters supplied)
2011-06-17 06:31:54 +00:00
Ilya Lysenkov
cb511861ac
Removed unnecessary function from SimpleBlobDetector
2011-06-09 11:16:18 +00:00
Ilya Lysenkov
f60d7fdfef
Simplified SimpleBlobDetector to make it simple)
2011-06-09 11:07:08 +00:00
Maria Dimashova
b5163291dd
added upright mode to SURF ( #825 )
2011-06-08 09:23:33 +00:00
Maria Dimashova
ca551ab9ae
added one more SIFT::CommonParams constructor
2011-06-07 07:41:59 +00:00
Vincent Rabaud
fc19e856a6
- fix a memory leak
2011-06-01 18:24: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
Maria Dimashova
035fd0019b
replaced SIFT implementation (Some default parameters can be changed in the near future)
2011-05-31 18:18:02 +00:00
Vadim Pisarevsky
af2af3af9b
added KeyPoint::hash() (ticket #1100 )
2011-05-31 14:24:45 +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
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
Vincent Rabaud
9170ff6f5e
- assign some members outside the header ( fixes #1081 )
2011-05-21 17:27:38 +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
Maria Dimashova
8acce4e31f
some renames
2011-05-15 09:19:05 +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
Maria Dimashova
66c116ec6a
fixed #1044
2011-05-05 10:10:46 +00:00
Maria Dimashova
b9662e099c
added the filtering of keypoints having zero size ( #877 )
2011-05-01 17:38:52 +00:00
Maria Dimashova
34a18f79e1
fixed #832
2011-04-29 14:37:02 +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
fd1f644e39
fixed #772 (added empty implementation of SIFT class methods throwing exception if ARM)
2011-01-31 16:23:26 +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
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
e92d0e4bc2
cosmetic changes
2010-12-23 23:01:18 +00:00
Vadim Pisarevsky
01c1003d51
fixed warnings and errors reported by VS2010
2010-11-26 18:25:30 +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
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
Maria Dimashova
0af4d09aa9
fixed linker error undo mingw ( #657 )
2010-11-16 15:42:31 +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
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
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
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
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
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
9e9d4b9e49
added OpponentColorDescriptorExtractor
2010-09-23 10:53:36 +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
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
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
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
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
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
9cf319d504
fixed some MSVC2008 compiler errors & warnings
2010-07-05 08:11:52 +00:00
Ilya Lysenkov
0154b18a3d
Speeded up BruteForceMatcher using matrix multiplication
2010-06-30 14:37:42 +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
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