procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Work around ImageMagick bug 825

Browse source 
This should fix several bugs reported recently against Emacs
(Bug#28518, Bug#28626, Bug#28632, Bug#28633, Bug#28770).
* src/image.c (imagemagick_load_image):
Do not call MagickWandTerminus.
This commit is contained in:
Paul Eggert 2017-10-16 23:44:32 -07:00
parent 20cc68e871
commit b38724ab67
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/image.c
View file

@ -8552,13 +8552,19 @@ imagemagick_load_image (struct frame *f, struct image *img,
char hint_buffer[MaxTextExtent]; char hint_buffer[MaxTextExtent];
char *filename_hint = NULL; char *filename_hint = NULL;
/* Initialize the ImageMagick environment. */
static bool imagemagick_initialized;
if (!imagemagick_initialized)
{
imagemagick_initialized = true;
MagickWandGenesis ();
}
/* Handle image index for image types who can contain more than one image. /* Handle image index for image types who can contain more than one image.
Interface :index is same as for GIF. First we "ping" the image to see how Interface :index is same as for GIF. First we "ping" the image to see how
many sub-images it contains. Pinging is faster than loading the image to many sub-images it contains. Pinging is faster than loading the image to
find out things about it. */ find out things about it. */
/* Initialize the imagemagick environment. */
MagickWandGenesis ();
image = image_spec_value (img->spec, QCindex, NULL); image = image_spec_value (img->spec, QCindex, NULL);
ino = INTEGERP (image) ? XFASTINT (image) : 0; ino = INTEGERP (image) ? XFASTINT (image) : 0;
image_wand = NewMagickWand (); image_wand = NewMagickWand ();
@ -8859,8 +8865,10 @@ imagemagick_load_image (struct frame *f, struct image *img,
DestroyMagickWand (image_wand); DestroyMagickWand (image_wand);
if (bg_wand) DestroyPixelWand (bg_wand); if (bg_wand) DestroyPixelWand (bg_wand);
/* `MagickWandTerminus' terminates the imagemagick environment. */ /* Do not call MagickWandTerminus, to work around ImageMagick bug 825. See:
MagickWandTerminus (); https://github.com/ImageMagick/ImageMagick/issues/825
Although this bug was introduced in ImageMagick 6.9.9-14 and
fixed in 6.9.9-18, it's simpler to work around it in all versions. */
return 1; return 1;
@ -8868,7 +8876,6 @@ imagemagick_load_image (struct frame *f, struct image *img,
DestroyMagickWand (image_wand); DestroyMagickWand (image_wand);
if (bg_wand) DestroyPixelWand (bg_wand); if (bg_wand) DestroyPixelWand (bg_wand);
MagickWandTerminus ();
/* TODO more cleanup. */ /* TODO more cleanup. */
image_error ("Error parsing IMAGEMAGICK image `%s'", img->spec); image_error ("Error parsing IMAGEMAGICK image `%s'", img->spec);
return 0; return 0;