diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-03-29 18:46:46 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-03-29 18:46:46 +0000 |
| commit | c3051df8e18882d9c8ffb795622af24aded555b4 (patch) | |
| tree | bde7e3cccbdfc830e79fbee3544d04b610357081 /src/glu/sgi/libnurbs/internals | |
| parent | db79d2abacfc946e80ae3ca6a27953925ccf50b9 (diff) | |
fixes from John Shell (bug 6339)
Diffstat (limited to 'src/glu/sgi/libnurbs/internals')
| -rw-r--r-- | src/glu/sgi/libnurbs/internals/arctess.cc | 2 | ||||
| -rw-r--r-- | src/glu/sgi/libnurbs/internals/bufpool.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/glu/sgi/libnurbs/internals/arctess.cc b/src/glu/sgi/libnurbs/internals/arctess.cc index e633626de06..29e7cf4c002 100644 --- a/src/glu/sgi/libnurbs/internals/arctess.cc +++ b/src/glu/sgi/libnurbs/internals/arctess.cc @@ -335,7 +335,7 @@ ArcTessellator::tessellateNonlinear( Arc *arc, REAL geo_stepsize, REAL arc_steps REAL min_u, min_v, max_u,max_v; min_u = max_u = bezierArc->cpts[0]; min_v = max_v = bezierArc->cpts[1]; - for(i=1, j=2; i<bezierArc->order; i++, j+= bezierArc->stride) + for(i=1, j=bezierArc->stride; i<bezierArc->order; i++, j+= bezierArc->stride) { if(bezierArc->cpts[j] < min_u) min_u = bezierArc->cpts[j]; diff --git a/src/glu/sgi/libnurbs/internals/bufpool.h b/src/glu/sgi/libnurbs/internals/bufpool.h index 90c775e4b75..02e4ff247b6 100644 --- a/src/glu/sgi/libnurbs/internals/bufpool.h +++ b/src/glu/sgi/libnurbs/internals/bufpool.h @@ -35,8 +35,8 @@ /* * bufpool.h * - * $Date: 2001/03/22 11:38:36 $ $Revision: 1.2 $ - * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/bufpool.h,v 1.2 2001/03/22 11:38:36 joukj Exp $ + * $Date: 2006/03/29 18:46:46 $ $Revision: 1.3 $ + * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/bufpool.h,v 1.3 2006/03/29 18:46:46 brianp Exp $ */ #ifndef __glubufpool_h_ @@ -128,6 +128,7 @@ public: inline void * operator new( size_t s) { return ::new char[s]; } inline void operator delete( void * ) { assert( 0 ); } + inline void operator delete( void *, Pool & ) { assert( 0 ); } inline void deleteMe( Pool & ); }; |