Merge pull request #1054 from Sahloul:bugs/surface_matching/cluster_poses_allocation

004b583c · Alexander Alekhin · 2ca605a1 · 6b6d5a48 · 004b583c · 004b583c
Commit 004b583c authored Mar 09, 2017 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ppf_match_3d.hpp ...atching/include/opencv2/surface_matching/ppf_match_3d.hpp +1 -1

ppf_match_3d.cpp modules/surface_matching/src/ppf_match_3d.cpp +1 -1

No files found.
--- a/modules/surface_matching/include/opencv2/surface_matching/ppf_match_3d.hpp
+++ b/modules/surface_matching/include/opencv2/surface_matching/ppf_match_3d.hpp
@@ -166,7 +166,7 @@ private:

  bool matchPose(const Pose3D& sourcePose, const Pose3D& targetPose);

-  void clusterPoses(std::vector<Pose3DPtr> poseList, int numPoses, std::vector<Pose3DPtr> &finalPoses);
+  void clusterPoses(std::vector<Pose3DPtr>& poseList, int numPoses, std::vector<Pose3DPtr> &finalPoses);

  bool trained;
 };

--- a/modules/surface_matching/src/ppf_match_3d.cpp
+++ b/modules/surface_matching/src/ppf_match_3d.cpp
@@ -327,7 +327,7 @@ bool PPF3DDetector::matchPose(const Pose3D& sourcePose, const Pose3D& targetPose
  return (phi<this->rotation_threshold && dNorm < this->position_threshold);
 }

-void PPF3DDetector::clusterPoses(std::vector<Pose3DPtr> poseList, int numPoses, std::vector<Pose3DPtr> &finalPoses)
+void PPF3DDetector::clusterPoses(std::vector<Pose3DPtr>& poseList, int numPoses, std::vector<Pose3DPtr> &finalPoses)
 {
  std::vector<PoseCluster3DPtr> poseClusters;