Fix compile error of the GCC with IndexLandmark braces initializer.

GCC compiler raise an error when it try to compile braces initializer of IndexLandmark struct. This commit add explicit definition of intializers for this struct.
patrikhuber · Feb 13, 2019 · 3fc3fb5 · 3fc3fb5
1 parent 8c6137c
commit 3fc3fb5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/include/eos/core/Landmark.hpp b/include/eos/core/Landmark.hpp
@@ -45,12 +45,15 @@ struct Landmark
  * @brief Representation of a landmark with mesh index.
  */
 template <class LandmarkType>
-struct IndexedLandmark: Landmark<LandmarkType>
+struct IndexedLandmark : Landmark<LandmarkType>
 {
-    int model_index;  ///< Index of landmark in mesh
+    IndexedLandmark(const Landmark<LandmarkType>& landmark, int model_index)
+        : Landmark<LandmarkType>(landmark), model_index(model_index) {}
+    IndexedLandmark(const std::string& name, const LandmarkType& coordinates, int model_index)
+        : Landmark<LandmarkType>{name, coordinates}, model_index(model_index) {}
+    int model_index; ///< Index of landmark in mesh
 };
 
-
 /**
  * @brief A trivial collection of landmarks that belong together.
  */

diff --git a/include/eos/core/LandmarkMapper.hpp b/include/eos/core/LandmarkMapper.hpp
@@ -166,8 +166,7 @@ class LandmarkMapper
                 vertex_idx = std::stoi(converted_name.value());
             }
 
-            IndexedLandmark<LandmarkType> indexed_landmark {landmark.name, landmark.coordinates, vertex_idx};
-            indexed_landmarks.emplace_back(std::move(indexed_landmark));
+            indexed_landmarks.emplace_back(landmark, vertex_idx);
         }
         return indexed_landmarks;
     }

diff --git a/include/eos/fitting/ceres_nonlinear.hpp b/include/eos/fitting/ceres_nonlinear.hpp
@@ -661,12 +661,9 @@ class ModelFitter {
                                                           camera.get_viewport());
 
         auto contour_landmarks = core::IndexedLandmarkCollection<LandmarkType>();
-        for (int i = 0; i < image_points_contour.size(); ++i) {
-            core::IndexedLandmark<LandmarkType> landmark;
-            landmark.coordinates = image_points_contour[i];
-            landmark.model_index = vertex_indices_contour[i];
-
-            contour_landmarks.emplace_back(std::move(landmark));
+        for (int i = 0; i < image_points_contour.size(); ++i)
+        {
+            contour_landmarks.emplace_back("", image_points_contour[i], vertex_indices_contour[i]);
         }
 
         return contour_landmarks;