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

Fix previous commit.

Browse source 
(imagemagick_get_animation_cache): Revert to previous definition
so that it actually works.  But keep the memory leak fix.
This commit is contained in:
Lars Magne Ingebrigtsen 2013-08-19 17:14:42 +02:00
parent 6da2692802
commit 2a42bbcee8
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/image.c
View file

@ -7895,6 +7895,7 @@ imagemagick_create_cache (char *signature)
cache->wand = 0;
cache->index = 0;
cache->next = 0;
cache->update_time = current_emacs_time ();
return cache;
}
@ -7927,28 +7928,25 @@ imagemagick_get_animation_cache (MagickWand *wand)
{
char *signature = MagickGetImageSignature (wand);
struct animation_cache *cache;
struct animation_cache **pcache;
imagemagick_prune_animation_cache ();
cache = animation_cache;
if (! animation_cache)
animation_cache = cache = imagemagick_create_cache (signature);
else
if (! cache)
{
for (pcache = &animation_cache; *pcache; pcache = &cache->next)
{
cache = *pcache;
if (! cache)
{
animation_cache = cache = imagemagick_create_cache (signature);
break;
}
if (strcmp (signature, cache->signature) == 0)
{
DestroyString (signature);
break;
}
}
animation_cache = imagemagick_create_cache (signature);
return animation_cache;
}
while (strcmp(signature, cache->signature) &&
cache->next)
cache = cache->next;
if (strcmp(signature, cache->signature))
{
cache->next = imagemagick_create_cache (signature);
DestroyString (signature);
return cache->next;
}
cache->update_time = current_emacs_time ();