summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@ximian.com>2002-07-16 17:18:09 +0000
committerFederico Mena Quintero <federico@src.gnome.org>2002-07-16 17:18:09 +0000
commit8e5a691115baed7b9ff1a3fd617aad6bee1514b6 (patch)
tree0b4e79b94898c498aa204d066b67ce379420c7da
parent2f57f4684ba1945e7bdf87c8ecea4a6e926cf223 (diff)
downloadgdk-pixbuf-8e5a691115baed7b9ff1a3fd617aad6bee1514b6.tar.gz
Fixed the LSB -> MSB case. Fixes #79463.
2002-07-16 Federico Mena Quintero <federico@ximian.com> * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case. Fixes #79463.
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-25
-rw-r--r--ChangeLog.pre-2-45
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gdk/gdkpixbuf-drawable.c15
7 files changed, 38 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 6017d288d..b3ddcd3f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-16 Federico Mena Quintero <federico@ximian.com>
+
+ * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+ Fixes #79463.
+
2002-07-16 Sven Neumann <sven@gimp.org>
* gdk/gdk.c
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6017d288d..b3ddcd3f4 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-07-16 Federico Mena Quintero <federico@ximian.com>
+
+ * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+ Fixes #79463.
+
2002-07-16 Sven Neumann <sven@gimp.org>
* gdk/gdk.c
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6017d288d..b3ddcd3f4 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-07-16 Federico Mena Quintero <federico@ximian.com>
+
+ * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+ Fixes #79463.
+
2002-07-16 Sven Neumann <sven@gimp.org>
* gdk/gdk.c
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6017d288d..b3ddcd3f4 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-07-16 Federico Mena Quintero <federico@ximian.com>
+
+ * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+ Fixes #79463.
+
2002-07-16 Sven Neumann <sven@gimp.org>
* gdk/gdk.c
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6017d288d..b3ddcd3f4 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-07-16 Federico Mena Quintero <federico@ximian.com>
+
+ * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+ Fixes #79463.
+
2002-07-16 Sven Neumann <sven@gimp.org>
* gdk/gdk.c
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6017d288d..b3ddcd3f4 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-07-16 Federico Mena Quintero <federico@ximian.com>
+
+ * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+ Fixes #79463.
+
2002-07-16 Sven Neumann <sven@gimp.org>
* gdk/gdk.c
diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index ddf3458fd..ca25768ae 100644
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -437,14 +437,15 @@ rgb565lsb (GdkImage *image,
| (data & 0x1f0000) >> 5 | (data & 0x1c0000) >> 10;
#else
/* swap endianness first */
- data = s[1] | s[0] << 8 | s[3] << 16 | s[2] << 24;
+ data = s[1] << 24 | s[0] << 16 | s[3] << 8 | s[2];
s += 4;
- *o++ = (data & 0xf800) | (data & 0xe000) >> 5
- | (data & 0x7e0) >> 3 | (data & 0x600) >> 9;
- *o++ = (data & 0x1f) << 11 | (data & 0x1c) << 6
- | (data & 0xf8000000) >> 24 | (data & 0xe0000000) >> 29;
- *o++ = (data & 0x7e00000) >> 11 | (data & 0x6000000) >> 17
- | (data & 0x1f0000) >> 13 | (data & 0x1c0000) >> 18;
+
+ *o++ = (data & 0xf8000000) >> 16 | (data & 0xe0000000) >> 21
+ | (data & 0x7e00000) >> 19 | (data & 0x6000000) >> 25;
+ *o++ = (data & 0x1f0000) >> 5 | (data & 0x1c0000) >> 10
+ | (data & 0xf800) >> 8 | (data & 0xe000) >> 13;
+ *o++ = (data & 0x7e0) << 5 | (data & 0x600) >> 1
+ | (data & 0x1f) << 3 | (data & 0x1c) >> 2;
#endif
}
/* check for last remaining pixel */