From 50b65f72c02382d826802fa7c76ebc7bf53611fc Mon Sep 17 00:00:00 2001
From: neoraider <devnull@localhost>
Date: Thu, 27 Sep 2007 08:27:04 +0000
Subject: Einige Warnungen mit -Wall gefixt

---
 Line.cpp | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

(limited to 'Line.cpp')

diff --git a/Line.cpp b/Line.cpp
index 463a6ab..aa7bcad 100644
--- a/Line.cpp
+++ b/Line.cpp
@@ -3,31 +3,31 @@
 
 
 bool Line::contains(const Vertex &v) const {
-  if(fabs(v1.getX() - v2.getX()) < 1E-6 && fabs(v1.getY() - v2.getY()) < 1E-6) {
-    if(fabs(v1.getX() - v.getX()) < 1E-6 && fabs(v1.getY() - v.getY()) < 1E-6)
+  if(fabsf(v1.getX() - v2.getX()) < 1E-6 && fabsf(v1.getY() - v2.getY()) < 1E-6) {
+    if(fabsf(v1.getX() - v.getX()) < 1E-6 && fabsf(v1.getY() - v.getY()) < 1E-6)
       return true;
     else
       return false;
   }
   
-  if(fabs(v1.getX() - v2.getX()) < 1E-6) {
-    if(fabs(v1.getX() - v.getX()) >= 1E-6)
+  if(fabsf(v1.getX() - v2.getX()) < 1E-6) {
+    if(fabsf(v1.getX() - v.getX()) >= 1E-6)
       return false;
-    else if(v.getY() - fmin(v1.getY(), v2.getY()) > -1E-6 && v.getY() - fmax(v1.getY(), v2.getY()) < 1E-6)
+    else if(v.getY() - fminf(v1.getY(), v2.getY()) > -1E-6 && v.getY() - fmaxf(v1.getY(), v2.getY()) < 1E-6)
       return true;
     else
       return false;
   }
   
-  if(fabs(v1.getY() - v2.getY()) < 1E-6) {
-    if(fabs(v1.getY() - v.getY()) >= 1E-6)
+  if(fabsf(v1.getY() - v2.getY()) < 1E-6) {
+    if(fabsf(v1.getY() - v.getY()) >= 1E-6)
       return false;
-    else if(v.getX() - fmin(v1.getX(), v2.getX()) > -1E-6 && v.getX() - fmax(v1.getX(), v2.getX()) < 1E-6)
+    else if(v.getX() - fminf(v1.getX(), v2.getX()) > -1E-6 && v.getX() - fmaxf(v1.getX(), v2.getX()) < 1E-6)
       return true;
     else
       return false;
   }
-  if(fabs((v.getX()-v1.getX())/(v2.getX()-v1.getX()) - (v.getY()-v1.getY())/(v2.getY()-v1.getY())) < 1E-6)
+  if(fabsf((v.getX()-v1.getX())/(v2.getX()-v1.getX()) - (v.getY()-v1.getY())/(v2.getY()-v1.getY())) < 1E-6)
     return true;
   else
     return false;
@@ -39,32 +39,32 @@ int Line::intersects(const Line &l, Vertex *v) const {
   float xb1 = l.v1.getX(), yb1 = l.v1.getY();
   float xb2 = l.v2.getX(), yb2 = l.v2.getY();
   float temp;
-  int switched = 0;
+  bool switched = false;
   Vertex v2;
   
   
   if(!v) v = &v2;
   
-  if(fabs(xa1 - xa2) < 1E-6 && fabs(ya1 - ya2) < 1E-6) return INTERSECTION_ERROR;
-  if(fabs(xb1 - xb2) < 1E-6 && fabs(yb1 - yb2) < 1E-6) return INTERSECTION_ERROR;
+  if(fabsf(xa1 - xa2) < 1E-6 && fabsf(ya1 - ya2) < 1E-6) return INTERSECTION_ERROR;
+  if(fabsf(xb1 - xb2) < 1E-6 && fabsf(yb1 - yb2) < 1E-6) return INTERSECTION_ERROR;
   
-  if(fabs(xa1 - xa2) < 1E-6 || fabs(xb1 - xb2) < 1E-6) {
+  if(fabsf(xa1 - xa2) < 1E-6 || fabsf(xb1 - xb2) < 1E-6) {
     temp = xa1; xa1 = ya1; ya1 = temp;
     temp = xa2; xa2 = ya2; ya2 = temp;
     temp = xb1; xb1 = yb1; yb1 = temp;
     temp = xb2; xb2 = yb2; yb2 = temp;
     
-    switched = 1;
+    switched = true;
   }
   
-  if(fabs(xa1 - xa2) < 1E-6 && fabs(xb1 - xb2) < 1E-6)
-    return (fabs(xa1 - xb1) < 1E-6) ? INTERSECTION_IDENTICAL : INTERSECTION_NONE;
+  if(fabsf(xa1 - xa2) < 1E-6 && fabsf(xb1 - xb2) < 1E-6)
+    return (fabsf(xa1 - xb1) < 1E-6) ? INTERSECTION_IDENTICAL : INTERSECTION_NONE;
   
-  if(fabs(xa1 - xa2) < 1E-6) {
+  if(fabsf(xa1 - xa2) < 1E-6) {
     v->setX(xa1);
     v->setY(yb1);
   }
-  else if(fabs(xb1 - xb2) < 1E-6) {
+  else if(fabsf(xb1 - xb2) < 1E-6) {
     v->setX(xb1);
     v->setY(ya1);
   }
@@ -74,7 +74,7 @@ int Line::intersects(const Line &l, Vertex *v) const {
     float ba = ya1 - ma*xa1;
     float bb = yb1 - mb*xb1;
     
-    if(fabs(ma - mb) < 1E-6) return (fabs(ba - bb) < 1E-6) ? INTERSECTION_IDENTICAL : INTERSECTION_NONE;
+    if(fabsf(ma - mb) < 1E-6) return (fabsf(ba - bb) < 1E-6) ? INTERSECTION_IDENTICAL : INTERSECTION_NONE;
     
     v->setX((bb-ba)/(ma-mb));
     v->setY(ma*v->getX() + ba);
@@ -90,14 +90,15 @@ int Line::intersects(const Line &l, Vertex *v) const {
     temp = xb2; xb2 = yb2; yb2 = temp;
   }
   
-  if(v->getX() < fmin(xa1,xa2) || v->getX() > fmax(xa1, xa2) || v->getY() < fmin(ya1,ya2) || v->getY() > fmax(ya1, ya2)) {
-    if(v->getX() < fmin(xb1,xb2) || v->getX() > fmax(xb1, xb2) || v->getY() < fmin(yb1,yb2) || v->getY() > fmax(yb1, yb2))
+  if(v->getX() < fminf(xa1,xa2) || v->getX() > fmaxf(xa1, xa2) || v->getY() < fminf(ya1,ya2) || v->getY() > fmaxf(ya1, ya2)) {
+    if(v->getX() < fminf(xb1,xb2) || v->getX() > fmaxf(xb1, xb2) || v->getY() < fminf(yb1,yb2) || v->getY() > fmaxf(yb1, yb2))
       return INTERSECTION_LINE_LINE;
     else
       return INTERSECTION_LINE_SEGMENT;
   }
-  else if(v->getX() < fmin(xb1,xb2) || v->getX() > fmax(xb1, xb2) || v->getY() < fmin(yb1,yb2) || v->getY() > fmax(yb1, yb2))
+  else if(v->getX() < fminf(xb1,xb2) || v->getX() > fmaxf(xb1, xb2) || v->getY() < fminf(yb1,yb2) || v->getY() > fmaxf(yb1, yb2))
     return INTERSECTION_SEGMENT_LINE;
   else
     return INTERSECTION_SEGMENT_SEGMENT;
 }
+
-- 
cgit v1.2.3