db9af10394
Prefer librsvg for display of splash.svg When both librsvg and Imagemagick are available, Emacs should prefer librsvg to render SVG images. However, Emacs was using Imagemagick to render its own splash.svg file because image-type-from-file-header returned nil for that file. * lisp/image.el (image-type-from-buffer) (image-type-from-file-header): Look at the first 8192 bytes of the image, not just the first 256. For Emacs’s own splash.svg file, image-type-header-regexps needs to look at 939 bytes. 8192 bytes is a reasonable number nowadays given typical file system design. * test/lisp/image-tests.el (image-tests--emacs-images-directory): New contant. (image-type-from-file-header-test): New test.
56 lines
2 KiB
EmacsLisp
56 lines
2 KiB
EmacsLisp
;;; image-tests.el --- tests for image.el -*- lexical-binding: t -*-
|
|
|
|
;; Copyright (C) 2019 Free Software Foundation, Inc.
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Code:
|
|
|
|
(require 'ert)
|
|
(require 'image)
|
|
|
|
(defconst image-tests--emacs-images-directory
|
|
(expand-file-name "../etc/images" (getenv "EMACS_TEST_DIRECTORY"))
|
|
"Directory containing Emacs images.")
|
|
|
|
(ert-deftest image--set-property ()
|
|
"Test `image--set-property' behavior."
|
|
(let ((image (list 'image)))
|
|
;; Add properties.
|
|
(setf (image-property image :scale) 1)
|
|
(should (equal image '(image :scale 1)))
|
|
(setf (image-property image :width) 8)
|
|
(should (equal image '(image :scale 1 :width 8)))
|
|
(setf (image-property image :height) 16)
|
|
(should (equal image '(image :scale 1 :width 8 :height 16)))
|
|
;; Delete properties.
|
|
(setf (image-property image :type) nil)
|
|
(should (equal image '(image :scale 1 :width 8 :height 16)))
|
|
(setf (image-property image :scale) nil)
|
|
(should (equal image '(image :width 8 :height 16)))
|
|
(setf (image-property image :height) nil)
|
|
(should (equal image '(image :width 8)))
|
|
(setf (image-property image :width) nil)
|
|
(should (equal image '(image)))))
|
|
|
|
(ert-deftest image-type-from-file-header-test ()
|
|
"Test image-type-from-file-header."
|
|
(should (eq 'svg
|
|
(image-type-from-file-header
|
|
(expand-file-name "splash.svg"
|
|
image-tests--emacs-images-directory)))))
|
|
|
|
;;; image-tests.el ends here
|