diff options
| author | Karl Schultz <[email protected]> | 2001-11-29 16:16:55 +0000 |
|---|---|---|
| committer | Karl Schultz <[email protected]> | 2001-11-29 16:16:55 +0000 |
| commit | 9c8cbe6950096c4ec2fd1963edbc6c993c86947f (patch) | |
| tree | 3dcf4a5d511c59e94f25740afb028ca5e7fca8ca /src/glu/sgi/libnurbs/internals/mapdesc.cc | |
| parent | 4e6c835210bd0e8e8467a1c75723af6af4b41fb4 (diff) | |
Fix compilation errors and warnings for NURBS support. (Robert Bergkvist)
Diffstat (limited to 'src/glu/sgi/libnurbs/internals/mapdesc.cc')
| -rw-r--r-- | src/glu/sgi/libnurbs/internals/mapdesc.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/glu/sgi/libnurbs/internals/mapdesc.cc b/src/glu/sgi/libnurbs/internals/mapdesc.cc index 893ab743386..14d01582b09 100644 --- a/src/glu/sgi/libnurbs/internals/mapdesc.cc +++ b/src/glu/sgi/libnurbs/internals/mapdesc.cc @@ -35,8 +35,8 @@ /* * mapdesc.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/mapdesc.cc,v 1.1 2001/03/17 00:25:41 brianp Exp $ + * $Date: 2001/11/29 16:16:55 $ $Revision: 1.2 $ + * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/mapdesc.cc,v 1.2 2001/11/29 16:16:55 kschultz Exp $ */ #include <stdio.h> @@ -372,13 +372,13 @@ Mapdesc::xformAndCullCheck( unsigned int bits = clipbits( cpts ); outbits |= bits; inbits &= bits; - if( ( outbits == mask ) && ( inbits != mask ) ) return CULL_ACCEPT; + if( ( outbits == (unsigned int)mask ) && ( inbits != (unsigned int)mask ) ) return CULL_ACCEPT; } } - if( outbits != mask ) { + if( outbits != (unsigned int)mask ) { return CULL_TRIVIAL_REJECT; - } else if( inbits == mask ) { + } else if( inbits == (unsigned int)mask ) { return CULL_TRIVIAL_ACCEPT; } else { return CULL_ACCEPT; @@ -404,13 +404,13 @@ Mapdesc::cullCheck( REAL *pts, int uorder, int ustride, int vorder, int vstride unsigned int bits = clipbits( q ); outbits |= bits; inbits &= bits; - if( ( outbits == mask ) && ( inbits != mask ) ) return CULL_ACCEPT; + if( ( outbits == (unsigned int)mask ) && ( inbits != (unsigned int)mask ) ) return CULL_ACCEPT; } } - if( outbits != mask ) { + if( outbits != (unsigned int)mask ) { return CULL_TRIVIAL_REJECT; - } else if( inbits == mask ) { + } else if( inbits == (unsigned int)mask ) { return CULL_TRIVIAL_ACCEPT; } else { return CULL_ACCEPT; @@ -434,12 +434,12 @@ Mapdesc::cullCheck( REAL *pts, int order, int stride ) unsigned int bits = clipbits( p ); outbits |= bits; inbits &= bits; - if( ( outbits == mask ) && ( inbits != mask ) ) return CULL_ACCEPT; + if( ( outbits == (unsigned int)mask ) && ( inbits != (unsigned int)mask ) ) return CULL_ACCEPT; } - if( outbits != mask ) { + if( outbits != (unsigned int)mask ) { return CULL_TRIVIAL_REJECT; - } else if( inbits == mask ) { + } else if( inbits == (unsigned int)mask ) { return CULL_TRIVIAL_ACCEPT; } else { return CULL_ACCEPT; |