Defect #40832 ยป use-magick-command-for-imagemagick7.patch
| w/lib/redmine/thumbnail.rb | ||
|---|---|---|
| 24 | 24 |
module Thumbnail |
| 25 | 25 |
extend Redmine::Utils::Shell |
| 26 | 26 | |
| 27 |
CONVERT_BIN = (Redmine::Configuration['imagemagick_convert_command'] || 'convert').freeze |
|
| 27 |
CONVERT_BIN = ( |
|
| 28 |
Redmine::Configuration['imagemagick_convert_command'] || |
|
| 29 |
begin |
|
| 30 |
`magick --version` |
|
| 31 |
$?.success? ? 'magick' : 'convert' |
|
| 32 |
rescue |
|
| 33 |
'convert' |
|
| 34 |
end |
|
| 35 |
).freeze |
|
| 28 | 36 |
GS_BIN = ( |
| 29 | 37 |
Redmine::Configuration['gs_command'] || |
| 30 | 38 |
('gswin64c' if Redmine::Platform.mswin?) ||
|