diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
| commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
| tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/image/image-converter.el | |
| parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
| parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
| download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz | |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/image/image-converter.el')
| -rw-r--r-- | lisp/image/image-converter.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/image/image-converter.el b/lisp/image/image-converter.el index e47f1f76e42..75d2e6692c0 100644 --- a/lisp/image/image-converter.el +++ b/lisp/image/image-converter.el @@ -78,7 +78,7 @@ is a string, it should be a MIME format string like (string-match image-converter-regexp source)) (and data-p (symbolp data-p) - (string-match "/" (symbol-name data-p)) + (string-search "/" (symbol-name data-p)) (string-match image-converter-regexp (concat "foo." (image-converter--mime-type data-p))))) @@ -133,7 +133,7 @@ data is returned as a string." (list value) value))) -(cl-defmethod image-converter--probe ((type (eql graphicsmagick))) +(cl-defmethod image-converter--probe ((type (eql 'graphicsmagick))) "Check whether the system has GraphicsMagick installed." (with-temp-buffer (let ((command (image-converter--value type :command)) @@ -151,7 +151,7 @@ data is returned as a string." (push (downcase (match-string 1)) formats))) (nreverse formats))))) -(cl-defmethod image-converter--probe ((type (eql imagemagick))) +(cl-defmethod image-converter--probe ((type (eql 'imagemagick))) "Check whether the system has ImageMagick installed." (with-temp-buffer (let ((command (image-converter--value type :command)) @@ -171,7 +171,7 @@ data is returned as a string." (push (downcase (match-string 1)) formats))) (nreverse formats)))) -(cl-defmethod image-converter--probe ((type (eql ffmpeg))) +(cl-defmethod image-converter--probe ((type (eql 'ffmpeg))) "Check whether the system has ffmpeg installed." (with-temp-buffer (let ((command (image-converter--value type :command)) @@ -212,12 +212,12 @@ Only suffixes that map to `image-mode' are returned." 'image-mode) collect suffix)) -(cl-defmethod image-converter--convert ((type (eql graphicsmagick)) source +(cl-defmethod image-converter--convert ((type (eql 'graphicsmagick)) source image-format) "Convert using GraphicsMagick." (image-converter--convert-magick type source image-format)) -(cl-defmethod image-converter--convert ((type (eql imagemagick)) source +(cl-defmethod image-converter--convert ((type (eql 'imagemagick)) source image-format) "Convert using ImageMagick." (image-converter--convert-magick type source image-format)) @@ -249,7 +249,7 @@ Only suffixes that map to `image-mode' are returned." ;; error message. (buffer-string)))) -(cl-defmethod image-converter--convert ((type (eql ffmpeg)) source +(cl-defmethod image-converter--convert ((type (eql 'ffmpeg)) source image-format) "Convert using ffmpeg." (let ((command (image-converter--value type :command))) |