diff options
| author | Dmitry Antipov | 2013-08-19 08:24:19 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-08-19 08:24:19 +0400 |
| commit | deb31e75f8042f6f15d78e6695e849991d2b9e05 (patch) | |
| tree | 9f2d639171f4dfb6c21ced8035acb63e3e1f56ff /src | |
| parent | c5074806deabf5caa90235d1b7c2781a6d9c1a0d (diff) | |
| download | emacs-deb31e75f8042f6f15d78e6695e849991d2b9e05.tar.gz emacs-deb31e75f8042f6f15d78e6695e849991d2b9e05.zip | |
* image.c (imagemagick_create_cache, imagemagick_get_animation_cache)
(imagemagick_prune_animation_cache): Now static.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/image.c | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7ee41698bad..0f68f36a8c9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-19 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * image.c (imagemagick_create_cache, imagemagick_get_animation_cache) | ||
| 4 | (imagemagick_prune_animation_cache): Now static. | ||
| 5 | |||
| 1 | 2013-08-18 Lars Magne Ingebrigtsen <larsi@gnus.org> | 6 | 2013-08-18 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 7 | ||
| 3 | * image.c (imagemagick_get_animation_cache): Don't segfault when | 8 | * image.c (imagemagick_get_animation_cache): Don't segfault when |
diff --git a/src/image.c b/src/image.c index 1452e8659b5..a8210e2414a 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -7887,18 +7887,18 @@ struct animation_cache | |||
| 7887 | 7887 | ||
| 7888 | static struct animation_cache *animation_cache = NULL; | 7888 | static struct animation_cache *animation_cache = NULL; |
| 7889 | 7889 | ||
| 7890 | struct animation_cache * | 7890 | static struct animation_cache * |
| 7891 | imagemagick_create_cache (char *signature) | 7891 | imagemagick_create_cache (char *signature) |
| 7892 | { | 7892 | { |
| 7893 | struct animation_cache *cache = xzalloc (sizeof (struct animation_cache)); | 7893 | struct animation_cache *cache = xzalloc (sizeof *cache); |
| 7894 | cache->signature = signature; | 7894 | cache->signature = signature; |
| 7895 | cache->update_time = current_emacs_time (); | 7895 | cache->update_time = current_emacs_time (); |
| 7896 | return cache; | 7896 | return cache; |
| 7897 | } | 7897 | } |
| 7898 | 7898 | ||
| 7899 | /* Discard cached images that haven't been used for a minute. */ | 7899 | /* Discard cached images that haven't been used for a minute. */ |
| 7900 | void | 7900 | static void |
| 7901 | imagemagick_prune_animation_cache () | 7901 | imagemagick_prune_animation_cache (void) |
| 7902 | { | 7902 | { |
| 7903 | struct animation_cache *cache = animation_cache; | 7903 | struct animation_cache *cache = animation_cache; |
| 7904 | struct animation_cache *prev = NULL; | 7904 | struct animation_cache *prev = NULL; |
| @@ -7928,7 +7928,7 @@ imagemagick_prune_animation_cache () | |||
| 7928 | } | 7928 | } |
| 7929 | } | 7929 | } |
| 7930 | 7930 | ||
| 7931 | struct animation_cache * | 7931 | static struct animation_cache * |
| 7932 | imagemagick_get_animation_cache (MagickWand *wand) | 7932 | imagemagick_get_animation_cache (MagickWand *wand) |
| 7933 | { | 7933 | { |
| 7934 | char *signature = xstrdup (MagickGetImageSignature (wand)); | 7934 | char *signature = xstrdup (MagickGetImageSignature (wand)); |