Fix compile issue after replacing push_back with emplace_back

PointCloudLibrary · Jan 19, 2019 · c274d1f · c274d1f
1 parent d4502e2
commit c274d1f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/keypoints/include/pcl/keypoints/brisk_2d.h b/keypoints/include/pcl/keypoints/brisk_2d.h
@@ -249,8 +249,8 @@ namespace pcl
           // constructor arguments
           struct CommonParams
           {
-            static const int HALFSAMPLE = 0;
-            static const int TWOTHIRDSAMPLE = 1;
+            static const int HALFSAMPLE;
+            static const int TWOTHIRDSAMPLE;
           };
 
           /** \brief Constructor.

diff --git a/keypoints/src/brisk_2d.cpp b/keypoints/src/brisk_2d.cpp
@@ -47,6 +47,9 @@
 #include <emmintrin.h>
 #endif
 
+const int pcl::keypoints::brisk::Layer::CommonParams::HALFSAMPLE = 0;
+const int pcl::keypoints::brisk::Layer::CommonParams::TWOTHIRDSAMPLE = 1;
+
 /////////////////////////////////////////////////////////////////////////////////////////
 // construct telling the octaves number:
 pcl::keypoints::brisk::ScaleSpace::ScaleSpace (int octaves)
@@ -186,13 +189,13 @@ pcl::keypoints::brisk::ScaleSpace::getKeypoints (
                                 delta_x, delta_y);
 
         // store:
-        keypoints.emplace_back((point.u + delta_x) * l.getScale () + l.getOffset (),     // x
-                                                  (point.v + delta_y) * l.getScale () + l.getOffset (),     // y
-                                                  0.0f,                                           // z
-                                                  basic_size_ * l.getScale (),                         // size
-                                                  -1,                                             // angle
-                                                  max,                                            // response
-                                                  i);                                            // octave
+        keypoints.emplace_back((point.u + delta_x) * l.getScale () + l.getOffset (),  // x
+                               (point.v + delta_y) * l.getScale () + l.getOffset (),  // y
+                               0.0f,                                                  // z
+                               basic_size_ * l.getScale (),                           // size
+                               -1,                                                    // angle
+                               max,                                                   // response
+                               i);                                                    // octave
       }
     }
     else