Bug 457086 - numpad does not work when the Thai-Lao input method is used

[~andy/gtk] / gdk-pixbuf / io-wbmp.c

diff --git a/gdk-pixbuf/io-wbmp.c b/gdk-pixbuf/io-wbmp.c
index 24779b97e22d459df456d04e61a3066a7d708355..a4575b682da0e3ac890b618c7ea279470b04136b 100644 (file)
--- a/gdk-pixbuf/io-wbmp.c
+++ b/gdk-pixbuf/io-wbmp.c
@@ -29,7 +29,7 @@ Known bugs:
         * Since this is based off the libgd implementation, no extended headers implemented (not required for a WAP client)
 */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -166,11 +166,11 @@ static gboolean
 get_mbi(struct wbmp_progressive_state *context, const guchar **buf, guint *buf_size, int *val)
 {
   guchar intbuf[16];
-  int i, n;
+  int n;
   gboolean rv;
 
   *val = 0;
-  n = i = 0;
+  n = 0;
   do {
     rv = getin(context, buf, buf_size, intbuf+n, 1);
     if(!rv)
@@ -240,10 +240,10 @@ static gboolean gdk_pixbuf__wbmp_image_load_increment(gpointer data,
                  context->need_width = FALSE;
 
                   if (context->width <= 0) {
-                   g_set_error (error,
-                                GDK_PIXBUF_ERROR,
-                                GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-                                _("Image has zero width"));
+                   g_set_error_literal (error,
+                                         GDK_PIXBUF_ERROR,
+                                         GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
+                                         _("Image has zero width"));
 
                    return FALSE;
                  }
@@ -258,10 +258,10 @@ static gboolean gdk_pixbuf__wbmp_image_load_increment(gpointer data,
                    context->need_height = FALSE;
 
                    if (context->height <= 0) {
-                     g_set_error (error,
-                                  GDK_PIXBUF_ERROR,
-                                  GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-                                  _("Image has zero height"));
+                     g_set_error_literal (error,
+                                           GDK_PIXBUF_ERROR,
+                                           GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
+                                           _("Image has zero height"));
                      
                      return FALSE;
                    }
@@ -269,10 +269,10 @@ static gboolean gdk_pixbuf__wbmp_image_load_increment(gpointer data,
                    context->pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, context->width, context->height);
                    
                    if (!context->pixbuf) {
-                     g_set_error (error,
-                                  GDK_PIXBUF_ERROR,
-                                  GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-                                  _("Not enough memory to load image"));
+                     g_set_error_literal (error,
+                                           GDK_PIXBUF_ERROR,
+                                           GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
+                                           _("Not enough memory to load image"));
                      return FALSE;
                    }
 
@@ -328,10 +328,10 @@ static gboolean gdk_pixbuf__wbmp_image_load_increment(gpointer data,
        if(size) {
          bv = save_rest(context, buf, size);
          if (!bv) {
-             g_set_error (error,
-                          GDK_PIXBUF_ERROR,
-                          GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-                          _("Couldn't save the rest"));
+             g_set_error_literal (error,
+                                   GDK_PIXBUF_ERROR,
+                                   GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
+                                   _("Couldn't save the rest"));
 
              return FALSE;
          }
@@ -339,19 +339,26 @@ static gboolean gdk_pixbuf__wbmp_image_load_increment(gpointer data,
        return TRUE;
 }
 
-void
-MODULE_ENTRY (wbmp, fill_vtable) (GdkPixbufModule *module)
+#ifndef INCLUDE_wbmp
+#define MODULE_ENTRY(function) G_MODULE_EXPORT void function
+#else
+#define MODULE_ENTRY(function) void _gdk_pixbuf__wbmp_ ## function
+#endif
+
+MODULE_ENTRY (fill_vtable) (GdkPixbufModule *module)
 {
        module->begin_load = gdk_pixbuf__wbmp_image_begin_load;
        module->stop_load = gdk_pixbuf__wbmp_image_stop_load;
        module->load_increment = gdk_pixbuf__wbmp_image_load_increment;
 }
 
-void
-MODULE_ENTRY (wbmp, fill_info) (GdkPixbufFormat *info)
+MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
 {
        static GdkPixbufModulePattern signature[] = {
-               { " ", "z", 1 }, 
+               { "  ",    "zz", 1 }, 
+               { " \140", "z ", 1 },
+               { " \100", "z ", 1 },
+               { " \040", "z ", 1 },
                { NULL, NULL, 0 }
        };
        static gchar * mime_types[] = {