diff options
author | Brian Paul <[email protected]> | 2004-05-12 15:29:36 +0000 |
---|---|---|
committer | Brian Paul <[email protected]> | 2004-05-12 15:29:36 +0000 |
commit | f1cfb4b7a79c38a6c03795eb5e3dd9076e51d9ef (patch) | |
tree | 28ae042f21f2381af242e57125090913d70e9105 /src/glu/sgi/libnurbs/interface | |
parent | 2e66f7eef79610675d66624aba97190ecca26299 (diff) |
fix compiler warnings (Jerome Glisse)
Diffstat (limited to 'src/glu/sgi/libnurbs/interface')
-rw-r--r-- | src/glu/sgi/libnurbs/interface/glcurveval.cc | 8 | ||||
-rw-r--r-- | src/glu/sgi/libnurbs/interface/glsurfeval.cc | 1 | ||||
-rw-r--r-- | src/glu/sgi/libnurbs/interface/incurveeval.cc | 7 | ||||
-rw-r--r-- | src/glu/sgi/libnurbs/interface/insurfeval.cc | 11 |
4 files changed, 12 insertions, 15 deletions
diff --git a/src/glu/sgi/libnurbs/interface/glcurveval.cc b/src/glu/sgi/libnurbs/interface/glcurveval.cc index 8c865084209..4713dc46722 100644 --- a/src/glu/sgi/libnurbs/interface/glcurveval.cc +++ b/src/glu/sgi/libnurbs/interface/glcurveval.cc @@ -35,8 +35,8 @@ /* * glcurveval.c++ * - * $Date: 2003/04/30 15:20:37 $ $Revision: 1.5 $ - * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glcurveval.cc,v 1.5 2003/04/30 15:20:37 brianp Exp $ + * $Date: 2004/05/12 15:29:36 $ $Revision: 1.6 $ + * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glcurveval.cc,v 1.6 2004/05/12 15:29:36 brianp Exp $ */ /* Polynomial Evaluator Interface */ @@ -208,8 +208,8 @@ OpenGLCurveEvaluator::map1f( { if(output_triangles) { - int dimension; - int which; + int dimension = 0; + int which = 0; switch(type){ case GL_MAP1_VERTEX_3: which = 0; diff --git a/src/glu/sgi/libnurbs/interface/glsurfeval.cc b/src/glu/sgi/libnurbs/interface/glsurfeval.cc index 0a4f18dcffd..cb2cf8ee0be 100644 --- a/src/glu/sgi/libnurbs/interface/glsurfeval.cc +++ b/src/glu/sgi/libnurbs/interface/glsurfeval.cc @@ -970,7 +970,6 @@ if(output_triangles) REAL du, dv; long i,j; - long row; if(global_grid_nu == 0 || global_grid_nv == 0) return; /*no points need to be output*/ du = (global_grid_u1 - global_grid_u0) / (REAL)global_grid_nu; diff --git a/src/glu/sgi/libnurbs/interface/incurveeval.cc b/src/glu/sgi/libnurbs/interface/incurveeval.cc index 5c4553c98b5..336cca0508e 100644 --- a/src/glu/sgi/libnurbs/interface/incurveeval.cc +++ b/src/glu/sgi/libnurbs/interface/incurveeval.cc @@ -31,10 +31,10 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $ +** $Date: 2004/05/12 15:29:36 $ $Revision: 1.2 $ */ /* -** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/incurveeval.cc,v 1.1 2001/03/17 00:25:40 brianp Exp $ +** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/incurveeval.cc,v 1.2 2004/05/12 15:29:36 brianp Exp $ */ #include <stdlib.h> @@ -97,7 +97,7 @@ void OpenGLCurveEvaluator::inMap1f(int which, //0: vert, 1: norm, 2: color, 3: t int uorder, REAL *ctlpoints) { - int i,j,x; + int i,x; curveEvalMachine *temp_em; switch(which){ case 0: //vertex @@ -139,7 +139,6 @@ void OpenGLCurveEvaluator::inDoDomain1(curveEvalMachine *em, REAL u, REAL *retPo { int j, row; REAL the_uprime; - REAL p; REAL *data; if(em->u2 == em->u1) diff --git a/src/glu/sgi/libnurbs/interface/insurfeval.cc b/src/glu/sgi/libnurbs/interface/insurfeval.cc index 58af2bcb63f..b314699c7af 100644 --- a/src/glu/sgi/libnurbs/interface/insurfeval.cc +++ b/src/glu/sgi/libnurbs/interface/insurfeval.cc @@ -31,10 +31,10 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date: 2002/03/23 02:29:37 $ $Revision: 1.2 $ +** $Date: 2004/05/12 15:29:36 $ $Revision: 1.3 $ */ /* -** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/insurfeval.cc,v 1.2 2002/03/23 02:29:37 brianp Exp $ +** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/insurfeval.cc,v 1.3 2004/05/12 15:29:36 brianp Exp $ */ #include "gluos.h" @@ -403,7 +403,6 @@ void OpenGLSurfaceEvaluator::inEvalMesh2(int lowU, int lowV, int highU, int high { REAL du, dv; int i,j; - int row; REAL point[4]; REAL normal[3]; if(global_grid_nu == 0 || global_grid_nv == 0) @@ -874,7 +873,7 @@ void OpenGLSurfaceEvaluator::inDoDomain2WithDerivsBU(int k, REAL u, REAL v, REAL *baseData, REAL *retPoint, REAL* retdu, REAL *retdv) { - int j, row, col; + int j, col; REAL vprime; @@ -909,7 +908,7 @@ void OpenGLSurfaceEvaluator::inDoDomain2WithDerivsBV(int k, REAL u, REAL v, REAL *baseData, REAL *retPoint, REAL* retdu, REAL *retdv) { - int j, row, col; + int j, row; REAL uprime; @@ -1828,7 +1827,7 @@ void OpenGLSurfaceEvaluator::inDoEvalCoord2EM(REAL u, REAL v) void OpenGLSurfaceEvaluator::inBPMEvalEM(bezierPatchMesh* bpm) { - int i,j,k,l; + int i,j,k; float u,v; int ustride; |