[Emacs-diffs] /srv/bzr/emacs/trunk r103143: Merge: * image.c: conform to C89 pointer rules

[Paul Eggert]

------------------------------------------------------------
revno: 103143 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-02-06 00:52:27 -0800
message:
  Merge: * image.c: conform to C89 pointer rules
modified:
  src/ChangeLog
  src/image.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-06 03:48:28 +0000
+++ b/src/ChangeLog     2011-02-06 08:51:35 +0000
@@ -14,6 +14,7 @@
        (Fsubstitute_command_keys): Likewise.
        * xfns.c (Fx_open_connection, Fx_window_property): Likewise.
        * bitmaps/gray.xbm (gray_bits): Likewise.
+       * image.c (xbm_read_bitmap_data, xbm_load_image, xbm_load): Likewise.
 
 2011-02-05  Paul Eggert  <address@hidden>
 

=== modified file 'src/image.c'
--- a/src/image.c       2011-02-05 10:20:15 +0000
+++ b/src/image.c       2011-02-06 08:51:35 +0000
@@ -2226,7 +2226,7 @@
 static int xbm_image_p (Lisp_Object object);
 static int xbm_read_bitmap_data (struct frame *f,
                                  unsigned char *, unsigned char *,
-                                 int *, int *, unsigned char **, int);
+                                 int *, int *, char **, int);
 static int xbm_file_p (Lisp_Object);
 
 
@@ -2614,7 +2614,7 @@
 
 static int
 xbm_read_bitmap_data (struct frame *f, unsigned char *contents, unsigned char 
*end,
-                     int *width, int *height, unsigned char **data,
+                     int *width, int *height, char **data,
                      int inhibit_image_error)
 {
   unsigned char *s = contents;
@@ -2622,7 +2622,7 @@
   int padding_p = 0;
   int v10 = 0;
   int bytes_per_line, i, nbytes;
-  unsigned char *p;
+  char *p;
   int value;
   int LA1;
 
@@ -2706,7 +2706,7 @@
 
   bytes_per_line = (*width + 7) / 8 + padding_p;
   nbytes = bytes_per_line * *height;
-  p = *data = (unsigned char *) xmalloc (nbytes);
+  p = *data = (char *) xmalloc (nbytes);
 
   if (v10)
     {
@@ -2768,7 +2768,7 @@
                unsigned char *end)
 {
   int rc;
-  unsigned char *data;
+  char *data;
   int success_p = 0;
 
   rc = xbm_read_bitmap_data (f, contents, end, &img->width, &img->height,
@@ -2936,7 +2936,7 @@
          else if (STRINGP (data))
            bits = SSDATA (data);
          else
-           bits = XBOOL_VECTOR (data)->data;
+           bits = (char *) XBOOL_VECTOR (data)->data;
 
 #ifdef WINDOWSNT
           {