diff options
| author | Manish Singh <yosh@src.gnome.org> | 1998-07-22 22:22:05 +0000 |
|---|---|---|
| committer | Manish Singh <yosh@src.gnome.org> | 1998-07-22 22:22:05 +0000 |
| commit | 3ea4f70fa64fffcfca5c6cebc4952a7c6d6e77ae (patch) | |
| tree | 840516c12f72ee7a6709982a9670f24e21fc36d3 /gdk | |
| parent | aa1bf581963e779d43ed1b4996674be5d8278983 (diff) | |
| download | gdk-pixbuf-3ea4f70fa64fffcfca5c6cebc4952a7c6d6e77ae.tar.gz | |
actually builds and runs properly on big endian machines now, because we
* gdk/gdkrgb.c: actually builds and runs properly on big endian machines
now, because we #include config.h. Also fixed up a compile error in the
WORDS_BIGENDIAN case in gdk_rgb_convert_565_gray. I made the fix by looking
at patterns in the other code; Raph can you verify this?
* gdk/gdkthreads.c: #include <unistd.h> to quell compiler warnings
-Yosh
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdkrgb.c | 11 | ||||
| -rw-r--r-- | gdk/gdkthreads.c | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c index e79d355e7..bec679cdb 100644 --- a/gdk/gdkrgb.c +++ b/gdk/gdkrgb.c @@ -27,8 +27,9 @@ #define ENABLE_GRAYSCALE -#include <gdk/gdk.h> -#include <gdk/gdkprivate.h> +#include "../config.h" +#include "gdk/gdk.h" +#include "gdk/gdkprivate.h" #include "gdkrgb.h" typedef struct _GdkRgbInfo GdkRgbInfo; @@ -491,10 +492,10 @@ gdk_rgb_init (void) /* check endian sanity */ #ifdef WORDS_BIGENDIAN if (((char *)byte_order)[0] == 1) - g_error ("gtk_rgb_init: WORDS_BIGENDIAN is defined, but this is a little endian machine.\n\n"); + g_error ("gdk_rgb_init: WORDS_BIGENDIAN is defined, but this is a little endian machine.\n\n"); #else if (((char *)byte_order)[0] != 1) - g_error ("gtk_rgb_init: WORDS_BIGENDIAN is not defined, but this is a little endian machine.\n\n"); + g_error ("gdk_rgb_init: WORDS_BIGENDIAN is not defined, but this is a little endian machine.\n\n"); #endif if (image_info == NULL) @@ -1307,7 +1308,7 @@ gdk_rgb_convert_565_gray (GdkImage *image, for (x = 0; x < width; x++) { g = *bp2++; - ((guint16 *)obptr)[0] = ((g & 0xf8) << 8) | + ((guint16 *)obuf)[x] = ((g & 0xf8) << 8) | ((g & 0xfc) << 3) | (g >> 3); } diff --git a/gdk/gdkthreads.c b/gdk/gdkthreads.c index 8fca4400e..d83375b57 100644 --- a/gdk/gdkthreads.c +++ b/gdk/gdkthreads.c @@ -21,6 +21,7 @@ #include "gdkprivate.h" #ifdef USE_PTHREADS +#include <unistd.h> #include <pthread.h> pthread_mutex_t gdk_threads_mutex = PTHREAD_MUTEX_INITIALIZER; |