DescriptorExtractor: added defaultNorm() to return default norm type.
authorPeter Andreas Entschev <peter@entschev.com>
Wed, 27 Nov 2013 19:58:40 +0000 (17:58 -0200)
committerPeter Andreas Entschev <peter@entschev.com>
Mon, 9 Dec 2013 11:54:42 +0000 (09:54 -0200)
commit6f3163f62d4234a862a18af274503cefa9e352a3
tree911ea3c039b2650b1f70b6cf3f723109c1e00d75
parent41ae5d5f66eec1843f17d3ef87d6e508f449ef4d
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.
29 files changed:
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/include/opencv2/features2d.hpp
modules/features2d/src/brief.cpp
modules/features2d/src/brisk.cpp
modules/features2d/src/descriptors.cpp
modules/features2d/src/freak.cpp
modules/features2d/src/orb.cpp
modules/features2d/test/test_rotation_and_scale_invariance.cpp
modules/legacy/doc/common_interfaces_of_descriptor_extractors.rst
modules/legacy/include/opencv2/legacy.hpp
modules/nonfree/include/opencv2/nonfree/cuda.hpp
modules/nonfree/include/opencv2/nonfree/features2d.hpp
modules/nonfree/include/opencv2/nonfree/ocl.hpp
modules/nonfree/src/sift.cpp
modules/nonfree/src/surf.cpp
modules/nonfree/src/surf.cuda.cpp
modules/nonfree/src/surf.ocl.cpp
modules/nonfree/test/test_features2d.cpp
modules/nonfree/test/test_surf.cuda.cpp
modules/nonfree/test/test_surf.ocl.cpp
samples/c/find_obj_calonder.cpp
samples/cpp/brief_match_test.cpp
samples/cpp/detector_descriptor_evaluation.cpp
samples/cpp/freak_demo.cpp
samples/cpp/matcher_simple.cpp
samples/cpp/shape_transformation.cpp
samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp
samples/cpp/video_homography.cpp
samples/gpu/surf_keypoint_matcher.cpp