aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-01-13 09:17:33 -0800
committerPaul Eggert2011-01-13 09:17:33 -0800
commit193770eec942defa96c7ea310773b40534f709d1 (patch)
tree3a1ed2de2b7ece4697999045da27e21fb174f21c /src
parentf737437b23c75bb6924021df14b4f740ce370b21 (diff)
parent821f936d1c04df2f9ccaf6307b220d7cbe0e76c7 (diff)
downloademacs-193770eec942defa96c7ea310773b40534f709d1.tar.gz
emacs-193770eec942defa96c7ea310773b40534f709d1.zip
Merge from mainline.
Diffstat (limited to 'src')
-rw-r--r--src/image.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/image.c b/src/image.c
index 1125309a9f7..023c9763abd 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7519,7 +7519,7 @@ imagemagick_load_image (/* Pointer to emacs frame structure. */
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;
@@ -7807,6 +7807,7 @@ imagemagick_load_image (/* Pointer to emacs frame structure. */
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;