diff options
| author | Nian Wu <nian@graphics.(none)> | 2007-02-25 09:40:28 -0800 |
|---|---|---|
| committer | Nian Wu <nian@graphics.(none)> | 2007-02-25 09:40:28 -0800 |
| commit | 675f7f627bec92315bf168a9c872ffc05f88c69c (patch) | |
| tree | 19c8f9cc509dc7ce73a0709832f34bf13a2c7425 /src/mesa/swrast/s_copypix.c | |
| parent | 51bfb8fc8c78bb066d24e6ecbc20f00af7210386 (diff) | |
| parent | c080123998f28d9317331aec7ddfcd1074b29daf (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
Diffstat (limited to 'src/mesa/swrast/s_copypix.c')
| -rw-r--r-- | src/mesa/swrast/s_copypix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c index 761ab724e91..7e8ebb4477c 100644 --- a/src/mesa/swrast/s_copypix.c +++ b/src/mesa/swrast/s_copypix.c @@ -860,8 +860,8 @@ fast_copy_pixels(GLcontext *ctx, } /* clipping not supported */ - if (srcX < 0 || srcX + width > srcFb->Width || - srcY < 0 || srcY + height > srcFb->Height || + if (srcX < 0 || srcX + width > (GLint) srcFb->Width || + srcY < 0 || srcY + height > (GLint) srcFb->Height || dstX < dstFb->_Xmin || dstX + width > dstFb->_Xmax || dstY < dstFb->_Ymin || dstY + height > dstFb->_Ymax) { return GL_FALSE; |