Clean-up of the iostream manipulator in AKAZEConfig.

modules/features2d/src/akaze/AKAZEConfig.h

@@ -11,23 +11,16 @@
 // OpenCV
 #include "precomp.hpp"
 
-// System Includes
-#include <string>
-#include <vector>
-#include <cmath>
-#include <bitset>
-#include <iomanip>
-
 /* ************************************************************************* */
 /// Lookup table for 2d gaussian (sigma = 2.5) where (0,0) is top left and (6,6) is bottom right
 const float gauss25[7][7] = {
-  {0.02546481f,	0.02350698f,	0.01849125f,	0.01239505f,	0.00708017f,	0.00344629f,	0.00142946f},
-  {0.02350698f,	0.02169968f,	0.01706957f,	0.01144208f,	0.00653582f,	0.00318132f,	0.00131956f},
-  {0.01849125f,	0.01706957f,	0.01342740f,	0.00900066f,	0.00514126f,	0.00250252f,	0.00103800f},
-  {0.01239505f,	0.01144208f,	0.00900066f,	0.00603332f,	0.00344629f,	0.00167749f,	0.00069579f},
-  {0.00708017f,	0.00653582f,	0.00514126f,	0.00344629f,	0.00196855f,	0.00095820f,	0.00039744f},
-  {0.00344629f,	0.00318132f,	0.00250252f,	0.00167749f,	0.00095820f,	0.00046640f,	0.00019346f},
-  {0.00142946f,	0.00131956f,	0.00103800f,	0.00069579f,	0.00039744f,	0.00019346f,	0.00008024f}
+    { 0.02546481f, 0.02350698f, 0.01849125f, 0.01239505f, 0.00708017f, 0.00344629f, 0.00142946f },
+    { 0.02350698f, 0.02169968f, 0.01706957f, 0.01144208f, 0.00653582f, 0.00318132f, 0.00131956f },
+    { 0.01849125f, 0.01706957f, 0.01342740f, 0.00900066f, 0.00514126f, 0.00250252f, 0.00103800f },
+    { 0.01239505f, 0.01144208f, 0.00900066f, 0.00603332f, 0.00344629f, 0.00167749f, 0.00069579f },
+    { 0.00708017f, 0.00653582f, 0.00514126f, 0.00344629f, 0.00196855f, 0.00095820f, 0.00039744f },
+    { 0.00344629f, 0.00318132f, 0.00250252f, 0.00167749f, 0.00095820f, 0.00046640f, 0.00019346f },
+    { 0.00142946f, 0.00131956f, 0.00103800f, 0.00069579f, 0.00039744f, 0.00019346f, 0.00008024f }
 };
 
 /* ************************************************************************* */
@@ -126,34 +119,6 @@ struct AKAZEOptions {
     bool save_scale_space;          ///< Set to true for saving the scale space images
     bool save_keypoints;            ///< Set to true for saving the detected keypoints and descriptors
     bool verbosity;                 ///< Set to true for displaying verbosity information
-
-  friend std::ostream& operator<<(std::ostream& os,
-                                  const AKAZEOptions& akaze_options) {
-
-    os << std::left;
-#define CHECK_AKAZE_OPTION(option) \
-  os << std::setw(33) << #option << " =  " << option << std::endl
-
-    // Scale-space parameters.
-    CHECK_AKAZE_OPTION(akaze_options.omax);
-    CHECK_AKAZE_OPTION(akaze_options.nsublevels);
-    CHECK_AKAZE_OPTION(akaze_options.soffset);
-    CHECK_AKAZE_OPTION(akaze_options.sderivatives);
-    CHECK_AKAZE_OPTION(akaze_options.diffusivity);
-    // Detection parameters.
-    CHECK_AKAZE_OPTION(akaze_options.dthreshold);
-    // Descriptor parameters.
-    CHECK_AKAZE_OPTION(akaze_options.descriptor);
-    CHECK_AKAZE_OPTION(akaze_options.descriptor_channels);
-    CHECK_AKAZE_OPTION(akaze_options.descriptor_size);
-    // Save scale-space
-    CHECK_AKAZE_OPTION(akaze_options.save_scale_space);
-    // Verbose option for debug.
-    CHECK_AKAZE_OPTION(akaze_options.verbosity);
-#undef CHECK_AKAZE_OPTIONS
-
-    return os;
-  }
 };
 
 /* ************************************************************************* */