casts to silence g++ warnings

3 files changed, 11 insertions, 10 deletions

diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c
index a69f3cc3c95..ddf864793ec 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 d0f8d6f5bdb..0bea948d355 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 5727bc2876e..852905f681d 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];
          }
       }