1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00

Merge pull request #12881 from huangqinjin:orb

This commit is contained in:
Alexander Alekhin
2018-10-24 13:28:57 +00:00
+10 -1
View File
@@ -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