diff options
| author | Ralph Amissah <ralph@amissah.com> | 2014-05-25 10:06:59 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2014-05-25 10:06:59 -0400 |
| commit | dcb004beebc9551e19e8380702aaa7c38224d787 (patch) | |
| tree | 786d575295c7f7a1536ba9ba954043d475fd8a49 /lib/sisu/v5/ao_images.rb | |
| parent | debian/changelog (5.3.6-1) (diff) | |
| parent | v5: merge v6 to v5, version bump to 5.4.*, reason adds structure check (diff) | |
Merge tag 'sisu_5.4.0' into debian/sid
SiSU 5.4.0
Diffstat (limited to 'lib/sisu/v5/ao_images.rb')
| -rw-r--r-- | lib/sisu/v5/ao_images.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/sisu/v5/ao_images.rb b/lib/sisu/v5/ao_images.rb index b72f66a3..8eee4b57 100644 --- a/lib/sisu/v5/ao_images.rb +++ b/lib/sisu/v5/ao_images.rb @@ -66,7 +66,7 @@ module SiSU_AO_Images require 'RMagick' include Magick rescue LoadError - SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).mark('RMagic NOT FOUND') + #SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).mark('RMagic NOT FOUND') end def initialize(md,data) @md,@data=md,data @@ -83,8 +83,7 @@ module SiSU_AO_Images @rmgk=false end else - if (@md.opt.act[:verbose][:set]==:on \ - || @md.opt.act[:verbose_plus][:set]==:on \ + if (@md.opt.act[:verbose_plus][:set]==:on \ || @md.opt.act[:maintenance][:set]==:on) SiSU_Screen::Ansi.new(@md.opt.act[:color_state][:set],'*WARN* use of RMagick is not enabled in sisurc.yml').warn end @@ -111,8 +110,7 @@ module SiSU_AO_Images img=Magick::ImageList.new("#{image_path}/#{image}") img_col,img_row=img.columns,img.rows else - if (@md.opt.act[:verbose][:set]==:on \ - || @md.opt.act[:verbose_plus][:set]==:on \ + if (@md.opt.act[:verbose_plus][:set]==:on \ || @md.opt.act[:maintenance][:set]==:on) SiSU_Screen::Ansi.new(@md.opt.act[:color_state][:set],'*WARN* RMagick not present, will attempt to use imagemagick (identify) directly').warn end |