View | Details | Raw Unified | Return to bug 208845
Collapse All | Expand All

(-)graphics/inventor/files/patch-arc.c++ (+11 lines)
Line 0 Link Here
1
--- lib/database/src/so/nodes/nurbs/libnurbs/arc.c++.orig	2000-08-15 12:56:22 UTC
2
+++ lib/database/src/so/nodes/nurbs/libnurbs/arc.c++
3
@@ -332,7 +332,7 @@ Arc::check( void )
4
 
5
 inline long tooclose( REAL x, REAL y )
6
 {
7
-    return (abs(x-y) < TOL) ?  1 : 0;
8
+    return (absr(x-y) < TOL) ?  1 : 0;
9
 }
10
 
11
 
(-)graphics/inventor/files/patch-arctess.c++ (+35 lines)
Line 0 Link Here
1
--- lib/database/src/so/nodes/nurbs/libnurbs/arctess.c++.orig	2000-08-15 12:56:22 UTC
2
+++ lib/database/src/so/nodes/nurbs/libnurbs/arctess.c++
3
@@ -247,8 +247,8 @@ ArcTessellator::pwl( Arc *arc, REAL s1, 
4
 
5
 /*    if(rate <= 0.06) rate = 0.06;*/
6
 
7
-    int snsteps = 1 + (int) (abs(s2 - s1) / rate );
8
-    int tnsteps = 1 + (int) (abs(t2 - t1) / rate );
9
+    int snsteps = 1 + (int) (absr(s2 - s1) / rate );
10
+    int tnsteps = 1 + (int) (absr(t2 - t1) / rate );
11
     int nsteps = max(1,max( snsteps, tnsteps ));
12
 
13
     REAL sstepsize = (s2 - s1) / (REAL) nsteps;
14
@@ -395,8 +395,8 @@ ArcTessellator::tessellateNonlinear( Arc
15
             vert->param[0] = u/w;
16
     	    vert->param[1] = v/w;
17
 #ifndef NOELIMINATION
18
-	    REAL ds = abs(vert[0].param[0] - vert[-1].param[0]);
19
-	    REAL dt = abs(vert[0].param[1] - vert[-1].param[1]);
20
+	    REAL ds = absr(vert[0].param[0] - vert[-1].param[0]);
21
+	    REAL dt = absr(vert[0].param[1] - vert[-1].param[1]);
22
 	    int canremove = (ds<geo_stepsize && dt<geo_stepsize) ? 1 : 0;
23
 	    REAL ods=0.0, odt=0.0;
24
 
25
@@ -454,8 +454,8 @@ ArcTessellator::tessellateNonlinear( Arc
26
             vert->param[0] = u;
27
 	    vert->param[1] = v;
28
 #ifndef NOELIMINATION
29
-	    REAL ds = abs(vert[0].param[0] - vert[-1].param[0]);
30
-	    REAL dt = abs(vert[0].param[1] - vert[-1].param[1]);
31
+	    REAL ds = absr(vert[0].param[0] - vert[-1].param[0]);
32
+	    REAL dt = absr(vert[0].param[1] - vert[-1].param[1]);
33
 	    int canremove = (ds<geo_stepsize && dt<geo_stepsize) ? 1 : 0;
34
 	    REAL ods=0.0, odt=0.0;
35
 
(-)graphics/inventor/files/patch-ccw.c++ (+10 lines)
Line 0 Link Here
1
--- lib/database/src/so/nodes/nurbs/libnurbs/ccw.c++.orig	2000-08-15 12:56:22 UTC
2
+++ lib/database/src/so/nodes/nurbs/libnurbs/ccw.c++
3
@@ -508,6 +508,6 @@ int
4
 Subdivider::ccw( TrimVertex *a, TrimVertex *b, TrimVertex *c )
5
 {
6
     REAL d = det3( a, b, c );
7
-    if( abs(d) < 0.0001 ) return -1;
8
+    if( absr(d) < 0.0001 ) return -1;
9
     return (d < 0.0) ? 0 : 1;
10
 }
(-)graphics/inventor/files/patch-simplemath.h (+10 lines)
Line 0 Link Here
1
--- lib/database/src/so/nodes/nurbs/head/simplemath.h.orig	2000-08-15 12:56:22 UTC
2
+++ lib/database/src/so/nodes/nurbs/head/simplemath.h
3
@@ -54,6 +54,6 @@ inline int 
4
 absi( int x ) { return ( x < 0 ) ? -x : x; }
5
 
6
 inline REAL 
7
-abs( REAL x ) { return ( x < 0.0 ) ? -x : x; }
8
+absr( REAL x ) { return ( x < 0.0 ) ? -x : x; }
9
 
10
 #endif /* __glusimplemath_h_ */
(-)graphics/inventor/files/patch-softsurfeval.c++ (+13 lines)
Line 0 Link Here
1
--- lib/database/src/so/nodes/nurbs/clients/softsurfeval.c++.orig	2000-08-15 12:56:22 UTC
2
+++ lib/database/src/so/nodes/nurbs/clients/softsurfeval.c++
3
@@ -50,8 +50,8 @@
4
 #include "softsurfeval.h"
5
 #include "nurbsconsts.h"
6
 
7
-inline REAL abs( REAL x ) { return (x < 0.0) ? -x : x; }
8
-inline int equal( REAL x, REAL y ) { return (abs(x-y) < 1.0E-6) ? 1 : 0; }
9
+inline REAL absr( REAL x ) { return (x < 0.0) ? -x : x; }
10
+inline int equal( REAL x, REAL y ) { return (absr(x-y) < 1.0E-6) ? 1 : 0; }
11
 
12
 _SoNurbsSurfaceEvaluator::~_SoNurbsSurfaceEvaluator() 
13
 { 

Return to bug 208845