Mercurial > emacs
diff 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 |
line wrap: on
line diff
--- a/src/image.c Tue Jan 11 22:13:06 2011 -0800 +++ b/src/image.c Thu Jan 13 09:17:33 2011 -0800 @@ -7519,7 +7519,7 @@ image to see how many sub-images it contains. Pinging is faster than loading the image to find out things about it. */ - /* MagickWandGenesis() initializes the imagemagick library. */ + /* `MagickWandGenesis' initializes the imagemagick environment. */ MagickWandGenesis (); image = image_spec_value (img->spec, QCindex, NULL); ino = INTEGERP (image) ? XFASTINT (image) : 0; @@ -7807,6 +7807,7 @@ /* Final cleanup. image_wand should be the only resource left. */ DestroyMagickWand (image_wand); + /* `MagickWandTerminus' terminates the imagemagick environment. */ MagickWandTerminus (); return 1;