Merge pull request #1881 from pentschev:defaultNorm_master

2013-12-17 13:53:59 +04:00
parent 52a785e95a 6f3163f62d
commit e49b8dee40
29 changed files with 94 additions and 26 deletions
--- a/modules/features2d/src/orb.cpp
+++ b/modules/features2d/src/orb.cpp
@@ -575,6 +575,11 @@ int ORB::descriptorType() const
    return CV_8U;
 }

+int ORB::defaultNorm() const
+{
+    return NORM_HAMMING;
+}
+
 /** Compute the ORB features and descriptors on an image
 * @param img the image to compute the features and descriptors on
 * @param mask the mask to apply