Vadim Pisarevsky
9575a82a9e
Merge pull request #3299 from felixendres:orb_keypoint_detector_threshold
2014-10-09 14:52:38 +00:00
Felix Endres
ee6835492c
Exposing the FAST detector threshold for ORB
...
Implemented as a new optional parameter for
the constructor of the ORB detector. The
change of this parameter has been included
in the orb unit test.
2014-10-02 12:17:01 +02:00
Vadim Pisarevsky
31df47b6ea
moved nonfree and a part of features2d to opencv_contrib/xfeatures2d
2014-08-11 23:26:39 +04:00
Roman Donchenko
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
f-morozov
7f82960897
AKAZE fixes, tests and tutorial
2014-07-30 18:02:08 +04:00
Roman Donchenko
a3bde36c84
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/contrib/doc/facerec/facerec_api.rst
modules/contrib/include/opencv2/contrib/contrib.hpp
modules/contrib/src/facerec.cpp
modules/core/include/opencv2/core/mat.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/highgui/src/loadsave.cpp
modules/imgproc/src/pyramids.cpp
modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
modules/python/src2/gen.py
modules/python/test/test.py
modules/superres/test/test_superres.cpp
samples/cpp/facerec_demo.cpp
2014-07-08 14:33:56 +04:00
Ilya Lavrenov
556206de2d
fixed defects found by coverity scan
2014-06-10 13:14:51 +04:00
Vadim Pisarevsky
8bd1efa523
Merge pull request #2673 from BloodAxe:kaze
2014-05-19 17:35:22 +04:00
Ievgen Khvedchenia
029a8c443a
Remove GSURF descriptor from KAZE algorithm
2014-05-10 20:57:37 +03:00
Ievgen Khvedchenia
3a8e15fad9
Fix documentation warnings
2014-05-09 22:21:26 +03:00
Ievgen Khvedchenia
b42c268164
Temporary remove of CV_WRAP
2014-05-09 19:34:54 +03:00
Ievgen Khvedchenia
1a5fcd715d
Refactor of KAZE and AKAZE:
...
1) Clean-up from the unused code
2) Remove of SURF extraction method
3) Enabled threading for KAZE extraction
4) Exposed new properties for runtime configuration
2014-05-09 18:46:00 +03:00
Ievgen Khvedchenia
36db97068c
Added missing operator()
2014-04-24 22:00:37 +01:00
Vadim Pisarevsky
f417c79d16
Merge pull request #1932 from seth-planet:master
2014-04-10 13:36:14 +04:00
Ievgen Khvedchenia
137ff7eccb
Added KAZE and AKAZE wrappers
2014-04-05 10:25:46 +03:00
Roman Donchenko
491b84d463
Merge pull request #2478 from clemenscorny:master
2014-03-26 12:19:54 +04:00
Clemens Korner
f1c8b4b965
FEATURES2D: add DenseFeatureDetector Python wrapper
2014-03-25 12:07:01 +01:00
Roman Donchenko
95a55453df
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/perf/perf_pnp.cpp
modules/contrib/src/imagelogpolprojection.cpp
modules/contrib/src/templatebuffer.hpp
modules/core/perf/opencl/perf_gemm.cpp
modules/cudafeatures2d/doc/feature_detection_and_description.rst
modules/cudafeatures2d/perf/perf_features2d.cpp
modules/cudafeatures2d/src/fast.cpp
modules/cudafeatures2d/test/test_features2d.cpp
modules/features2d/doc/feature_detection_and_description.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/imgproc/perf/opencl/perf_blend.cpp
modules/imgproc/perf/opencl/perf_color.cpp
modules/imgproc/perf/opencl/perf_moments.cpp
modules/imgproc/perf/opencl/perf_pyramid.cpp
modules/objdetect/perf/opencl/perf_hogdetect.cpp
modules/ocl/perf/perf_arithm.cpp
modules/ocl/perf/perf_bgfg.cpp
modules/ocl/perf/perf_blend.cpp
modules/ocl/perf/perf_brute_force_matcher.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/perf/perf_gftt.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_imgwarp.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_matrix_operation.cpp
modules/ocl/perf/perf_ml.cpp
modules/ocl/perf/perf_moments.cpp
modules/ocl/perf/perf_opticalflow.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/video/src/lkpyramid.cpp
modules/video/src/precomp.hpp
samples/gpu/morphology.cpp
2014-03-11 17:20:01 +04:00
sprice
75ed2f52f1
Merge branch 'master' of https://github.com/Itseez/opencv
...
Conflicts:
modules/features2d/include/opencv2/features2d.hpp
modules/features2d/src/freak.cpp
modules/features2d/src/stardetector.cpp
2014-03-06 15:39:06 -08:00
Andrey Pavlenko
ff9a0815b9
Merge pull request #2352 from ilya-lavrenov:flann
2014-02-18 13:24:41 +04:00
Ilya Lavrenov
6ad7b64912
some more changes
2014-02-17 21:57:33 +04:00
Ilya Lavrenov
f74ef644bc
changed the signature of add method according to the base class
2014-02-17 02:39:38 +04:00
Pierre Moulon
8829e9f6c8
Fix a typo error
2014-02-14 12:22:53 +01:00
Andrey Pavlenko
b6675ee2a8
Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray
2014-02-06 12:55:04 +04:00
Konstantin Matskevich
bdfa9fa14a
fixes2
2014-02-05 13:51:14 +04:00
Konstantin Matskevich
eb4c2cd59f
removed CV_IN/OUT
2014-02-05 10:55:26 +04:00
Konstantin Matskevich
f44334285b
features2d
2014-02-04 16:55:07 +04:00
Vadim Pisarevsky
8d5e952263
very preliminary port of SURF to T-API (compiles but certainly does not work)
2014-02-04 03:21:03 +04:00
Ilya Lavrenov
e559256719
added cv::GFTTDetector
2014-01-25 00:23:59 +04:00
Konstantin Matskevich
3b7683e72f
fixed docs
2014-01-22 15:31:26 +04:00
Konstantin Matskevich
ca5689e0db
BFMatcher
...
match
radiusMatch
2014-01-22 15:31:26 +04:00
Andrey Pavlenko
4fbd2ef87a
Merge pull request #1290 from mbarnach:bow_desc
2014-01-21 19:22:47 +04:00
Roman Donchenko
e49b8dee40
Merge pull request #1881 from pentschev:defaultNorm_master
2013-12-17 13:53:59 +04:00
StevenPuttemans
e4b41d38f1
Fixed descripotorsCount to descriptorsCount
...
See feature 2862
2013-12-16 10:47:24 +01:00
Peter Andreas Entschev
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
sprice
2cc11e2c6a
Updating STAR detector and FREAK descriptor to work with large and/or 16-bit images
2013-12-04 18:13:34 -08:00
Mathieu Barnachon
67525627db
Merge remote-tracking branch 'upstream/master' into bow_desc
...
Conflicts:
modules/features2d/src/bagofwords.cpp
2013-11-24 14:21:44 +01:00
Roman Donchenko
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
Roman Donchenko
1eacb485c5
Boring changes - features2d.
2013-09-05 18:26:44 +04:00
Mathieu Barnachon
464985205c
Update PR after mdim review.
2013-09-05 16:05:54 +12:00
Mathieu Barnachon
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
Roman Donchenko
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
abidrahmank
5d863f7516
drawMatches python bindings
2013-07-11 09:28:37 +05:30
Roman Donchenko
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
Roman Donchenko
6faf00b8e5
Merge pull request #696 from znah:detect_method
2013-06-13 12:01:59 +04:00
Andrey Kamaev
e5a33723fc
Move C API of opencv_calib3d to separate file
2013-04-11 21:00:17 +04:00
Andrey Kamaev
ae4e76395f
Make flann headers independent from OpenCV C API
2013-04-08 15:47:29 +04:00
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