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-16 17:22:23 +02:00
commit 2bc8a1cc3c
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2013-08-16 Lars Magne Ingebrigtsen <larsi@gnus.org>
* net/shr.el (shr-rescale-image): Use ImageMagick even for GIFs
now that Emacs supports ImageMagick animations.
2013-08-16 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-cmds.el (top): Don't declare `buffer-name'.

1
lisp/net/shr.el
View file

@ -779,7 +779,6 @@ element is the data blob and the second element is the content-type."
"Rescale DATA, if too big, to fit the current buffer.
If FORCE, rescale the image anyway."
(if (or (not (fboundp 'imagemagick-types))
(eq (image-type-from-data data) 'gif)
(not (get-buffer-window (current-buffer))))
(create-image data nil t :ascent 100)
(let ((edges (window-inside-pixel-edges

1
src/ChangeLog
View file

@ -1,6 +1,7 @@
2013-08-16 Lars Magne Ingebrigtsen <larsi@gnus.org>
* image.c: Implement an ImageMagick per-image cache.
(imagemagick_get_animation_cache): Fix a double-free error.
2013-08-16 Xue Fuqiao <xfq.free@gmail.com>

7
src/image.c
View file

@ -7901,7 +7901,7 @@ void
imagemagick_prune_animation_cache ()
{
struct animation_cache *cache = animation_cache;
struct animation_cache *prev;
struct animation_cache *prev = NULL;
EMACS_TIME old = sub_emacs_time (current_emacs_time (),
EMACS_TIME_FROM_DOUBLE (60));
@ -7920,7 +7920,8 @@ imagemagick_prune_animation_cache ()
cache = cache->next;
free (this_cache);
}
else {
else
{
prev = cache;
cache = cache->next;
}
@ -7930,7 +7931,7 @@ imagemagick_prune_animation_cache ()
struct animation_cache *
imagemagick_get_animation_cache (MagickWand *wand)
{
char *signature = MagickGetImageSignature (wand);
char *signature = xstrdup (MagickGetImageSignature (wand));
struct animation_cache *cache = animation_cache;
imagemagick_prune_animation_cache ();