diff --git a/apps/sample/trimesh_disk_parametrization/trimesh_disk_parametrization.cpp b/apps/sample/trimesh_disk_parametrization/trimesh_disk_parametrization.cpp index fb2b37dd..ba7406d7 100644 --- a/apps/sample/trimesh_disk_parametrization/trimesh_disk_parametrization.cpp +++ b/apps/sample/trimesh_disk_parametrization/trimesh_disk_parametrization.cpp @@ -60,7 +60,7 @@ int main( int argc, char **argv ) printf("Mesh has %i vn %i fn\n",m.VN(),m.FN()); tri::PoissonSolver PS(m); - if(!PS.IsFeaseable()) + if(!PS.IsFeasible()) { printf("mesh is not homeomorphic to a disk\n"); return -1; diff --git a/vcg/complex/algorithms/parametrization/poisson_solver.h b/vcg/complex/algorithms/parametrization/poisson_solver.h index 5aa36d4f..68c18a64 100644 --- a/vcg/complex/algorithms/parametrization/poisson_solver.h +++ b/vcg/complex/algorithms/parametrization/poisson_solver.h @@ -541,7 +541,7 @@ class PoissonSolver public: ///return true if is possible to - bool IsFeaseable() + bool IsFeasible() { tri::UpdateTopology::FaceFace(mesh); int NNmanifoldE=tri::Clean::CountNonManifoldEdgeFF(mesh); @@ -575,13 +575,12 @@ public: for (size_t i=0;iIsD())continue; - if(v->IsB())to_fix.push_back(v); + if (v->IsD()) continue; + if(v->IsB()) to_fix.push_back(v); } std::sort(to_fix.begin(),to_fix.end()); - typename std::vector::iterator new_end=std::unique(to_fix.begin(),to_fix.end()); - int dist=distance(to_fix.begin(),new_end); - to_fix.resize(dist); + auto new_end=std::unique(to_fix.begin(),to_fix.end()); + to_fix.resize(distance(to_fix.begin(),new_end)); } ///set selected vertices as fixed diff --git a/vcg/complex/algorithms/parametrization/voronoi_atlas.h b/vcg/complex/algorithms/parametrization/voronoi_atlas.h index 1edbaaab..eb0fb685 100644 --- a/vcg/complex/algorithms/parametrization/voronoi_atlas.h +++ b/vcg/complex/algorithms/parametrization/voronoi_atlas.h @@ -184,7 +184,7 @@ public: tri::Append::Mesh(*rm, m, true); int tp0=clock(); tri::PoissonSolver PS(*rm); - if(PS.IsFeaseable()) + if(PS.IsFeasible()) { PS.Init(); PS.FixDefaultVertices();