dri: Rework planar image interface

[mesa.git] / src / glu / sgi / libnurbs / internals / intersect.cc

diff --git a/src/glu/sgi/libnurbs/internals/intersect.cc b/src/glu/sgi/libnurbs/internals/intersect.cc
index 2d69224b2ae174c3c901930836b746662153a5b6..b39ea2121eff5f72d2962da7679cdeeb65f8c67e 100644 (file)
--- a/src/glu/sgi/libnurbs/internals/intersect.cc
+++ b/src/glu/sgi/libnurbs/internals/intersect.cc
@@ -35,8 +35,6 @@
 /*
  * intersect.c++
  *
- * $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/intersect.cc,v 1.1 2001/03/17 00:25:41 brianp Exp $
  */
 
 #include "glimports.h"
@@ -53,7 +51,9 @@
 enum i_result { INTERSECT_VERTEX, INTERSECT_EDGE };
 
 /* local functions */
+#ifndef NDEBUG  // for asserts only
 static int             arc_classify( Arc_ptr, int, REAL );
+#endif
 static enum i_result   pwlarc_intersect( PwlArc *, int, REAL, int, int[3] );
 
 
@@ -175,7 +175,7 @@ int
 Subdivider::arc_split( Arc_ptr jarc, int param, REAL value, int dir )
 {
     int                maxvertex = jarc->pwlArc->npts;
-    Arc_ptr    jarc1, jarc2, jarc3;
+    Arc_ptr    jarc1;
     TrimVertex* v = jarc->pwlArc->pts;
 
     int                loc[3];
@@ -258,7 +258,8 @@ Subdivider::arc_split( Arc_ptr jarc, int param, REAL value, int dir )
 #endif //not NOTDEF
                // JEB: This is the original version:
 #ifdef NOTDEF
-
+            Arc_ptr    jarc2, jarc3;
+           
            TrimVertex *newjunk = trimvertexpool.get(3);
            v[i].nuid = jarc->nuid;
            v[j].nuid = jarc->nuid;
@@ -399,6 +400,7 @@ pwlarc_intersect(
  *----------------------------------------------------------------------------
  */
 
+#ifndef NDEBUG  // for asserts only
 static int
 arc_classify( Arc_ptr jarc, int param, REAL value )
 {
@@ -437,6 +439,7 @@ arc_classify( Arc_ptr jarc, int param, REAL value )
        }
     }
 }
+#endif
 
 void
 Subdivider::classify_tailonleft_s( Bin& bin, Bin& in, Bin& out, REAL val )