From 99c8dca30cc42d5a87eff0a996d037378ac5e103 Mon Sep 17 00:00:00 2001 From: Isaak Lim Date: Mon, 17 Sep 2012 13:37:23 +0000 Subject: [PATCH] took out an OpenMP for loop that caused non-deterministic behaviour refs #1005 git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@677 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Tools/Decimater/ModHausdorffT.cc | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/OpenMesh/Tools/Decimater/ModHausdorffT.cc b/src/OpenMesh/Tools/Decimater/ModHausdorffT.cc index cffee720..d2b2c02a 100644 --- a/src/OpenMesh/Tools/Decimater/ModHausdorffT.cc +++ b/src/OpenMesh/Tools/Decimater/ModHausdorffT.cc @@ -335,22 +335,6 @@ postprocess_collapse(const CollapseInfo& _ci) for (p_it=points.begin(); p_it!=p_end; ++p_it) { emin = FLT_MAX; -#ifdef USE_OPENMP - int facesCount = faces.size(); -#pragma omp parallel for private(e) shared(emin) - for (int i = 0; i < facesCount; ++i) { - const Point& p0 = mesh_.point(fv_it=mesh_.cfv_iter(faces[i])); - const Point& p1 = mesh_.point(++fv_it); - const Point& p2 = mesh_.point(++fv_it); - - e = distPointTriangleSquared(*p_it, p0, p1, p2, dummy); - if (e < emin) { - emin = e; - fh = faces[i]; - } - - } -#else for (fh_it=faces.begin(); fh_it!=fh_end; ++fh_it) { const Point& p0 = mesh_.point(fv_it=mesh_.cfv_iter(*fh_it)); const Point& p1 = mesh_.point(++fv_it); @@ -363,7 +347,6 @@ postprocess_collapse(const CollapseInfo& _ci) } } -#endif mesh_.property(points_, fh).push_back(*p_it); }