From 4c1a6502b264e4910b98611473d3366c7c19e1d3 Mon Sep 17 00:00:00 2001
From: cignoni <paolo.cignoni@isti.cnr.it>
Date: Thu, 17 Feb 2011 16:39:38 +0000
Subject: [PATCH] harmless gcc warnings (ambiguous boolean expressions)

---
 vcg/complex/trimesh/point_sampling.h | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/vcg/complex/trimesh/point_sampling.h b/vcg/complex/trimesh/point_sampling.h
index 90244682..8a7ae328 100644
--- a/vcg/complex/trimesh/point_sampling.h
+++ b/vcg/complex/trimesh/point_sampling.h
@@ -1021,15 +1021,19 @@ static void FaceSimilar(MetroMesh & m, VertexSampler &ps,int sampleNum, bool dua
 					{
 						Point2<S> close;
 						S dst;
-						if ( (!flipped && n[i]<0 || flipped && n[i]>0) &&
-							 (dst = ((close = ClosestPoint(borderEdges[i], px)) - px).Norm()) < minDst &&
-							 close.X() > px.X()-1 && close.X() < px.X()+1 &&
-							 close.Y() > px.Y()-1 && close.Y() < px.Y()+1)
-						{
-							minDst = dst;
-							closePoint = close;
-							closeEdge = i;
-						}
+                        if ( ((!flipped) && (n[i]<0)) ||
+                             (  flipped  && (n[i]>0))   )
+                        {
+                            dst = ((close = ClosestPoint(borderEdges[i], px)) - px).Norm();
+                            if(dst < minDst &&
+                               close.X() > px.X()-1 && close.X() < px.X()+1 &&
+                               close.Y() > px.Y()-1 && close.Y() < px.Y()+1)
+                            {
+                                minDst = dst;
+                                closePoint = close;
+                                closeEdge = i;
+                            }
+                        }
 					}
                 }