Mercurial > hg > xemacs-beta

diff src/glyphs-shared.c @ 771:943eaba38521

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-13 08:51:24 by ben] The big ben-mule-21-5 check-in! Various files were added and deleted. See CHANGES-ben-mule. There are still some test suite failures. No crashes, though. Many of the failures have to do with problems in the test suite itself rather than in the actual code. I'll be addressing these in the next day or so -- none of the test suite failures are at all critical. Meanwhile I'll be trying to address the biggest issues -- i.e. build or run failures, which will almost certainly happen on various platforms. All comments should be sent to ben@xemacs.org -- use a Cc: if necessary when sending to mailing lists. There will be pre- and post- tags, something like pre-ben-mule-21-5-merge-in, and post-ben-mule-21-5-merge-in.
author ben
date Wed, 13 Mar 2002 08:54:06 +0000
parents b39c14581166
children a5954632b187
line wrap: on
line diff
--- a/src/glyphs-shared.c	Fri Mar 08 13:33:14 2002 +0000
+++ b/src/glyphs-shared.c	Wed Mar 13 08:54:06 2002 +0000
@@ -2,7 +2,7 @@
    Copyright (C) 1993, 1994 Free Software Foundation, Inc.
    Copyright (C) 1995 Board of Trustees, University of Illinois.
    Copyright (C) 1995 Tinker Systems
-   Copyright (C) 1995, 1996 Ben Wing
+   Copyright (C) 1995, 1996, 2001 Ben Wing
    Copyright (C) 1995 Sun Microsystems
    Copyright (C) 1998, 1999, 2000 Andy Piper.
 
@@ -312,21 +312,23 @@
 
 
 int
-read_bitmap_data_from_file (const char *filename,
+read_bitmap_data_from_file (Lisp_Object filename,
 			    /* Remaining args are RETURNED */
 			    int *width,
 			    int *height,
 			    UChar_Binary **datap,
 			    int *x_hot, int *y_hot)
 {
-    FILE *fstream;
-    int status;
+  FILE *fstream;
+  int status;
+  Extbyte *fileext;
 
-    if ((fstream = fopen (filename, "r")) == NULL)
-      return BitmapOpenFailed;
-    status = read_bitmap_data (fstream, width, height, datap, x_hot, y_hot);
-    fclose (fstream);
-    return status;
+  LISP_STRING_TO_EXTERNAL (filename, fileext, Qnative);
+  if ((fstream = fopen (fileext, "r")) == NULL)
+    return BitmapOpenFailed;
+  status = read_bitmap_data (fstream, width, height, datap, x_hot, y_hot);
+  retry_fclose (fstream);
+  return status;
 }
 
 void