Merge pull request #1552 from taketwo/align-matching-canditates

Use aligned allocator in vectors of MatchingCandidate
PointCloudLibrary · Feb 24, 2016 · b633abf · b633abf
2 parents 94136ee + 0f71397
commit b633abf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/registration/include/pcl/registration/ia_fpcs.h b/registration/include/pcl/registration/ia_fpcs.h
@@ -94,7 +94,7 @@ namespace pcl
       typedef typename Normals::ConstPtr NormalsConstPtr;
 
       typedef pcl::registration::MatchingCandidate MatchingCandidate;
-      typedef std::vector <MatchingCandidate> MatchingCandidates;
+      typedef pcl::registration::MatchingCandidates MatchingCandidates;
       /** \endcond */
 
 

diff --git a/registration/include/pcl/registration/ia_kfpcs.h b/registration/include/pcl/registration/ia_kfpcs.h
@@ -69,7 +69,7 @@ namespace pcl
       typedef typename PointCloudTarget::iterator PointCloudTargetIterator;
 
       typedef pcl::registration::MatchingCandidate MatchingCandidate;
-      typedef std::vector <MatchingCandidate> MatchingCandidates;
+      typedef pcl::registration::MatchingCandidates MatchingCandidates;
       /** \endcond */
 
 

diff --git a/registration/include/pcl/registration/matching_candidate.h b/registration/include/pcl/registration/matching_candidate.h
@@ -86,6 +86,8 @@ namespace pcl
       EIGEN_MAKE_ALIGNED_OPERATOR_NEW
     };
 
+    typedef std::vector<MatchingCandidate, Eigen::aligned_allocator<MatchingCandidate> > MatchingCandidates;
+
     /** \brief Sorting of candidates based on fitness score value. */
     struct by_score
     {