Merge pull request #3403 from asmorkalov:as/surf_link_fix

Fixed SURF linkage issue without nonfree.

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");
+}
+
 }
 }