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

2020-04-24 18:32:18 +00:00
parent 15b948d109 8d05dab32c
commit 152e6476d9
30 changed files with 1658 additions and 44 deletions
@@ -431,10 +431,11 @@ int main(int argc, char* argv[])
    {
        finder = xfeatures2d::SURF::create();
    }
-    else if (features_type == "sift") {
-        finder = xfeatures2d::SIFT::create();
-    }
 #endif
+    else if (features_type == "sift")
+    {
+        finder = SIFT::create();
+    }
    else
    {
        cout << "Unknown 2D features type: '" << features_type << "'.\n";