Mercurial > hg > xemacs-beta
comparison src/glyphs-eimage.c @ 408:501cfd01ee6d r21-2-34
Import from CVS: tag r21-2-34
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:18:11 +0200 |
parents | 2f8bb876ab1d |
children | 697ef44129c6 |
comparison
equal
deleted
inserted
replaced
407:ed6218a7d4d3 | 408:501cfd01ee6d |
---|---|
54 #include "objects.h" | 54 #include "objects.h" |
55 | 55 |
56 #include "buffer.h" | 56 #include "buffer.h" |
57 #include "frame.h" | 57 #include "frame.h" |
58 #include "opaque.h" | 58 #include "opaque.h" |
59 #include "window.h" | |
59 | 60 |
60 #include "sysfile.h" | 61 #include "sysfile.h" |
61 | 62 |
62 #ifdef HAVE_PNG | 63 #ifdef HAVE_PNG |
63 #ifdef __cplusplus | 64 #ifdef __cplusplus |
478 } | 479 } |
479 } | 480 } |
480 | 481 |
481 /* Step 6.5: Create the pixmap and set up the image instance */ | 482 /* Step 6.5: Create the pixmap and set up the image instance */ |
482 /* now instantiate */ | 483 /* now instantiate */ |
483 MAYBE_DEVMETH (XDEVICE (ii->device), | 484 MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain), |
484 init_image_instance_from_eimage, | 485 init_image_instance_from_eimage, |
485 (ii, cinfo.output_width, cinfo.output_height, 1, | 486 (ii, cinfo.output_width, cinfo.output_height, 1, |
486 unwind.eimage, dest_mask, | 487 unwind.eimage, dest_mask, |
487 instantiator, domain)); | 488 instantiator, domain)); |
488 | 489 |
704 row += interlace ? InterlacedJumps[pass] : 1; | 705 row += interlace ? InterlacedJumps[pass] : 1; |
705 } | 706 } |
706 } | 707 } |
707 | 708 |
708 /* now instantiate */ | 709 /* now instantiate */ |
709 MAYBE_DEVMETH (XDEVICE (ii->device), | 710 MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain), |
710 init_image_instance_from_eimage, | 711 init_image_instance_from_eimage, |
711 (ii, width, height, unwind.giffile->ImageCount, unwind.eimage, dest_mask, | 712 (ii, width, height, unwind.giffile->ImageCount, unwind.eimage, dest_mask, |
712 instantiator, domain)); | 713 instantiator, domain)); |
713 } | 714 } |
714 | 715 |
1015 | 1016 |
1016 xfree (row_pointers); | 1017 xfree (row_pointers); |
1017 } | 1018 } |
1018 | 1019 |
1019 /* now instantiate */ | 1020 /* now instantiate */ |
1020 MAYBE_DEVMETH (XDEVICE (ii->device), | 1021 MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain), |
1021 init_image_instance_from_eimage, | 1022 init_image_instance_from_eimage, |
1022 (ii, width, height, 1, unwind.eimage, dest_mask, | 1023 (ii, width, height, 1, unwind.eimage, dest_mask, |
1023 instantiator, domain)); | 1024 instantiator, domain)); |
1024 | 1025 |
1025 /* This will clean up everything else. */ | 1026 /* This will clean up everything else. */ |
1297 signal_image_error ("Unable to allocate memory for TIFFReadRGBA", instantiator); | 1298 signal_image_error ("Unable to allocate memory for TIFFReadRGBA", instantiator); |
1298 | 1299 |
1299 } | 1300 } |
1300 | 1301 |
1301 /* now instantiate */ | 1302 /* now instantiate */ |
1302 MAYBE_DEVMETH (XDEVICE (ii->device), | 1303 MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain), |
1303 init_image_instance_from_eimage, | 1304 init_image_instance_from_eimage, |
1304 (ii, width, height, 1, unwind.eimage, dest_mask, | 1305 (ii, width, height, 1, unwind.eimage, dest_mask, |
1305 instantiator, domain)); | 1306 instantiator, domain)); |
1306 | 1307 |
1307 unbind_to (speccount, Qnil); | 1308 unbind_to (speccount, Qnil); |