Mercurial > emacs

diff src/image.c @ 112434:9de5a68b57e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
author Paul Eggert <eggert@cs.ucla.edu>
date Sat, 22 Jan 2011 18:56:06 -0800
parents 42e22c4f06b7
children 11f1b4757236
line wrap: on
line diff
--- a/src/image.c	Sat Jan 22 17:09:09 2011 -0800
+++ b/src/image.c	Sat Jan 22 18:56:06 2011 -0800
@@ -350,7 +350,7 @@
     {
       if (dpyinfo->bitmaps[id].refcount
 	  && dpyinfo->bitmaps[id].file
-	  && !strcmp (dpyinfo->bitmaps[id].file, (char *) SDATA (file)))
+	  && !strcmp (dpyinfo->bitmaps[id].file, SSDATA (file)))
 	{
 	  ++dpyinfo->bitmaps[id].refcount;
 	  return id + 1;
@@ -363,7 +363,7 @@
     return -1;
   emacs_close (fd);
 
-  filename = (char *) SDATA (found);
+  filename = SSDATA (found);
 
   result = XReadBitmapFile (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
 			    filename, &width, &height, &bitmap, &xhot, &yhot);
@@ -8883,4 +8883,3 @@
 init_image (void)
 {
 }
-