summaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast/s_copypix.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2002-04-19 00:38:27 +0000
committerBrian Paul <[email protected]>2002-04-19 00:38:27 +0000
commita670c1280b78e6da3b298b61f623e4c733c6be94 (patch)
tree803a29169de7fe25f7e193dfe6a2de85128c4591 /src/mesa/swrast/s_copypix.c
parentdb07de057f10ab7ab5be84352b674b200a0a9e22 (diff)
casts to fix GLint/GLuint mismatches
Diffstat (limited to 'src/mesa/swrast/s_copypix.c')
-rw-r--r--src/mesa/swrast/s_copypix.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index 74d1164ae38..d7844718278 100644
--- a/src/mesa/swrast/s_copypix.c
+++ b/src/mesa/swrast/s_copypix.c
@@ -1,4 +1,4 @@
-/* $Id: s_copypix.c,v 1.35 2002/04/12 15:39:59 brianp Exp $ */
+/* $Id: s_copypix.c,v 1.36 2002/04/19 00:38:27 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -121,7 +121,7 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
if (SWRAST_CONTEXT(ctx)->_RasterMask == 0
&& !zoom
&& destx >= 0
- && destx + width <= ctx->DrawBuffer->Width) {
+ && destx + width <= (GLint) ctx->DrawBuffer->Width) {
quick_draw = GL_TRUE;
}
else {
@@ -266,7 +266,7 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
/* write row to framebuffer */
dy = desty + row;
- if (quick_draw && dy >= 0 && dy < ctx->DrawBuffer->Height) {
+ if (quick_draw && dy >= 0 && dy < (GLint) ctx->DrawBuffer->Height) {
(*swrast->Driver.WriteRGBASpan)( ctx, width, destx, dy,
(const GLchan (*)[4])span.color.rgba, NULL );
}
@@ -341,7 +341,7 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
if (SWRAST_CONTEXT(ctx)->_RasterMask == 0
&& !zoom
&& destx >= 0
- && destx + width <= ctx->DrawBuffer->Width) {
+ && destx + width <= (GLint) ctx->DrawBuffer->Width) {
quick_draw = GL_TRUE;
}
else {
@@ -507,7 +507,7 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
_swrast_pixel_texture(ctx, &span);
}
- if (quick_draw && dy >= 0 && dy < ctx->DrawBuffer->Height) {
+ if (quick_draw && dy >= 0 && dy < (GLint) ctx->DrawBuffer->Height) {
(*swrast->Driver.WriteRGBASpan)( ctx, width, destx, dy,
(const GLchan (*)[4])span.color.rgba, NULL );
}