Mesa (master): swrast: fix MSVC signed/unsigned warnings

Brian Paul brianp at kemper.freedesktop.org
Tue Nov 6 15:11:35 UTC 2012


Module: Mesa
Branch: master
Commit: 085d81c370d45ff44bcb5b683ddde4c3bcf2ebaf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=085d81c370d45ff44bcb5b683ddde4c3bcf2ebaf

Author: Brian Paul <brianp at vmware.com>
Date:   Sun Nov  4 16:43:44 2012 -0700

swrast: fix MSVC signed/unsigned warnings

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>

---

 src/mesa/swrast/s_zoom.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/swrast/s_zoom.c b/src/mesa/swrast/s_zoom.c
index 24bfa22..828374f 100644
--- a/src/mesa/swrast/s_zoom.c
+++ b/src/mesa/swrast/s_zoom.c
@@ -234,7 +234,7 @@ zoom_span( struct gl_context *ctx, GLint imgX, GLint imgY, const SWspan *span,
          for (i = 0; i < zoomedWidth; i++) {
             GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x;
             ASSERT(j >= 0);
-            ASSERT(j < span->end);
+            ASSERT(j < (GLint) span->end);
             COPY_4V(zoomed.array->attribs[FRAG_ATTRIB_COL0][i], rgba[j]);
          }
       }
@@ -272,7 +272,7 @@ zoom_span( struct gl_context *ctx, GLint imgX, GLint imgY, const SWspan *span,
          for (i = 0; i < zoomedWidth; i++) {
             GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x;
             ASSERT(j >= 0);
-            ASSERT(j < span->end);
+            ASSERT(j < (GLint) span->end);
             zoomed.array->attribs[FRAG_ATTRIB_COL0][i][0] = rgb[j][0];
             zoomed.array->attribs[FRAG_ATTRIB_COL0][i][1] = rgb[j][1];
             zoomed.array->attribs[FRAG_ATTRIB_COL0][i][2] = rgb[j][2];




More information about the mesa-commit mailing list