Tue Apr 26 12:10:16 2005 Michael Jennings (mej)
Reverted patch from C. David Wilde <cdw@mylinuxguy.com> which broke big-endian machines and really didn't fix anything at all. Thanks to Tres Melton <tres@mindspring.com> for catching this. ---------------------------------------------------------------------- SVN revision: 14381
This commit is contained in:
parent
54a2a84619
commit
25386ea8c8
10
ChangeLog
10
ChangeLog
|
@ -5336,8 +5336,8 @@ color modifier routines.
|
|||
----------------------------------------------------------------------
|
||||
Wed Apr 20 19:07:38 2005 Michael Frysinger (vapier)
|
||||
|
||||
Patch from Tres <tres@mindspring.com> to fix window manager hints on
|
||||
64bit systems. http://bugs.gentoo.org/show_bug.cgi?id=76324
|
||||
Patch from Tres Melton <tres@mindspring.com> to fix window manager
|
||||
hints on 64bit systems. http://bugs.gentoo.org/show_bug.cgi?id=76324
|
||||
----------------------------------------------------------------------
|
||||
Mon Apr 25 15:34:49 2005 Michael Jennings (mej)
|
||||
|
||||
|
@ -5351,3 +5351,9 @@ Tue Apr 26 11:45:39 2005 Michael Jennings (mej)
|
|||
Fixed incorrect WORDS_BIGENDIAN logic caught by Tres Melton
|
||||
<tres@mindspring.com>.
|
||||
----------------------------------------------------------------------
|
||||
Tue Apr 26 12:10:16 2005 Michael Jennings (mej)
|
||||
|
||||
Reverted patch from C. David Wilde <cdw@mylinuxguy.com> which broke
|
||||
big-endian machines and really didn't fix anything at all. Thanks to
|
||||
Tres Melton <tres@mindspring.com> for catching this.
|
||||
----------------------------------------------------------------------
|
||||
|
|
24
src/pixmap.c
24
src/pixmap.c
|
@ -1654,12 +1654,12 @@ shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
|
|||
int r, g, b;
|
||||
|
||||
# if WORDS_BIGENDIAN
|
||||
r = (ptr[x + 6] * rm) >> 8;
|
||||
g = (ptr[x + 5] * gm) >> 8;
|
||||
b = (ptr[x + 4] * bm) >> 8;
|
||||
ptr[x + 6] = r;
|
||||
ptr[x + 5] = g;
|
||||
ptr[x + 4] = b;
|
||||
r = (ptr[x + 1] * rm) >> 8;
|
||||
g = (ptr[x + 2] * gm) >> 8;
|
||||
b = (ptr[x + 3] * bm) >> 8;
|
||||
ptr[x + 1] = r;
|
||||
ptr[x + 2] = g;
|
||||
ptr[x + 3] = b;
|
||||
# else
|
||||
r = (ptr[x + 2] * rm) >> 8;
|
||||
g = (ptr[x + 1] * gm) >> 8;
|
||||
|
@ -1677,9 +1677,9 @@ shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
|
|||
int r, g, b;
|
||||
|
||||
# if WORDS_BIGENDIAN
|
||||
r = (ptr[x + 6] * rm) >> 8;
|
||||
g = (ptr[x + 5] * gm) >> 8;
|
||||
b = (ptr[x + 4] * bm) >> 8;
|
||||
r = (ptr[x + 1] * rm) >> 8;
|
||||
g = (ptr[x + 2] * gm) >> 8;
|
||||
b = (ptr[x + 3] * bm) >> 8;
|
||||
# else
|
||||
r = (ptr[x + 2] * rm) >> 8;
|
||||
g = (ptr[x + 1] * gm) >> 8;
|
||||
|
@ -1689,9 +1689,9 @@ shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
|
|||
g |= (!(g >> 8) - 1);
|
||||
b |= (!(b >> 8) - 1);
|
||||
# if WORDS_BIGENDIAN
|
||||
ptr[x + 6] = r;
|
||||
ptr[x + 5] = g;
|
||||
ptr[x + 4] = b;
|
||||
ptr[x + 1] = r;
|
||||
ptr[x + 2] = g;
|
||||
ptr[x + 3] = b;
|
||||
# else
|
||||
ptr[x + 2] = r;
|
||||
ptr[x + 1] = g;
|
||||
|
|
Loading…
Reference in New Issue