diff options
| author | Brian <brian@nostromo.localnet.net> | 2007-01-23 11:46:02 -0700 |
|---|---|---|
| committer | Brian <brian@nostromo.localnet.net> | 2007-01-23 11:46:02 -0700 |
| commit | 18d1fdebebcb52e7fcf50e62c4c02862d173af51 (patch) | |
| tree | 4b1ebe71f1c6e8a45278fcab30dacd4d859896a6 /src/mesa/swrast/s_span.c | |
| parent | d46093b8d56f6d89b341d7437c5185ca6be597af (diff) | |
| download | external_mesa3d-18d1fdebebcb52e7fcf50e62c4c02862d173af51.zip external_mesa3d-18d1fdebebcb52e7fcf50e62c4c02862d173af51.tar.gz external_mesa3d-18d1fdebebcb52e7fcf50e62c4c02862d173af51.tar.bz2 | |
fixes for C++ warnings/errors
Diffstat (limited to 'src/mesa/swrast/s_span.c')
| -rw-r--r-- | src/mesa/swrast/s_span.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index c74b98f..cca1864 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -1814,7 +1814,9 @@ _swrast_get_values(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint i, inCount = 0, inStart = 0; for (i = 0; i < count; i++) { - if (x[i] >= 0 && y[i] >= 0 && x[i] < rb->Width && y[i] < rb->Height) { + if (x[i] >= 0 && y[i] >= 0 && + x[i] < (GLint) rb->Width && + y[i] < (GLint) rb->Height) { /* inside */ if (inCount == 0) inStart = i; @@ -1848,10 +1850,10 @@ _swrast_put_row(GLcontext *ctx, struct gl_renderbuffer *rb, { GLint skip = 0; - if (y < 0 || y >= rb->Height) + if (y < 0 || (GLint) y >= rb->Height) return; /* above or below */ - if (x + (GLint) count <= 0 || x >= rb->Width) + if (x + (GLint) count <= 0 || x >= (GLint) rb->Width) return; /* entirely left or right */ if (x + count > rb->Width) { |