- assign some members outside the header (fixes #1081)
authorVincent Rabaud <no@email>
Sat, 21 May 2011 17:27:38 +0000 (17:27 +0000)
committerVincent Rabaud <no@email>
Sat, 21 May 2011 17:27:38 +0000 (17:27 +0000)
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/orb.cpp

index e6154db..f2a7028 100644 (file)
@@ -415,9 +415,9 @@ public:
   struct CommonParams
   {
     static const unsigned int DEFAULT_N_LEVELS = 3;
-    static const float DEFAULT_SCALE_FACTOR = 1.2;
+    static const float DEFAULT_SCALE_FACTOR;
     static const unsigned int DEFAULT_FIRST_LEVEL = 0;
-    static const PatchSize DEFAULT_PATCH_SIZE = PATCH_LEARNED_31;
+    static const PatchSize DEFAULT_PATCH_SIZE;
 
     /** default constructor */
     CommonParams(float scale_factor = DEFAULT_SCALE_FACTOR, unsigned int n_levels = DEFAULT_N_LEVELS,
index 529cb06..3a473c5 100644 (file)
@@ -447,6 +447,9 @@ std::vector<cv::Mat> ORB::OrbPatterns::rotated_patterns_ = OrbPatterns::generate
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+const float ORB::CommonParams::DEFAULT_SCALE_FACTOR = 1.2;
+const ORB::PatchSize ORB::CommonParams::DEFAULT_PATCH_SIZE = ORB::PATCH_LEARNED_31;
+
 /** Constructor
  * @param detector_params parameters to use
  */