aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog6
-rw-r--r--src/image.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5d01b8e9f18..d0d72dd6016 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12014-01-23 Paul Eggert <eggert@cs.ucla.edu>
2
3 Minor cleanup of previous change.
4 * image.c (imagemagick_error, Fimagemagick_types):
5 Omit some recently-introduced and unnecessary casts and assignments.
6
12014-01-23 Dmitry Antipov <dmantipov@yandex.ru> 72014-01-23 Dmitry Antipov <dmantipov@yandex.ru>
2 8
3 Fix two memory leaks discovered with Valgrind. 9 Fix two memory leaks discovered with Valgrind.
diff --git a/src/image.c b/src/image.c
index e4f4c7ec21f..706745fb479 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7908,7 +7908,7 @@ imagemagick_error (MagickWand *wand)
7908 image_error ("ImageMagick error: %s", 7908 image_error ("ImageMagick error: %s",
7909 build_string (description), 7909 build_string (description),
7910 Qnil); 7910 Qnil);
7911 description = (char *) MagickRelinquishMemory (description); 7911 MagickRelinquishMemory (description);
7912} 7912}
7913 7913
7914/* Possibly give ImageMagick some extra help to determine the image 7914/* Possibly give ImageMagick some extra help to determine the image
@@ -8546,10 +8546,10 @@ and `imagemagick-types-inhibit'. */)
8546 { 8546 {
8547 Qimagemagicktype = intern (imtypes[i]); 8547 Qimagemagicktype = intern (imtypes[i]);
8548 typelist = Fcons (Qimagemagicktype, typelist); 8548 typelist = Fcons (Qimagemagicktype, typelist);
8549 imtypes[i] = (char *) MagickRelinquishMemory (imtypes[i]); 8549 imtypes[i] = MagickRelinquishMemory (imtypes[i]);
8550 } 8550 }
8551 8551
8552 imtypes = (char **) MagickRelinquishMemory (imtypes); 8552 MagickRelinquishMemory (imtypes);
8553 return Fnreverse (typelist); 8553 return Fnreverse (typelist);
8554} 8554}
8555 8555