Merge pull request #3403 from asmorkalov:as/surf_link_fix

asmorkalov · web-flow · commit b9111a9eefb2 · 2022-12-26T12:00:25.000+03:00
Fixed SURF linkage issue without nonfree.
diff --git a/modules/xfeatures2d/src/surf.cpp b/modules/xfeatures2d/src/surf.cpp
@@ -1020,12 +1020,6 @@ Ptr<SURF> SURF::create(double _threshold, int _nOctaves, int _nOctaveLayers, boo
     return makePtr<SURF_Impl>(_threshold, _nOctaves, _nOctaveLayers, _extended, _upright);
 }
 
-String SURF::getDefaultName() const
-{
-    return (Feature2D::getDefaultName() + ".SURF");
-}
-
-
 #else // ! #ifdef OPENCV_ENABLE_NONFREE
 Ptr<SURF> SURF::create(double, int, int, bool, bool)
 {
@@ -1035,6 +1029,11 @@ Ptr<SURF> SURF::create(double, int, int, bool, bool)
 }
 #endif
 
+String SURF::getDefaultName() const
+{
+    return (Feature2D::getDefaultName() + ".SURF");
+}
+
 }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1020,12 +1020,6 @@ Ptr<SURF> SURF::create(double _threshold, int _nOctaves, int _nOctaveLayers, boo`
`1020`	`1020`	`return makePtr<SURF_Impl>(_threshold, _nOctaves, _nOctaveLayers, _extended, _upright);`
`1021`	`1021`	`}`
`1022`	`1022`
`1023`		`-String SURF::getDefaultName() const`
`1024`		`-{`
`1025`		`- return (Feature2D::getDefaultName() + ".SURF");`
`1026`		`-}`
`1027`		`-`
`1028`		`-`
`1029`	`1023`	`#else // ! #ifdef OPENCV_ENABLE_NONFREE`
`1030`	`1024`	`Ptr<SURF> SURF::create(double, int, int, bool, bool)`
`1031`	`1025`	`{`
`@@ -1035,6 +1029,11 @@ Ptr<SURF> SURF::create(double, int, int, bool, bool)`
`1035`	`1029`	`}`
`1036`	`1030`	`#endif`
`1037`	`1031`
	`1032`	`+String SURF::getDefaultName() const`
	`1033`	`+{`
	`1034`	`+ return (Feature2D::getDefaultName() + ".SURF");`
	`1035`	`+}`
	`1036`	`+`
`1038`	`1037`	`}`
`1039`	`1038`	`}`
`1040`	`1039`