From 080f82f9b41a8305bb3f403c5468a081ff835b45 Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Sat, 28 May 2005 19:33:26 +0000 Subject: [PATCH] Fix a few warnings... svn path=/trunk/; revision=15603 --- reactos/lib/glu32/libnurbs/interface/glcurveval.cc | 5 +++++ reactos/lib/glu32/libnurbs/nurbtess/monoTriangulation.cc | 4 ++-- reactos/lib/glu32/libnurbs/nurbtess/sampleMonoPoly.cc | 6 +++--- reactos/lib/glu32/libutil/mipmap.c | 4 ++-- reactos/lib/imagehlp/modify.c | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/reactos/lib/glu32/libnurbs/interface/glcurveval.cc b/reactos/lib/glu32/libnurbs/interface/glcurveval.cc index 234cca30a8e..c5723678591 100644 --- a/reactos/lib/glu32/libnurbs/interface/glcurveval.cc +++ b/reactos/lib/glu32/libnurbs/interface/glcurveval.cc @@ -248,6 +248,11 @@ OpenGLCurveEvaluator::map1f( which=3; dimension = 4; break; + /* make GCC happy */ + default: + which=0; + dimension = 0; + break; } inMap1f(which, dimension, ulo, uhi, stride, order, pts); } diff --git a/reactos/lib/glu32/libnurbs/nurbtess/monoTriangulation.cc b/reactos/lib/glu32/libnurbs/nurbtess/monoTriangulation.cc index a97b51203d3..95570ffc021 100644 --- a/reactos/lib/glu32/libnurbs/nurbtess/monoTriangulation.cc +++ b/reactos/lib/glu32/libnurbs/nurbtess/monoTriangulation.cc @@ -1033,8 +1033,8 @@ void monoTriangulationRec(directedLine* inc_chain, Int inc_index, primStream* pStream) { Int i; - directedLine *temp, *oldtemp; - Int tempIndex, oldtempIndex; + directedLine *temp, *oldtemp = NULL; + Int tempIndex, oldtempIndex = 0; assert(inc_chain != NULL && dec_chain != NULL); diff --git a/reactos/lib/glu32/libnurbs/nurbtess/sampleMonoPoly.cc b/reactos/lib/glu32/libnurbs/nurbtess/sampleMonoPoly.cc index 1d316dd2491..46928b64133 100644 --- a/reactos/lib/glu32/libnurbs/nurbtess/sampleMonoPoly.cc +++ b/reactos/lib/glu32/libnurbs/nurbtess/sampleMonoPoly.cc @@ -976,11 +976,11 @@ void findNeck(vertexArray *leftChain, Int botLeftIndex, void findLeftGridIndices(directedLine* topEdge, Int firstGridIndex, Int lastGridIndex, gridWrap* grid, Int* ret_indices, Int* ret_innerIndices) { - Int i,k,isHoriz; + Int i,k,isHoriz = 0; Int n_ulines = grid->get_n_ulines(); Real uMin = grid->get_u_min(); Real uMax = grid->get_u_max(); - Real slop, uinterc; + Real slop = 0.0f, uinterc; #ifdef SHORTEN_GRID_LINE //uintercBuf stores all the interction u value for each grid line @@ -1094,7 +1094,7 @@ void findRightGridIndices(directedLine* topEdge, Int firstGridIndex, Int lastGri Int n_ulines = grid->get_n_ulines(); Real uMin = grid->get_u_min(); Real uMax = grid->get_u_max(); - Real slop, uinterc; + Real slop = 0.0f, uinterc; #ifdef SHORTEN_GRID_LINE //uintercBuf stores all the interction u value for each grid line diff --git a/reactos/lib/glu32/libutil/mipmap.c b/reactos/lib/glu32/libutil/mipmap.c index 9ae20852e19..04bdf521d28 100644 --- a/reactos/lib/glu32/libutil/mipmap.c +++ b/reactos/lib/glu32/libutil/mipmap.c @@ -4839,7 +4839,7 @@ static void fill_image(const PixelStorageModes *psm, GLint group_size; GLint elements_per_line; const GLubyte *start; - const GLubyte *iter; + const GLubyte *iter = NULL; GLushort *iter2; GLint i, j, k; GLint myswap_bytes; @@ -6650,7 +6650,7 @@ static void fillImage3D(const PixelStorageModes *psm, int elementsPerLine; int rowsPerImage; int imageSize; - const GLubyte *start, *rowStart, *iter; + const GLubyte *start, *rowStart, *iter = NULL; GLushort *iter2; int ww, hh, dd, k; diff --git a/reactos/lib/imagehlp/modify.c b/reactos/lib/imagehlp/modify.c index 3608ff5d28b..971254742f0 100644 --- a/reactos/lib/imagehlp/modify.c +++ b/reactos/lib/imagehlp/modify.c @@ -643,7 +643,7 @@ BindpAddBoundForwarder( PUCHAR TempDllName; PLOADED_IMAGE LoadedLibrary; ULONG DllNameSize; - USHORT OrdinalNumber; + USHORT OrdinalNumber = 0; USHORT HintIndex; ULONG ExportSize; PIMAGE_EXPORT_DIRECTORY Exports;