comparison src/image.c @ 112324:2b598aa5d397

Merge from mainline.
author Paul Eggert <eggert@cs.ucla.edu>
date Thu, 13 Jan 2011 09:17:33 -0800
parents dc74e58f6b0b 0a2b87003c28
children 56d3e9c28eb0
comparison
equal deleted inserted replaced
112323:f3056cf0073a 112324:2b598aa5d397
7517 /* Handle image index for image types who can contain more than one 7517 /* Handle image index for image types who can contain more than one
7518 image. Interface :index is same as for GIF. First we "ping" the 7518 image. Interface :index is same as for GIF. First we "ping" the
7519 image to see how many sub-images it contains. Pinging is faster 7519 image to see how many sub-images it contains. Pinging is faster
7520 than loading the image to find out things about it. */ 7520 than loading the image to find out things about it. */
7521 7521
7522 /* MagickWandGenesis() initializes the imagemagick library. */ 7522 /* `MagickWandGenesis' initializes the imagemagick environment. */
7523 MagickWandGenesis (); 7523 MagickWandGenesis ();
7524 image = image_spec_value (img->spec, QCindex, NULL); 7524 image = image_spec_value (img->spec, QCindex, NULL);
7525 ino = INTEGERP (image) ? XFASTINT (image) : 0; 7525 ino = INTEGERP (image) ? XFASTINT (image) : 0;
7526 ping_wand = NewMagickWand (); 7526 ping_wand = NewMagickWand ();
7527 MagickSetResolution (ping_wand, 2, 2); 7527 MagickSetResolution (ping_wand, 2, 2);
7805 x_destroy_x_image (ximg); 7805 x_destroy_x_image (ximg);
7806 7806
7807 7807
7808 /* Final cleanup. image_wand should be the only resource left. */ 7808 /* Final cleanup. image_wand should be the only resource left. */
7809 DestroyMagickWand (image_wand); 7809 DestroyMagickWand (image_wand);
7810 /* `MagickWandTerminus' terminates the imagemagick environment. */
7810 MagickWandTerminus (); 7811 MagickWandTerminus ();
7811 7812
7812 return 1; 7813 return 1;
7813 7814
7814 imagemagick_error: 7815 imagemagick_error: