emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r116130: Minor cleanup of previous change.


From: Paul Eggert
Subject: [Emacs-diffs] trunk r116130: Minor cleanup of previous change.
Date: Thu, 23 Jan 2014 17:27:44 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 116130
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2014-01-23 09:27:37 -0800
message:
  Minor cleanup of previous change.
  
  * image.c (imagemagick_error, Fimagemagick_types):
  Omit some recently-introduced and unnecessary casts and assignments.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-01-23 12:18:08 +0000
+++ b/src/ChangeLog     2014-01-23 17:27:37 +0000
@@ -1,3 +1,9 @@
+2014-01-23  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        Fix two memory leaks discovered with Valgrind.

=== modified file 'src/image.c'
--- a/src/image.c       2014-01-23 12:18:08 +0000
+++ b/src/image.c       2014-01-23 17:27:37 +0000
@@ -7908,7 +7908,7 @@
   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 @@
     {
       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);
 }
 


reply via email to

[Prev in Thread] Current Thread [Next in Thread]