From da3c5c2b96d56c975ec4aae7c415b9eba2c25d66 Mon Sep 17 00:00:00 2001 From: Luigi Malomo Date: Mon, 29 Nov 2021 12:15:37 +0100 Subject: [PATCH] initializer list corrected --- vcg/complex/algorithms/isotropic_remeshing.h | 4 ++-- vcg/complex/foreach.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/vcg/complex/algorithms/isotropic_remeshing.h b/vcg/complex/algorithms/isotropic_remeshing.h index 6d79897a..208a1181 100644 --- a/vcg/complex/algorithms/isotropic_remeshing.h +++ b/vcg/complex/algorithms/isotropic_remeshing.h @@ -685,7 +685,7 @@ private: testSwap(pi, params.creaseAngleCosThr) && // face::CheckFlipEdge(f, i) && face::CheckFlipEdgeNormal(f, i, float(vcg::math::ToRad(5.))) && - (!params.surfDistCheck || testHausdorff(*params.mProject, params.grid, { swapEdgeMidPoint }, params.maxSurfDist))) + (!params.surfDistCheck || testHausdorff(*params.mProject, params.grid, {{ swapEdgeMidPoint }}, params.maxSurfDist))) { //When doing the swap we need to preserve and update the crease info accordingly FaceType* g = f.cFFp(i); @@ -872,7 +872,7 @@ private: }; if (!testHausdorff(*(params.mProject), params.grid, points, params.maxSurfDist) || - !testHausdorff(*(params.mProject), params.grid, { (v1->cP() + v2->cP() + mp) / 3. }, params.maxSurfDist, newN)) + !testHausdorff(*(params.mProject), params.grid, {{ (v1->cP() + v2->cP() + mp) / 3. }}, params.maxSurfDist, newN)) return false; } } diff --git a/vcg/complex/foreach.h b/vcg/complex/foreach.h index c2fa2cef..fde75fff 100644 --- a/vcg/complex/foreach.h +++ b/vcg/complex/foreach.h @@ -244,7 +244,7 @@ inline void ForEachEdge(MeshType &m, Callable action) { for(auto ei=m.edge.begin();ei!=m.edge.end();++ei) { action(*ei); - } + } } else { @@ -252,7 +252,7 @@ inline void ForEachEdge(MeshType &m, Callable action) if(!(*ei).IsD()) { action(*ei); - } + } } } @@ -273,7 +273,7 @@ inline void ForEachTetra(const MeshType &m, Callable action) { for(auto ti = m.tetra.begin(); ti != m.tetra.end(); ++ti) { action(*ti); - } + } } else { @@ -281,7 +281,7 @@ inline void ForEachTetra(const MeshType &m, Callable action) if(!(*ti).IsD()) { action(*ti); - } + } } } @@ -292,7 +292,7 @@ inline void ForEachTetra(MeshType &m, Callable action) { for(auto ti = m.tetra.begin(); ti != m.tetra.end(); ++ti) { action(*ti); - } + } } else {