diff options
| author | Federico Mena Quintero <federico@ximian.com> | 2002-01-25 21:34:18 +0000 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2002-01-25 21:34:18 +0000 |
| commit | 165e970296cf0fb8e317ce803fb6c8ff0bd31fc3 (patch) | |
| tree | 62d3599593b13dad8b9394709f9bf3276d0de6ae /gdk/gdkpixbuf-drawable.c | |
| parent | 588e9d1dc060442a86f809598f3ad9aee2609b4b (diff) | |
| download | gtk+-165e970296cf0fb8e317ce803fb6c8ff0bd31fc3.tar.gz | |
Merge from gdk-pixbuf stable.
2002-01-25 Federico Mena Quintero <federico@ximian.com>
Merge from gdk-pixbuf stable.
* gdk/gdkpixbuf-drawable.c (rgb565msb): Fixed the endianness
conversion --- swap the individual 16 bit values instead of taking
everying as a 32 bit value.
(rgb565lsb): Likewise.
(rgb555lsb): Likewise.
(rgb555msb): Likewise.
Diffstat (limited to 'gdk/gdkpixbuf-drawable.c')
| -rw-r--r-- | gdk/gdkpixbuf-drawable.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c index ce7319acd9..2926b5834d 100644 --- a/gdk/gdkpixbuf-drawable.c +++ b/gdk/gdkpixbuf-drawable.c @@ -437,7 +437,7 @@ rgb565lsb (GdkImage *image, | (data & 0x1f0000) >> 5 | (data & 0x1c0000) >> 10; #else /* swap endianness first */ - data = s[0] | s[1] << 8 | s[2] << 16 | s[3] << 24; + data = s[1] | s[0] << 8 | s[3] << 16 | s[2] << 24; s += 4; *o++ = (data & 0xf800) | (data & 0xe000) >> 5 | (data & 0x7e0) >> 3 | (data & 0x600) >> 9; @@ -534,7 +534,7 @@ rgb565msb (GdkImage *image, register guint32 data; #ifdef LITTLE /* swap endianness first */ - data = s[0] | s[1] << 8 | s[2] << 16 | s[3] << 24; + data = s[1] | s[0] << 8 | s[3] << 16 | s[2] << 24; s += 4; *o++ = (data & 0xf800) >> 8 | (data & 0xe000) >> 13 | (data & 0x7e0) << 5 | (data & 0x600) >> 1; @@ -768,7 +768,7 @@ rgb555lsb (GdkImage *image, | (data & 0x1f0000) >> 5 | (data & 0x1c0000) >> 10; #else /* swap endianness first */ - data = s[0] | s[1] << 8 | s[2] << 16 | s[3] << 24; + data = s[1] | s[0] << 8 | s[3] << 16 | s[2] << 24; s += 4; *o++ = (data & 0x7c00) << 1 | (data & 0x7000) >> 4 | (data & 0x3e0) >> 2 | (data & 0x380) >> 7; @@ -860,7 +860,7 @@ rgb555msb (GdkImage *image, register guint32 data; #ifdef LITTLE /* swap endianness first */ - data = s[0] | s[1] << 8 | s[2] << 16 | s[3] << 24; + data = s[1] | s[0] << 8 | s[3] << 16 | s[2] << 24; s += 4; *o++ = (data & 0x7c00) >> 7 | (data & 0x7000) >> 12 | (data & 0x3e0) << 6 | (data & 0x380) << 1; |