Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed OpenMP for loops, which caused problems because priority_collapse was executed in parallel

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@682 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Isaak Lim
2012-09-18 16:39:09 +00:00
parent 688a65aba0
commit b02909e890
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/OpenMesh/Tools/Decimater/McDecimaterT.cc
View File

@@ -60,10 +60,6 @@
# include <cfloat> # include <cfloat>
#endif #endif
#ifdef USE_OPENMP
#include <omp.h>
#endif
//== NAMESPACE =============================================================== //== NAMESPACE ===============================================================
namespace OpenMesh { namespace OpenMesh {
@@ -114,9 +110,6 @@ size_t McDecimaterT<Mesh>::decimate(size_t _n_collapses) {
double bestEnergy = FLT_MAX; double bestEnergy = FLT_MAX;
// Generate random samples for collapses // Generate random samples for collapses
#ifdef USE_OPENMP
#pragma omp parallel for shared(bestEnergy, bestHandle)
#endif
for ( int i = 0; i < (int)randomSamples_; ++i) { for ( int i = 0; i < (int)randomSamples_; ++i) {
// Random halfedge handle // Random halfedge handle
@@ -208,9 +201,6 @@ size_t McDecimaterT<Mesh>::decimate_to_faces(size_t _nv, size_t _nf) {
// Generate random samples for collapses // Generate random samples for collapses
unsigned int legalCollapses = 0; unsigned int legalCollapses = 0;
#ifdef USE_OPENMP
#pragma omp parallel for shared(bestEnergy, bestHandle, legalCollapses)
#endif
for ( int i = 0; i < (int)randomSamples_; ++i) { for ( int i = 0; i < (int)randomSamples_; ++i) {
// Random halfedge handle // Random halfedge handle