mirror of
https://github.com/redmine/redmine.git
synced 2025-11-01 02:46:13 +01:00
Ignores @imagemagick_convert_command@ option when generating an image in Gantt module (#42145).
git-svn-id: https://svn.redmine.org/redmine/trunk@23597 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -396,7 +396,13 @@ module Redmine
|
|||||||
Redmine::Configuration['rmagick_font_path'].presence
|
Redmine::Configuration['rmagick_font_path'].presence
|
||||||
img = MiniMagick::Image.create(".#{format}")
|
img = MiniMagick::Image.create(".#{format}")
|
||||||
if Redmine::Configuration['imagemagick_convert_command'].present?
|
if Redmine::Configuration['imagemagick_convert_command'].present?
|
||||||
MiniMagick.cli_path = File.dirname(Redmine::Configuration['imagemagick_convert_command'])
|
if MiniMagick.respond_to?(:cli_path)
|
||||||
|
MiniMagick.cli_path = File.dirname(Redmine::Configuration['imagemagick_convert_command'])
|
||||||
|
else
|
||||||
|
Rails.logger.warn(
|
||||||
|
'imagemagick_convert_command option is ignored because MiniMagick has removed the option to define a custom path for the binary. Please ensure the convert binary is available in your PATH.'
|
||||||
|
)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
MiniMagick.convert do |gc|
|
MiniMagick.convert do |gc|
|
||||||
gc.size('%dx%d' % [subject_width + g_width + 1, height])
|
gc.size('%dx%d' % [subject_width + g_width + 1, height])
|
||||||
|
|||||||
Reference in New Issue
Block a user