summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Balteanu <marius.balteanu@zitec.com>2022-02-20 20:17:16 +0000
committerMarius Balteanu <marius.balteanu@zitec.com>2022-02-20 20:17:16 +0000
commit496ec260dd1307993c7407b20535c29495fdc612 (patch)
tree09e171845ca203959da084556881c6fa255970c0
parente81ff170be942b3049fa33fad5f9273229338773 (diff)
downloadredmine-496ec260dd1307993c7407b20535c29495fdc612.tar.gz
redmine-496ec260dd1307993c7407b20535c29495fdc612.zip
Merged r21427 to 4.1-stable (#35027).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@21429 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--lib/redmine/helpers/gantt.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb
index dcddcca2a..1223c0fe0 100644
--- a/lib/redmine/helpers/gantt.rb
+++ b/lib/redmine/helpers/gantt.rb
@@ -379,6 +379,9 @@ module Redmine
unless Redmine::Configuration['rmagick_font_path'].nil?
font_path = Redmine::Configuration['minimagick_font_path'].presence || Redmine::Configuration['rmagick_font_path'].presence
img = MiniMagick::Image.create(".#{format}", false)
+ if Redmine::Configuration['imagemagick_convert_command'].present?
+ MiniMagick.cli_path = File.dirname(Redmine::Configuration['imagemagick_convert_command'])
+ end
MiniMagick::Tool::Convert.new do |gc|
gc.size('%dx%d' % [subject_width + g_width + 1, height])
gc.xc('white')