diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-02-25 19:25:52 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-02-25 19:25:52 +0000 |
| commit | 4039cb8ca82d59451a6de8902fe35e693cdca3ba (patch) | |
| tree | 0ea4e7518923243d8d49064719c1206f16c63640 /src/mesa/swrast | |
| parent | b10c434a8f1b760e5a5516729761944d3e84d894 (diff) | |
casts to silence g++ warnings
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_drawpix.c | 4 | ||||
| -rw-r--r-- | src/mesa/swrast/s_linetemp.h | 7 | ||||
| -rw-r--r-- | src/mesa/swrast/s_zoom.c | 10 |
3 files changed, 11 insertions, 10 deletions
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index a69f3cc3c9..ddf864793e 100644 --- a/src/mesa/swrast/s_drawpix.c +++ b/src/mesa/swrast/s_drawpix.c @@ -1,4 +1,4 @@ -/* $Id: s_drawpix.c,v 1.44 2003/01/16 18:57:44 brianp Exp $ */ +/* $Id: s_drawpix.c,v 1.45 2003/02/25 19:26:00 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -718,7 +718,7 @@ draw_depth_pixels( GLcontext *ctx, GLint x, GLint y, /* clamp depth values to [0,1] and convert from floats to ints */ { const GLfloat zs = ctx->DepthMaxF; - GLint i; + GLuint i; for (i = 0; i < span.end; i++) { span.array->z[i] = (GLdepth) (floatSpan[i] * zs + 0.5F); } diff --git a/src/mesa/swrast/s_linetemp.h b/src/mesa/swrast/s_linetemp.h index d0f8d6f5bd..0bea948d35 100644 --- a/src/mesa/swrast/s_linetemp.h +++ b/src/mesa/swrast/s_linetemp.h @@ -1,4 +1,4 @@ -/* $Id: s_linetemp.h,v 1.16 2002/11/15 15:05:04 brianp Exp $ */ +/* $Id: s_linetemp.h,v 1.17 2003/02/25 19:26:01 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -268,8 +268,9 @@ NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 ) span.zStep = FloatToFixed(vert1->win[2] - vert0->win[2]) / numPixels; } else { - span.z = vert0->win[2]; - span.zStep = (vert1->win[2] - vert0->win[2]) / numPixels; + /* don't use fixed point */ + span.z = (GLint) vert0->win[2]; + span.zStep = (GLint) ((vert1->win[2] - vert0->win[2]) / numPixels); } } #endif diff --git a/src/mesa/swrast/s_zoom.c b/src/mesa/swrast/s_zoom.c index 5727bc2876..852905f681 100644 --- a/src/mesa/swrast/s_zoom.c +++ b/src/mesa/swrast/s_zoom.c @@ -1,4 +1,4 @@ -/* $Id: s_zoom.c,v 1.21 2003/02/21 00:17:58 brianp Exp $ */ +/* $Id: s_zoom.c,v 1.22 2003/02/25 19:26:02 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -81,7 +81,7 @@ zoom_span( GLcontext *ctx, const struct sw_span *span, c0 = (GLint) span->x; c1 = (GLint) (span->x + span->end * ctx->Pixel.ZoomX); #else - c0 = (GLint) span->x + skipPixels * ctx->Pixel.ZoomX; + c0 = (GLint) (span->x + skipPixels * ctx->Pixel.ZoomX); c1 = (GLint) (span->x + (skipPixels + span->end) * ctx->Pixel.ZoomX); #endif if (c0 == c1) { @@ -158,7 +158,7 @@ zoom_span( GLcontext *ctx, const struct sw_span *span, i = span->end + i - 1; } ASSERT(i >= 0); - ASSERT(i < span->end); + ASSERT(i < (GLint) span->end); COPY_CHAN4(zoomed.array->rgba[j], rgba[i]); } } @@ -184,7 +184,7 @@ zoom_span( GLcontext *ctx, const struct sw_span *span, i = span->end + i - 1; } ASSERT(i >= 0); - ASSERT(i < span->end); + ASSERT(i < (GLint) span->end); zoomed.array->rgba[j][0] = rgb[i][0]; zoomed.array->rgba[j][1] = rgb[i][1]; zoomed.array->rgba[j][2] = rgb[i][2]; @@ -210,7 +210,7 @@ zoom_span( GLcontext *ctx, const struct sw_span *span, i = span->end + i - 1; } ASSERT(i >= 0); - ASSERT(i < span->end); + ASSERT(i < (GLint) span->end); zoomed.array->index[j] = indexes[i]; } } |