Mesa (mesa_7_6_branch): glu/sgi: Silence compiler warnings.
Vinson Lee
vlee at kemper.freedesktop.org
Thu Dec 24 00:11:39 UTC 2009
Module: Mesa
Branch: mesa_7_6_branch
Commit: 6138145b350d9e58725b43162680b43904497ec8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6138145b350d9e58725b43162680b43904497ec8
Author: Vinson Lee <vlee at vmware.com>
Date: Wed Dec 23 16:11:10 2009 -0800
glu/sgi: Silence compiler warnings.
---
src/glu/sgi/libnurbs/internals/subdivider.cc | 6 ++++--
src/glu/sgi/libnurbs/nurbtess/partitionY.cc | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/glu/sgi/libnurbs/internals/subdivider.cc b/src/glu/sgi/libnurbs/internals/subdivider.cc
index cc0b514..ccddc27 100644
--- a/src/glu/sgi/libnurbs/internals/subdivider.cc
+++ b/src/glu/sgi/libnurbs/internals/subdivider.cc
@@ -531,16 +531,18 @@ Subdivider::nonSamplingSplit(
patchlist.pspec[param].range[1] ) * 0.5;
split( source, left, right, param, mid );
Patchlist subpatchlist( patchlist, param, mid );
- if( left.isnonempty() )
+ if( left.isnonempty() ) {
if( subpatchlist.cullCheck() == CULL_TRIVIAL_REJECT )
freejarcs( left );
else
nonSamplingSplit( left, subpatchlist, subdivisions-1, param );
- if( right.isnonempty() )
+ }
+ if( right.isnonempty() ) {
if( patchlist.cullCheck() == CULL_TRIVIAL_REJECT )
freejarcs( right );
else
nonSamplingSplit( right, patchlist, subdivisions-1, param );
+ }
} else {
// make bbox calls
diff --git a/src/glu/sgi/libnurbs/nurbtess/partitionY.cc b/src/glu/sgi/libnurbs/nurbtess/partitionY.cc
index 297c629..e097461 100644
--- a/src/glu/sgi/libnurbs/nurbtess/partitionY.cc
+++ b/src/glu/sgi/libnurbs/nurbtess/partitionY.cc
@@ -111,8 +111,8 @@ Int isCusp(directedLine *v)
else if(A[1] > B[1] && C[1] > B[1])
return 1;
- if(isAbove(v, v) && isAbove(v, v->getPrev()) ||
- isBelow(v, v) && isBelow(v, v->getPrev()))
+ if((isAbove(v, v) && isAbove(v, v->getPrev())) ||
+ (isBelow(v, v) && isBelow(v, v->getPrev())))
return 1;
else
return 0;
More information about the mesa-commit
mailing list