Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years ago · d0a5ecfdda
parent 9b5a801148 21c14f53a9
commit d0a5ecfdda
1 changed files with 0 additions and 2 deletions
--- a/modules/surface_matching/src/ppf_match_3d.cpp
+++ b/modules/surface_matching/src/ppf_match_3d.cpp
@ -583,9 +583,7 @@ void PPF3DDetector::match(const Mat& pc, std::vector<Pose3DPtr>& results, const
      poseList.push_back(pose);
    }

-#if defined (_OPENMP)
    free(accumulator);
-#endif
  }

  // TODO : Make the parameters relative if not arguments.