From ed44be700c5acf5ca2ffcf059c1e3a1640e33a5f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 23 Jan 2014 09:27:37 -0800 Subject: [PATCH] Minor cleanup of previous change. * image.c (imagemagick_error, Fimagemagick_types): Omit some recently-introduced and unnecessary casts and assignments. --- src/ChangeLog | 6 ++++++ src/image.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 5d01b8e9f1..d0d72dd601 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-01-23 Paul Eggert + + Minor cleanup of previous change. + * image.c (imagemagick_error, Fimagemagick_types): + Omit some recently-introduced and unnecessary casts and assignments. + 2014-01-23 Dmitry Antipov Fix two memory leaks discovered with Valgrind. diff --git a/src/image.c b/src/image.c index e4f4c7ec21..706745fb47 100644 --- a/src/image.c +++ b/src/image.c @@ -7908,7 +7908,7 @@ imagemagick_error (MagickWand *wand) image_error ("ImageMagick error: %s", build_string (description), Qnil); - description = (char *) MagickRelinquishMemory (description); + MagickRelinquishMemory (description); } /* Possibly give ImageMagick some extra help to determine the image @@ -8546,10 +8546,10 @@ and `imagemagick-types-inhibit'. */) { Qimagemagicktype = intern (imtypes[i]); typelist = Fcons (Qimagemagicktype, typelist); - imtypes[i] = (char *) MagickRelinquishMemory (imtypes[i]); + imtypes[i] = MagickRelinquishMemory (imtypes[i]); } - imtypes = (char **) MagickRelinquishMemory (imtypes); + MagickRelinquishMemory (imtypes); return Fnreverse (typelist); } -- 2.20.1