Mercurial > hg > xemacs-beta

comparison src/glyphs.c @ 327:03446687b7cc r21-0-61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0-61
author cvs
date Mon, 13 Aug 2007 10:48:16 +0200
parents 33bdb3d4b97f
children 7347b34c275b
comparison
equal deleted inserted replaced
326:e2671bc7f66a 327:03446687b7cc
464 static Lisp_Object 464 static Lisp_Object
465 normalize_image_instantiator (Lisp_Object instantiator, 465 normalize_image_instantiator (Lisp_Object instantiator,
466 Lisp_Object contype, 466 Lisp_Object contype,
467 Lisp_Object dest_mask) 467 Lisp_Object dest_mask)
468 { 468 {
469 struct gcpro gcpro1;
470
471 GCPRO1(instantiator);
472
469 if (IMAGE_INSTANCEP (instantiator)) 473 if (IMAGE_INSTANCEP (instantiator))
470 return instantiator; 474 RETURN_UNGCPRO (instantiator);
471 475
472 if (STRINGP (instantiator)) 476 if (STRINGP (instantiator))
473 instantiator = process_image_string_instantiator (instantiator, contype, 477 instantiator = process_image_string_instantiator (instantiator, contype,
474 XINT (dest_mask)); 478 XINT (dest_mask));
475 479
482 files). */ 486 files). */
483 { 487 {
484 struct image_instantiator_methods * meths = 488 struct image_instantiator_methods * meths =
485 decode_image_instantiator_format (XVECTOR_DATA (instantiator)[0], 489 decode_image_instantiator_format (XVECTOR_DATA (instantiator)[0],
486 ERROR_ME); 490 ERROR_ME);
487 return IIFORMAT_METH_OR_GIVEN (meths, normalize, 491 RETURN_UNGCPRO (IIFORMAT_METH_OR_GIVEN (meths, normalize,
488 (instantiator, contype), 492 (instantiator, contype),
489 instantiator); 493 instantiator));
490 } 494 }
491 } 495 }
492 496
493 static Lisp_Object 497 static Lisp_Object
494 instantiate_image_instantiator (Lisp_Object device, Lisp_Object domain, 498 instantiate_image_instantiator (Lisp_Object device, Lisp_Object domain,