Merge pull request #12881 from huangqinjin:orb

9a12aa45 · Alexander Alekhin · 2c029aae · 1fbaa48c · 9a12aa45
Commit 9a12aa45 authored Oct 24, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

orb.cpp modules/features2d/src/orb.cpp +10 -1

No files found.
--- a/modules/features2d/src/orb.cpp
+++ b/modules/features2d/src/orb.cpp
@@ -724,7 +724,16 @@ int ORB_Impl::descriptorType() const

 int ORB_Impl::defaultNorm() const
 {
-    return NORM_HAMMING;
+    switch (wta_k)
+    {
+    case 2:
+        return NORM_HAMMING;
+    case 3:
+    case 4:
+        return NORM_HAMMING2;
+    default:
+        return -1;
+    }
 }

 #ifdef HAVE_OPENCL