make proper casts in big endian cases.

Sat Nov 27 15:18:14 2004  Manish Singh  <yosh@gimp.org>

        * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
        (rgb565amsb, rgb555msb): make proper casts in big endian cases.

diff --git a/ChangeLog b/ChangeLog
index e87b10d190f43fe36adcfc53a0d4b378060a80cb..bc1b7ede6a9da66d98f2b8bf4dda385b7a06819e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Nov 27 15:18:14 2004  Manish Singh  <yosh@gimp.org>
+
+       * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+       (rgb565amsb, rgb555msb): make proper casts in big endian cases.
+
 2004-11-26  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkiconview.c (gtk_icon_view_set_model): Check column types on the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e87b10d190f43fe36adcfc53a0d4b378060a80cb..bc1b7ede6a9da66d98f2b8bf4dda385b7a06819e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Nov 27 15:18:14 2004  Manish Singh  <yosh@gimp.org>
+
+       * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+       (rgb565amsb, rgb555msb): make proper casts in big endian cases.
+
 2004-11-26  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkiconview.c (gtk_icon_view_set_model): Check column types on the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e87b10d190f43fe36adcfc53a0d4b378060a80cb..bc1b7ede6a9da66d98f2b8bf4dda385b7a06819e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Nov 27 15:18:14 2004  Manish Singh  <yosh@gimp.org>
+
+       * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+       (rgb565amsb, rgb555msb): make proper casts in big endian cases.
+
 2004-11-26  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkiconview.c (gtk_icon_view_set_model): Check column types on the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e87b10d190f43fe36adcfc53a0d4b378060a80cb..bc1b7ede6a9da66d98f2b8bf4dda385b7a06819e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Nov 27 15:18:14 2004  Manish Singh  <yosh@gimp.org>
+
+       * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+       (rgb565amsb, rgb555msb): make proper casts in big endian cases.
+
 2004-11-26  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkiconview.c (gtk_icon_view_set_model): Check column types on the

diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
index 2c8de405a28beccac55522fafa7ad13fa71a60b5..da9dae2f802629411c2e647082576d6a6ca4a3f5 100644 (file)
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
@@ -547,7 +547,11 @@ rgb565amsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colorma
        bpl = image->bytes_per_line;
 
        for (yy = 0; yy < height; yy++) {
+#ifdef LITTLE
                s = srow;
+#else
+               s = (guint16 *) srow;
+#endif
                o = (guint32 *) orow;
                for (xx = 0; xx < width; xx ++) {
                        register guint32 data;
@@ -670,7 +674,11 @@ rgb555msb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap
        bpl = image->bytes_per_line;
 
        for (yy = 0; yy < height; yy++) {
+#ifdef LITTLE
                s = srow;
+#else
+               s = (guint32 *) srow;
+#endif
                o = (guint16 *) orow;
                for (xx = 1; xx < width; xx += 2) {
                        register guint32 data;