4fbd2ef87a
Merge pull request #1290 from mbarnach:bow_desc
2014-01-21 19:22:47 +04:00
e49b8dee40
Merge pull request #1881 from pentschev:defaultNorm_master
2013-12-17 13:53:59 +04:00
e4b41d38f1
Fixed descripotorsCount to descriptorsCount
...
See feature 2862
2013-12-16 10:47:24 +01:00
6f3163f62d
DescriptorExtractor: added defaultNorm() to return default norm type.
...
Added the defaultNorm() method to the DescriptorExtractor class. This method returns the default norm type for each descriptor type. The tests and C/C++ samples were updated to get the norm type directly from the DescriptorExtractor inherited classes.
This was reported in feature report #2182 (http://code.opencv.org/issues/2182 ). It will make it possible to get the norm type usually applied matching method for each descriptor, instead of passing it manually.
2013-12-09 09:54:42 -02:00
67525627db
Merge remote-tracking branch 'upstream/master' into bow_desc
...
Conflicts:
modules/features2d/src/bagofwords.cpp
2013-11-24 14:21:44 +01:00
bcb6f0386e
Named FastFeatureDetector::Type to allow its use in makePtr.
...
It has actually worked before (likely because it's inside a class),
but C++03 does disallow unnamed types as template arguments,
and there's a report that at least in one version of GCC it's
enforced: <http://code.opencv.org/issues/3278 >.
2013-10-01 18:22:03 +04:00
1eacb485c5
Boring changes - features2d.
2013-09-05 18:26:44 +04:00
464985205c
Update PR after mdim review.
2013-09-05 16:05:54 +12:00
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +04:00
43c9818895
Adding class for BOW image matcher (Feature #3005 ).
...
Same prototype as BOWImgDescriptorExtractor, but do only the matching.
If the feature is accepted, the BOWImgDescriptorExtractor and BOWImgDescriptorMatcher should probably refactor with inheritance.
Add a class to compute the keypoints, descriptors and matching from an image should be added to.
2013-08-18 11:32:04 +12:00
4ac2db271d
Removed CV_EXPORTS from all template classes (that I could find).
...
It doesn't make sense to export template classes, since there's no way
the user can learn that it can import them. In fact, it is somewhat
deleterious, because every module will export every instantiation
that it uses, but doesn't inline.
2013-07-25 19:40:08 +04:00
5d863f7516
drawMatches python bindings
2013-07-11 09:28:37 +05:30
c05bfe9d6d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/ocl/src/opencl/stereobp.cl
modules/ocl/src/stereobp.cpp
2013-07-08 18:47:38 +04:00
3677a66403
line realign
2013-07-04 17:43:38 +04:00
8045093cfb
GFTT wrapped to python
2013-07-03 22:26:18 +04:00
6faf00b8e5
Merge pull request #696 from znah:detect_method
2013-06-13 12:01:59 +04:00
e5a33723fc
Move C API of opencv_calib3d to separate file
2013-04-11 21:00:17 +04:00
ae4e76395f
Make flann headers independent from OpenCV C API
2013-04-08 15:47:29 +04:00
2b1ef95415
Completely separate C and C++ API of OpenCV core
2013-04-01 15:24:34 +04:00
49f6dad13f
Move cv::KeyPoint and cv::DMatch to core
2013-03-26 16:08:43 +04:00
4d510be2c9
added compute function to Feature2D (dirty workaround for #2699 )
2013-03-23 14:06:33 +04:00
be7bbe3aa9
Drop cv:: prefix from cv::String used inside the cv namespace
2013-03-22 22:14:50 +04:00
762aefd71b
Compile opencv_test_core with cv::String instead of std::string
...
All tests passed!
2013-03-22 22:14:22 +04:00
a42a0f5fca
Added compatibility headers
2013-03-13 17:26:56 +04:00
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
891d7da6ee
Merge branch '2.4'
2013-02-28 11:17:06 +04:00
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
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
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
7745c8806c
Added info() method in descriptor matchers ( #2330 )
2013-02-01 02:23:40 +04:00
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
5a730d09cd
Fix binary compatibility of opencv_features2d
2012-10-17 02:09:14 +04:00
18ab16dbd3
Revert "some more fixes towards binary compatibility"
...
This reverts commit a8c5e35619
2012-10-16 19:35:28 +04:00
a8c5e35619
some more fixes towards binary compatibility
2012-10-09 15:56:16 +04:00
84087a8566
fixed crash in Python's SURF wrapper (bug #2325 )
2012-09-11 16:47:25 +04:00
84c4797030
revert orientation computation in jeypoint detection for efficiency (like done originally)
2012-08-30 16:28:39 +04:00
13ded36ecb
initial addition of BRISK with some tests
2012-08-30 16:28:39 +04:00
633a8bfacc
fixed many warnings (modified pull request 13)
2012-08-28 18:15:14 +04:00
640408ebe7
added FAST<5/8> & FAST<7/12> (by Vincent Rabaud)
2012-07-31 17:17:58 +04:00
6dc5cd15ed
specified KeyPoint::angle in rst doc and code comment
2012-07-14 15:36:35 +00:00
017895dd93
filtered MSER keypoints that have centers out of image
2012-07-12 17:51:12 +00:00
c5669448a3
work on features2d python interface
2012-07-11 17:13:43 +00:00
c6705fbe20
exposed ORB features to python
2012-07-06 15:41:57 +00:00
d9c74f63e1
All tests writing temporary files are updated to use cv::tempfile() function
2012-06-25 11:24:06 +00:00
74707ec7ae
added FREAK (by Kirell Benzi, Raphael Ortiz, Alexandre Alahi and Pierre Vandergheynst)
2012-06-24 01:37:55 +00:00
2990f23e0c
grid-adapted feature detector made a proper Algorithm (ticket #1874 )
2012-06-01 09:10:53 +00:00
05de6302fd
Fixed documentation: corrected parameter names
2012-05-29 10:36:19 +00:00
eb2f1f81ed
Fixed hundreds of documentation problems
2012-05-28 07:36:14 +00:00
e703e8f5a6
exposed MSER to python again
2012-05-22 15:53:39 +00:00
Andrey Pavlenko