Merge from mainline.

[bpt/emacs.git] / src / image.c

diff --git a/src/image.c b/src/image.c
index 1125309..023c976 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -7519,7 +7519,7 @@ imagemagick_load_image (/* Pointer to emacs frame structure.  */
      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 @@ imagemagick_load_image (/* Pointer to emacs frame structure.  */
 
   /* Final cleanup. image_wand should be the only resource left. */
   DestroyMagickWand (image_wand);
+  /* `MagickWandTerminus' terminates the imagemagick environment.  */
   MagickWandTerminus ();
 
   return 1;