Minor cleanup of previous change.

* image.c (imagemagick_error, Fimagemagick_types):
Omit some recently-introduced and unnecessary casts and assignments.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5d01b8e..d0d72dd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+       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  <dmantipov@yandex.ru>
 
        Fix two memory leaks discovered with Valgrind.

diff --git a/src/image.c b/src/image.c
index e4f4c7e..706745f 100644 (file)
--- 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);
 }