Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2026-07-29 07:13:02 +04:00 · 2018-10-26 17:56:28 +03:00
parent eb981cc7d7 eea0f7fd76
commit 50bec53afc
40 changed files with 647 additions and 322 deletions
@@ -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