summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-04-21 14:12:57 -0600
committerBrian <brian@yutani.localnet.net>2007-04-21 14:12:57 -0600
commite5cf37c1786057252a4db28d4ae75bd24a0e020b (patch)
treee94ecf2769fbf4201eebf6eb63099bae49b32404
parentb5e9b0e56231065f6324bbd3c2c35ca53b46ddf8 (diff)
fix SkipPixels bugs in _mesa_pack_bitmap(), bug 10690
-rw-r--r--src/mesa/main/image.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index dcd7f10b26e..2220e39f7d7 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -955,8 +955,8 @@ _mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
/* handling SkipPixels is a bit tricky (no pun intended!) */
GLint i;
if (packing->LsbFirst) {
- GLubyte srcMask = 1 << (packing->SkipPixels & 0x7);
- GLubyte dstMask = 128;
+ GLubyte srcMask = 128;
+ GLubyte dstMask = 1 << (packing->SkipPixels & 0x7);
const GLubyte *s = src;
GLubyte *d = dst;
*d = 0;
@@ -982,8 +982,8 @@ _mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
}
}
else {
- GLubyte srcMask = 128 >> (packing->SkipPixels & 0x7);
- GLubyte dstMask = 128;
+ GLubyte srcMask = 128;
+ GLubyte dstMask = 128 >> (packing->SkipPixels & 0x7);
const GLubyte *s = src;
GLubyte *d = dst;
*d = 0;