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

merge from trunk

Browse source
This commit is contained in:
Joakim Verona 2013-08-19 06:36:32 +02:00
commit c20b50ee18
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2013-08-19 Dmitry Antipov <dmantipov@yandex.ru>
* image.c (imagemagick_create_cache, imagemagick_get_animation_cache)
(imagemagick_prune_animation_cache): Now static.
2013-08-18 Lars Magne Ingebrigtsen <larsi@gnus.org>
* image.c (imagemagick_get_animation_cache): Don't segfault when

10
src/image.c
View file

@ -7887,18 +7887,18 @@ struct animation_cache
static struct animation_cache *animation_cache = NULL;
struct animation_cache *
static struct animation_cache *
imagemagick_create_cache (char *signature)
{
struct animation_cache *cache = xzalloc (sizeof (struct animation_cache));
struct animation_cache *cache = xzalloc (sizeof *cache);
cache->signature = signature;
cache->update_time = current_emacs_time ();
return cache;
}
/* Discard cached images that haven't been used for a minute. */
void
imagemagick_prune_animation_cache ()
static void
imagemagick_prune_animation_cache (void)
{
struct animation_cache *cache = animation_cache;
struct animation_cache *prev = NULL;
@ -7928,7 +7928,7 @@ imagemagick_prune_animation_cache ()
}
}
struct animation_cache *
static struct animation_cache *
imagemagick_get_animation_cache (MagickWand *wand)
{
char *signature = xstrdup (MagickGetImageSignature (wand));