Revision 23600
Added by Marius BĂLTEANU 3 months ago
| branches/5.1-stable/lib/redmine/helpers/gantt.rb | ||
|---|---|---|
| 396 | 396 |
Redmine::Configuration['rmagick_font_path'].presence |
| 397 | 397 |
img = MiniMagick::Image.create(".#{format}", false)
|
| 398 | 398 |
if Redmine::Configuration['imagemagick_convert_command'].present? |
| 399 |
MiniMagick.cli_path = File.dirname(Redmine::Configuration['imagemagick_convert_command']) |
|
| 399 |
if MiniMagick.respond_to?(:cli_path) |
|
| 400 |
MiniMagick.cli_path = File.dirname(Redmine::Configuration['imagemagick_convert_command']) |
|
| 401 |
else |
|
| 402 |
Rails.logger.warn( |
|
| 403 |
'imagemagick_convert_command option is ignored ' \ |
|
| 404 |
'because MiniMagick has removed the option to define a custom path for the binary. ' \ |
|
| 405 |
'Please ensure the convert binary is available in your PATH.' |
|
| 406 |
) |
|
| 407 |
end |
|
| 400 | 408 |
end |
| 401 | 409 |
MiniMagick::Tool::Convert.new do |gc| |
| 402 | 410 |
gc.size('%dx%d' % [subject_width + g_width + 1, height])
|
Also available in: Unified diff
Merged r23597 and r23598 from trunk to 5.1-stable (#42145).