From 4e3f08e134e922d0c4b50c002f3c4ff535f0b95f Mon Sep 17 00:00:00 2001
From: nico <nico.pietroni@gmail.com>
Date: Tue, 31 Aug 2021 21:38:59 +1000
Subject: [PATCH] corrected some simple warning and avoided collapse of edges
 of triangular faces for polygons

---
 .../algorithms/parametrization/tangent_field_operators.h  | 2 +-
 vcg/complex/algorithms/polygonal_algorithms.h             | 8 ++++++++
 vcg/container/simple_temporary_data.h                     | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/vcg/complex/algorithms/parametrization/tangent_field_operators.h b/vcg/complex/algorithms/parametrization/tangent_field_operators.h
index 4dfb3963..6e2d3087 100644
--- a/vcg/complex/algorithms/parametrization/tangent_field_operators.h
+++ b/vcg/complex/algorithms/parametrization/tangent_field_operators.h
@@ -624,7 +624,7 @@ public:
         do
         {
             std::vector<int> new_queue;
-            for (int i=0; i<queue.size(); i++)
+            for (size_t i=0; i<queue.size(); i++)
             {
                 FaceType *f0=&(mesh.face[queue[i]]);
                 assert(!f0->IsD());
diff --git a/vcg/complex/algorithms/polygonal_algorithms.h b/vcg/complex/algorithms/polygonal_algorithms.h
index a8988afd..6d1807de 100644
--- a/vcg/complex/algorithms/polygonal_algorithms.h
+++ b/vcg/complex/algorithms/polygonal_algorithms.h
@@ -1181,6 +1181,14 @@ public:
             for (int j=0;j<poly_m.face[i].VN();j++)
                 valenceVertH[poly_m.face[i].V(j)]++;
 
+        //cannot collapse triangular vertices otherwise will collapse to a segment
+        for (size_t i=0;i<poly_m.face.size();i++)
+        {
+            if (poly_m.face[i].VN()>3)continue;
+            for (int j=0;j<poly_m.face[i].VN();j++)
+                valenceVertH[poly_m.face[i].V(j)]=3;
+        }
+
         //then re-elaborate the faces
         for (size_t i=0;i<poly_m.face.size();i++)
         {
diff --git a/vcg/container/simple_temporary_data.h b/vcg/container/simple_temporary_data.h
index 4e91c195..9b175faf 100644
--- a/vcg/container/simple_temporary_data.h
+++ b/vcg/container/simple_temporary_data.h
@@ -82,7 +82,7 @@ public:
     void resize(size_t sz)
     {
         int oldDatasize = datasize;
-        if (sz <= oldDatasize)
+        if ((int)sz <= oldDatasize)
             return;
         if (sz > datareserve)
             reserve(sz);