From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#39994: 27.0.90; Broken image-converter probe for imagemagick Date: Mon, 09 Mar 2020 02:09:05 +0200 Organization: LINKOV.NET Message-ID: <87d09mpexq.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="37596"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (x86_64-pc-linux-gnu) To: 39994@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Mar 09 03:38:14 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jB8J3-0009im-TA for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 09 Mar 2020 03:38:14 +0100 Original-Received: from localhost ([::1]:35402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jB8J2-0008Jn-Gq for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 08 Mar 2020 22:38:12 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:60114) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jB8It-0008JS-Vk for bug-gnu-emacs@gnu.org; Sun, 08 Mar 2020 22:38:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jB8Is-0001Lu-V9 for bug-gnu-emacs@gnu.org; Sun, 08 Mar 2020 22:38:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:43642) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jB8Is-0001Lq-Rw for bug-gnu-emacs@gnu.org; Sun, 08 Mar 2020 22:38:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jB8Is-000579-N7 for bug-gnu-emacs@gnu.org; Sun, 08 Mar 2020 22:38:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 09 Mar 2020 02:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39994 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.158372143919605 (code B ref -1); Mon, 09 Mar 2020 02:38:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 9 Mar 2020 02:37:19 +0000 Original-Received: from localhost ([127.0.0.1]:49615 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jB8IB-000569-3Q for submit@debbugs.gnu.org; Sun, 08 Mar 2020 22:37:19 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:60883) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jB8I9-000560-0y for submit@debbugs.gnu.org; Sun, 08 Mar 2020 22:37:17 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59965) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jB8I7-0008I1-Og for bug-gnu-emacs@gnu.org; Sun, 08 Mar 2020 22:37:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jB8I6-00019Q-9t for bug-gnu-emacs@gnu.org; Sun, 08 Mar 2020 22:37:15 -0400 Original-Received: from bisque.elm.relay.mailchannels.net ([23.83.212.18]:37049) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jB8I5-00017R-NN for bug-gnu-emacs@gnu.org; Sun, 08 Mar 2020 22:37:14 -0400 X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 3F1E1500924 for ; Mon, 9 Mar 2020 00:13:47 +0000 (UTC) Original-Received: from pdx1-sub0-mail-a88.g.dreamhost.com (100-96-215-21.trex.outbound.svc.cluster.local [100.96.215.21]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id BAD12501308 for ; Mon, 9 Mar 2020 00:13:46 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from pdx1-sub0-mail-a88.g.dreamhost.com ([TEMPUNAVAIL]. [64.90.62.162]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.18.5); Mon, 09 Mar 2020 00:13:47 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|jurta@jurta.org X-MailChannels-Auth-Id: dreamhost X-Supply-Wide-Eyed: 1fe4c6cf36c225ca_1583712826978_2185432260 X-MC-Loop-Signature: 1583712826978:3686955420 X-MC-Ingress-Time: 1583712826978 Original-Received: from pdx1-sub0-mail-a88.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a88.g.dreamhost.com (Postfix) with ESMTP id 99F33B1FDC for ; Sun, 8 Mar 2020 17:13:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=linkov.net; h=from:to :subject:date:message-id:mime-version:content-type; s= linkov.net; bh=gCGdnDCuGz8Qo8i9jB4LV3glmII=; b=pET/MHngoZsrb1sGm UebH/bapbknkmzWCdiolQpAVIB1oKXbvv7VBW8ZKsVWqQKnKEC1bOpp7gnKYWlSk J8C1aVRnT+zOSDtX4RIIPggckyqUG3G6UrDEh1TZ7sbjQjvbdaV7gv++Fk8JYDex p1+3FqffNckoODEC0tbCbKOziY= Original-Received: from mail.jurta.org (m91-129-103-27.cust.tele2.ee [91.129.103.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: jurta@jurta.org) by pdx1-sub0-mail-a88.g.dreamhost.com (Postfix) with ESMTPSA id 6A899B1FD6 for ; Sun, 8 Mar 2020 17:13:41 -0700 (PDT) X-DH-BACKEND: pdx1-sub0-mail-a88 X-VR-OUT-STATUS: OK X-VR-OUT-SCORE: 0 X-VR-OUT-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedugedruddujedgudekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuggftfghnshhusghstghrihgsvgdpffftgfetoffjqffuvfenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuohffkfgfgggtsehttdertddtredtnecuhfhrohhmpefluhhrihcunfhinhhkohhvuceojhhurhhisehlihhnkhhovhdrnhgvtheqnecukfhppeeluddruddvledruddtfedrvdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhppdhhvghlohepmhgrihhlrdhjuhhrthgrrdhorhhgpdhinhgvthepledurdduvdelrddutdefrddvjedprhgvthhurhhnqdhprghthheplfhurhhiucfnihhnkhhovhcuoehjuhhriheslhhinhhkohhvrdhnvghtqedpmhgrihhlfhhrohhmpehjuhhriheslhhinhhkohhvrdhnvghtpdhnrhgtphhtthhopegsuhhgqdhgnhhuqdgvmhgrtghssehgnhhurdhorhhg X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:177077 Archived-At: Tags: patch I tried to visit an .ico file using graphicsmagick image-converter, but it failed with the error: Cannot display image: (/usr/bin/gm convert: Unexpected end-of-file (). Probably a bug in graphicsmagick, so we can do nothing to fix this. Then I tried imagemagick, but image-converter said .ico format is unsupported. Whereas running `convert -list format` outputs: Format Module Mode Description ------------------------------------------------------------------------------- ICO* ICON rw+ Microsoft icon So this patch adds the support for the 'Module' column to imagemagick probe: diff --git a/lisp/image/image-converter.el b/lisp/image/image-converter.el index 0488a13d41..5843b2a399 100644 --- a/lisp/image/image-converter.el +++ b/lisp/image/image-converter.el @@ -44,8 +44,8 @@ image-converter-regexp (defvar image-converter--converters '((graphicsmagick :command ("gm" "convert") :probe ("-list" "format")) - (ffmpeg :command "ffmpeg" :probe "-decoders") - (imagemagick :command "convert" :probe ("-list" "format"))) + (imagemagick :command "convert" :probe ("-list" "format")) + (ffmpeg :command "ffmpeg" :probe "-decoders")) "List of supported image converters to try.") (defun image-convert-p (source &optional data-p) @@ -150,7 +150,7 @@ image-converter--probe (forward-line 1) ;; Lines look like ;; " WPG* r-- Word Perfect Graphics". - (while (re-search-forward "^ *\\([A-Z0-9]+\\)\\*? +r" nil t) + (while (re-search-forward "^ *\\([A-Z0-9]+\\)\\*?\\(?: +[A-Z0-9]+\\)? +r" nil t) (push (downcase (match-string 1)) formats))) (nreverse formats))))