[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 6ef896c 01/12: Ignore invalid SVG images
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] emacs-25 6ef896c 01/12: Ignore invalid SVG images |
Date: |
Fri, 25 Dec 2015 16:05:59 +0000 |
branch: emacs-25
commit 6ef896cc78b7caf39541a94fd89197d7a0497f9a
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Ignore invalid SVG images
* shr.el (shr-tag-svg): Ignore SVG images that have no width
or height, because these can't be displayed by ImageMagick,
anyway.
Backport:
(cherry picked from commit 821107d53c2e390240d25c036b99ebbf9b4a93b6)
---
lisp/net/shr.el | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index dbf45b8..d51b8c7 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1152,7 +1152,9 @@ ones, in case fg and bg are nil."
(defun shr-tag-svg (dom)
(when (and (image-type-available-p 'svg)
- (not shr-inhibit-images))
+ (not shr-inhibit-images)
+ (dom-attr dom 'width)
+ (dom-attr dom 'height))
(funcall shr-put-image-function (list (shr-dom-to-xml dom) 'image/svg+xml)
"SVG Image")))
- [Emacs-diffs] emacs-25 updated (cc3de97 -> e59b2ee), Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 5bd3a0c 02/12: Add FreeBSD cert bundle, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 6ef896c 01/12: Ignore invalid SVG images,
Lars Ingebrigtsen <=
- [Emacs-diffs] emacs-25 90f82ff 03/12: Decode hex-encoded URLs before using them as file names, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 ec2a509 06/12: Use cl-reduce, not reduce., Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 96ac314 05/12: Allow several <tbody> tags in shr, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 eeff251 08/12: Don't store cookies with empty names, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 5b2401d 07/12: Stop rendering HTML before specdlr exhaustion, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 6c12691 11/12: Always save eww history, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 a7143fa 04/12: Make prettier unique file names in eww, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 2d33a9c 09/12: Make toggling checkboxes work again, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 1a99bd6 10/12: Default web pages to right-to-left, Lars Ingebrigtsen, 2015/12/25
- [Emacs-diffs] emacs-25 e59b2ee 12/12: More eww file name coding fixes, Lars Ingebrigtsen, 2015/12/25