summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarius Balteanu <marius.balteanu@zitec.com>2022-02-20 20:16:58 +0000
committerMarius Balteanu <marius.balteanu@zitec.com>2022-02-20 20:16:58 +0000
commit92c7a4d53a9df47691703c1bea1755b95dbbb534 (patch)
tree4524cc62af1ec5a2468192a0b6dd3959041f1f69 /lib
parent9349a39ac05739b23ee8a112474b7f092898966f (diff)
downloadredmine-92c7a4d53a9df47691703c1bea1755b95dbbb534.tar.gz
redmine-92c7a4d53a9df47691703c1bea1755b95dbbb534.zip
Merged r21427 to 4.2-stable (#35027).
git-svn-id: http://svn.redmine.org/redmine/branches/4.2-stable@21428 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-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 2bce1db1b..532c06150 100644
--- a/lib/redmine/helpers/gantt.rb
+++ b/lib/redmine/helpers/gantt.rb
@@ -396,6 +396,9 @@ module Redmine
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')