procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor cleanup of previous change.

Browse source 
* image.c (imagemagick_error, Fimagemagick_types):
Omit some recently-introduced and unnecessary casts and assignments.
This commit is contained in:
Paul Eggert 2014-01-23 09:27:37 -08:00
parent d4f0427be7
commit ed44be700c
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -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.

6
src/image.c
View file

@ -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);
}