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

[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
comparison
equal deleted inserted replaced
770:336a418893b5 771:943eaba38521
1 /* Routines shared between window-system backends for glyph objects. 1 /* Routines shared between window-system backends for glyph objects.
2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. 2 Copyright (C) 1993, 1994 Free Software Foundation, Inc.
3 Copyright (C) 1995 Board of Trustees, University of Illinois. 3 Copyright (C) 1995 Board of Trustees, University of Illinois.
4 Copyright (C) 1995 Tinker Systems 4 Copyright (C) 1995 Tinker Systems
5 Copyright (C) 1995, 1996 Ben Wing 5 Copyright (C) 1995, 1996, 2001 Ben Wing
6 Copyright (C) 1995 Sun Microsystems 6 Copyright (C) 1995 Sun Microsystems
7 Copyright (C) 1998, 1999, 2000 Andy Piper. 7 Copyright (C) 1998, 1999, 2000 Andy Piper.
8 8
9 This file is part of XEmacs. 9 This file is part of XEmacs.
10 10
310 RETURN (BitmapSuccess); 310 RETURN (BitmapSuccess);
311 } 311 }
312 312
313 313
314 int 314 int
315 read_bitmap_data_from_file (const char *filename, 315 read_bitmap_data_from_file (Lisp_Object filename,
316 /* Remaining args are RETURNED */ 316 /* Remaining args are RETURNED */
317 int *width, 317 int *width,
318 int *height, 318 int *height,
319 UChar_Binary **datap, 319 UChar_Binary **datap,
320 int *x_hot, int *y_hot) 320 int *x_hot, int *y_hot)
321 { 321 {
322 FILE *fstream; 322 FILE *fstream;
323 int status; 323 int status;
324 324 Extbyte *fileext;
325 if ((fstream = fopen (filename, "r")) == NULL) 325
326 return BitmapOpenFailed; 326 LISP_STRING_TO_EXTERNAL (filename, fileext, Qnative);
327 status = read_bitmap_data (fstream, width, height, datap, x_hot, y_hot); 327 if ((fstream = fopen (fileext, "r")) == NULL)
328 fclose (fstream); 328 return BitmapOpenFailed;
329 return status; 329 status = read_bitmap_data (fstream, width, height, datap, x_hot, y_hot);
330 retry_fclose (fstream);
331 return status;
330 } 332 }
331 333
332 void 334 void
333 syms_of_glyphs_shared (void) 335 syms_of_glyphs_shared (void)
334 { 336 {