diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-05-03 14:11:18 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-05-03 14:11:18 +0000 |
| commit | 9e351d52ae52927fbe505e8808e70de3e646be79 (patch) | |
| tree | 1317296db672779563ce132da8f98177ac0747db /src/mesa/swrast/s_texture.c | |
| parent | 5028216c81706070fab906f4e56a14c1e2d61cbc (diff) | |
minor clean-ups and warning fixes
Diffstat (limited to 'src/mesa/swrast/s_texture.c')
| -rw-r--r-- | src/mesa/swrast/s_texture.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c index b751d29b79..8415fb3ec9 100644 --- a/src/mesa/swrast/s_texture.c +++ b/src/mesa/swrast/s_texture.c @@ -1,4 +1,4 @@ -/* $Id: s_texture.c,v 1.27 2001/04/23 18:06:09 brianp Exp $ */ +/* $Id: s_texture.c,v 1.28 2001/05/03 14:11:53 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -280,7 +280,7 @@ sample_1d_nearest(GLcontext *ctx, /* skip over the border, if any */ i += img->Border; - if (i < 0 || i >= img->Width) { + if (i < 0 || i >= (GLint) img->Width) { /* Need this test for GL_CLAMP_TO_BORDER_ARB mode */ COPY_CHAN4(rgba, tObj->BorderColor); } @@ -570,7 +570,7 @@ sample_2d_nearest(GLcontext *ctx, i += img->Border; j += img->Border; - if (i < 0 || i >= img->Width || j < 0 || j >= img->Height) { + if (i < 0 || i >= (GLint) img->Width || j < 0 || j >= (GLint) img->Height) { /* Need this test for GL_CLAMP_TO_BORDER_ARB mode */ COPY_CHAN4(rgba, tObj->BorderColor); } @@ -990,9 +990,9 @@ sample_3d_nearest(GLcontext *ctx, COMPUTE_NEAREST_TEXEL_LOCATION(tObj->WrapT, t, height, j); COMPUTE_NEAREST_TEXEL_LOCATION(tObj->WrapR, r, depth, k); - if (i < 0 || i >= img->Width || - j < 0 || j >= img->Height || - k < 0 || k >= img->Depth) { + if (i < 0 || i >= (GLint) img->Width || + j < 0 || j >= (GLint) img->Height || + k < 0 || k >= (GLint) img->Depth) { /* Need this test for GL_CLAMP_TO_BORDER_ARB mode */ COPY_CHAN4(rgba, tObj->BorderColor); } |