bug#39994: 27.0.90; Broken image-converter probe for imagemagick

[Lars Ingebrigtsen]

Juri Linkov <juri@linkov.net> writes:

> 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:

Ah, so some versions have an additional column in there?  My convert
-list format outputs:

      ICO* rw+   Microsoft icon

>  (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.")

Was this part included by mistake?  It changes the order the converters
are tested.

>          ;; 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)

Look OK to me, but the comment should be amended to reflect the two
different line formats it's now matching.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no