r7061: initial property settings

[ctsim.git] / libctsupport / clip.cpp

diff --git a/libctsupport/clip.cpp b/libctsupport/clip.cpp
index 2123c29f0fe6b9b6a63d141b3cb52efaa685e057..dac3de1e9d8ce88b6201e0f945e90ddb67e441bd 100644 (file)
--- a/libctsupport/clip.cpp
+++ b/libctsupport/clip.cpp
@@ -12,9 +12,9 @@
 **     the SNARK size of the object (u,v)
 **
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
+**  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: clip.cpp,v 1.5 2000/12/06 01:46:43 kevin Exp $
+**  $Id$
 **
 **  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
@@ -42,7 +42,7 @@
  *    double u,v               Dimensions of segment
  */
 
-int 
+bool
 clip_segment (double& x1, double& y1, double& x2, double& y2, const double u, const double v)
 {
   double xc1 = x1 * u;
@@ -88,7 +88,7 @@ clip_segment (double& x1, double& y1, double& x2, double& y2, const double u, co
  *    double u,v               Size of sector
  */
 
-int 
+bool 
 clip_sector (double& x1, double& y1, double& x2, double& y2, const double u, const double v)
 {
   double xc1 = x1 * u;
@@ -124,7 +124,7 @@ clip_sector (double& x1, double& y1, double& x2, double& y2, const double u, con
  *    double t1,t2             Starting & stopping angles of clipping
  */
 
-int 
+bool 
 clip_circle (double& x1, double& y1, double& x2, double& y2, const double cx, const double cy, const double radius, double t1, double t2)
 {
   double xc1 = x1;
@@ -241,7 +241,7 @@ clip_circle (double& x1, double& y1, double& x2, double& y2, const double cx, co
 
 static int tcode (const double x, const double y, const double m, const double b, const int clip_xaxis);
 
-int 
+bool 
 clip_triangle (double& x1, double& y1, double& x2, double& y2, const double u, const double v, const int clip_xaxis)
 {
   double m = v / u;     // slope of triangle lines
@@ -250,9 +250,8 @@ clip_triangle (double& x1, double& y1, double& x2, double& y2, const double u, c
   int c1 = tcode (x1, y1, m, b, clip_xaxis);
   int c2 = tcode (x2, y2, m, b, clip_xaxis);
 
-#ifdef DEBUG
-  printf ("x1:%6.2f  y1:%6.2f  code1:%2d  x2:%6.2f  y2:%6.2f code2:%2d\n",
-          x1, y1, c1, x2, y2, c2);
+#if 0
+  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 ) {
     if ( c1 & c2 ) {
@@ -292,7 +291,7 @@ clip_triangle (double& x1, double& y1, double& x2, double& y2, const double u, c
     } else {
       x2=x; y2=y; c2=tcode (x2,y2,m,b,clip_xaxis);
     }
-#ifdef DEBUG
+#if 0
     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
   }
@@ -331,7 +330,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]);
 
-bool\r
+bool
 clip_rect (double& x1, double& y1, double& x2, double& y2, const double rect[4])
 {
   double x = 0, y = 0;