mesa: Branch 'master'

[Brian Paul]

 src/mesa/main/image.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree e5cf37c1786057252a4db28d4ae75bd24a0e020b (from b5e9b0e56231065f6324bbd3c2c35ca53b46ddf8)
Author: Brian <brian at yutani.localnet.net>
Date:   Sat Apr 21 14:12:57 2007 -0600

    fix SkipPixels bugs in _mesa_pack_bitmap(), bug 10690

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index dcd7f10..2220e39 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -955,8 +955,8 @@ _mesa_pack_bitmap( GLint width, GLint he
          /* 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 he
             }
          }
          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;