diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/image.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9acdb5fbf27..fd5169c1498 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-06-12 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * image.c (imagemagick_load_image): Remove unused label. | ||
| 4 | |||
| 1 | 2012-06-11 Glenn Morris <rgm@gnu.org> | 5 | 2012-06-11 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * s/aix4-2.h, s/bsd-common.h, s/cygwin.h, s/darwin.h: | 7 | * s/aix4-2.h, s/bsd-common.h, s/cygwin.h, s/darwin.h: |
diff --git a/src/image.c b/src/image.c index 15fd7bbeab7..8a6d7861f91 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -7930,7 +7930,6 @@ imagemagick_load_image (struct frame *f, struct image *img, | |||
| 7930 | DestroyMagickWand (image_wand); | 7930 | DestroyMagickWand (image_wand); |
| 7931 | if (bg_wand) DestroyPixelWand (bg_wand); | 7931 | if (bg_wand) DestroyPixelWand (bg_wand); |
| 7932 | 7932 | ||
| 7933 | imagemagick_no_wand: | ||
| 7934 | MagickWandTerminus (); | 7933 | MagickWandTerminus (); |
| 7935 | /* TODO more cleanup. */ | 7934 | /* TODO more cleanup. */ |
| 7936 | image_error ("Error parsing IMAGEMAGICK image `%s'", img->spec, Qnil); | 7935 | image_error ("Error parsing IMAGEMAGICK image `%s'", img->spec, Qnil); |