From 2b95a6da30e1034be71ec11871599d5d8d9ade71 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Mon, 26 Dec 2022 08:44:41 +0300 Subject: [PATCH] Fixed SURF linkage issue without nonfree. --- modules/xfeatures2d/src/surf.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/xfeatures2d/src/surf.cpp b/modules/xfeatures2d/src/surf.cpp index ea04e9e03..54abcd078 100644 --- a/modules/xfeatures2d/src/surf.cpp +++ b/modules/xfeatures2d/src/surf.cpp @@ -1020,12 +1020,6 @@ Ptr SURF::create(double _threshold, int _nOctaves, int _nOctaveLayers, boo return makePtr(_threshold, _nOctaves, _nOctaveLayers, _extended, _upright); } -String SURF::getDefaultName() const -{ - return (Feature2D::getDefaultName() + ".SURF"); -} - - #else // ! #ifdef OPENCV_ENABLE_NONFREE Ptr SURF::create(double, int, int, bool, bool) { @@ -1035,6 +1029,11 @@ Ptr SURF::create(double, int, int, bool, bool) } #endif +String SURF::getDefaultName() const +{ + return (Feature2D::getDefaultName() + ".SURF"); +} + } }