r246: More modifications for MSVC

[ctsim.git] / libctsupport / clip.cpp

diff --git a/libctsupport/clip.cpp b/libctsupport/clip.cpp
index ebf94c2ee02c7f3485fc8ea0a841219af70f2b07..2123c29f0fe6b9b6a63d141b3cb52efaa685e057 100644 (file)
--- a/libctsupport/clip.cpp
+++ b/libctsupport/clip.cpp
@@ -14,7 +14,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: clip.cpp,v 1.3 2000/06/22 10:17:28 kevin Exp $
+**  $Id: clip.cpp,v 1.5 2000/12/06 01:46:43 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -251,8 +251,7 @@ clip_triangle (double& x1, double& y1, double& x2, double& y2, const double u, c
   int c2 = tcode (x2, y2, m, b, clip_xaxis);
 
 #ifdef DEBUG
-  crt_set_cpos (1,1);
-  printf ("x1:%6.2f  y1:%6.2f  code1:%2d  x2:%6.2f  y2:%6.2f code2:%2d",
+  printf ("x1:%6.2f  y1:%6.2f  code1:%2d  x2:%6.2f  y2:%6.2f code2:%2d\n",
           x1, y1, c1, x2, y2, c2);
 #endif
   while ( c1 || c2 ) {
@@ -294,8 +293,7 @@ clip_triangle (double& x1, double& y1, double& x2, double& y2, const double u, c
       x2=x; y2=y; c2=tcode (x2,y2,m,b,clip_xaxis);
     }
 #ifdef DEBUG
-    crt_set_cpos (1,1);
-    printf ("x1:%6.2f  y1:%6.2f  code1:%2d  x2:%6.2f  y2:%6.2f code2:%2d", x1, y1, c1, x2, y2, c2);
+    printf ("x1:%6.2f  y1:%6.2f  code1:%2d  x2:%6.2f  y2:%6.2f code2:%2d\n", x1, y1, c1, x2, y2, c2);
 #endif
   }
 
@@ -333,7 +331,7 @@ tcode (const double x, const double y, const double m, const double b, const int
 
 static int rectcode (double x, double y, const double rect[4]);
 
-int 
+bool\r
 clip_rect (double& x1, double& y1, double& x2, double& y2, const double rect[4])
 {
   double x = 0, y = 0;