diff options
author | Julien Cristau <jcristau@debian.org> | 2007-08-09 11:25:42 +0200 |
---|---|---|
committer | Julien Cristau <jcristau@debian.org> | 2007-08-09 11:25:42 +0200 |
commit | 43e6260ed061f915b2c631643c2a303015f2f044 (patch) | |
tree | b34d680b6850bafeabc57a688413cb8bbee34c32 /src/glu | |
parent | c6728df4a3d8d5bc04626e57f6c0ec40d60ab1c7 (diff) | |
parent | ae16a51e95f8d0e4e354f28885c13a3bbe66b270 (diff) |
Merge tag 'mesa_7_0_1' into debian-experimental
Diffstat (limited to 'src/glu')
-rw-r--r-- | src/glu/sgi/libnurbs/interface/bezierPatch.cc | 7 | ||||
-rw-r--r-- | src/glu/sgi/libnurbs/interface/insurfeval.cc | 4 | ||||
-rw-r--r-- | src/glu/sgi/libutil/error.c | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/glu/sgi/libnurbs/interface/bezierPatch.cc b/src/glu/sgi/libnurbs/interface/bezierPatch.cc index 836ae94e0a6..5b7bda1a001 100644 --- a/src/glu/sgi/libnurbs/interface/bezierPatch.cc +++ b/src/glu/sgi/libnurbs/interface/bezierPatch.cc @@ -111,8 +111,11 @@ void bezierPatchDelete(bezierPatch *b) void bezierPatchDeleteList(bezierPatch *b) { bezierPatch *temp; - for(temp = b; temp != NULL; temp = temp->next) - bezierPatchDelete(temp); + while (b != NULL) { + temp = b; + b = b->next; + bezierPatchDelete(temp); + } } bezierPatch* bezierPatchInsert(bezierPatch *list, bezierPatch *b) diff --git a/src/glu/sgi/libnurbs/interface/insurfeval.cc b/src/glu/sgi/libnurbs/interface/insurfeval.cc index b314699c7af..e4ee3ef6a29 100644 --- a/src/glu/sgi/libnurbs/interface/insurfeval.cc +++ b/src/glu/sgi/libnurbs/interface/insurfeval.cc @@ -1533,8 +1533,8 @@ void OpenGLSurfaceEvaluator::inEvalVStrip(int n_left, REAL u_left, REAL* left_va } //clean up free(leftXYZ); - free(leftXYZ); - free(rightNormal); + free(rightXYZ); + free(leftNormal); free(rightNormal); } diff --git a/src/glu/sgi/libutil/error.c b/src/glu/sgi/libutil/error.c index 3d1ce9b2101..c2000569427 100644 --- a/src/glu/sgi/libutil/error.c +++ b/src/glu/sgi/libutil/error.c @@ -82,7 +82,7 @@ gluErrorString(GLenum errorCode) if ((errorCode >= GLU_NURBS_ERROR1) && (errorCode <= GLU_NURBS_ERROR37)) { return (const GLubyte *) __gluNURBSErrorString(errorCode - (GLU_NURBS_ERROR1 - 1)); } - if ((errorCode >= GLU_TESS_ERROR1) && (errorCode <= GLU_TESS_ERROR8)) { + if ((errorCode >= GLU_TESS_ERROR1) && (errorCode <= GLU_TESS_ERROR6)) { return (const GLubyte *) __gluTessErrorString(errorCode - (GLU_TESS_ERROR1 - 1)); } return (const GLubyte *) 0; |