diff options
| author | Vinson Lee <vlee@vmware.com> | 2009-12-23 16:11:10 -0800 |
|---|---|---|
| committer | Vinson Lee <vlee@vmware.com> | 2009-12-23 16:11:10 -0800 |
| commit | e2ee6423fea4ffac4e2e2c67a9f2b9ec098c9740 (patch) | |
| tree | 26c2346ea38904d0debd7b550081d21414e0a21c | |
| parent | fdc4468d876a90a6fae04b1a6e9ccde94e63a4c9 (diff) | |
| download | glu-e2ee6423fea4ffac4e2e2c67a9f2b9ec098c9740.tar.gz | |
glu/sgi: Silence compiler warnings.
| -rw-r--r-- | src/libnurbs/internals/subdivider.cc | 6 | ||||
| -rw-r--r-- | src/libnurbs/nurbtess/partitionY.cc | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/libnurbs/internals/subdivider.cc b/src/libnurbs/internals/subdivider.cc index cc0b514..ccddc27 100644 --- a/src/libnurbs/internals/subdivider.cc +++ b/src/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/libnurbs/nurbtess/partitionY.cc b/src/libnurbs/nurbtess/partitionY.cc index 297c629..e097461 100644 --- a/src/libnurbs/nurbtess/partitionY.cc +++ b/src/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; |