diff options
| author | Ralph Amissah <ralph@amissah.com> | 2015-12-15 00:05:39 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2015-12-15 00:05:39 -0500 |
| commit | c00dd62f3fd302264ffd8f268809eb39bb2290cb (patch) | |
| tree | d5ce1d7f610d02555c302bc8850d7cdbd6f3b41a /lib | |
| parent | debian/changelog (7.1.5-1) (diff) | |
| parent | version & changelog, tag for release (diff) | |
Merge tag 'sisu_7.1.6' into debian/sid
SiSU 7.1.6
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/ao_images.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/sisu/ao_images.rb b/lib/sisu/ao_images.rb index 06aec134..018152ed 100644 --- a/lib/sisu/ao_images.rb +++ b/lib/sisu/ao_images.rb @@ -57,10 +57,10 @@ module SiSU_AO_Images class Images begin - require 'RMagick' + 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 @@ -71,7 +71,7 @@ module SiSU_AO_Images imagemagick_=true #imagemagick_=SiSU_Env::InfoSettings.new.program?('rmagick') if imagemagick_ begin - @rmgk=SiSU_Env::Load.new('RMagick').prog + @rmgk=SiSU_Env::Load.new('rmagick').prog rescue @rmgk=false end @@ -80,7 +80,7 @@ module SiSU_AO_Images || @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* use of rmagick is not enabled in sisurc.yml' ).warn end end @@ -114,7 +114,7 @@ module SiSU_AO_Images || @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* rmagick not present, will attempt to use imagemagick (identify) directly' ).warn end imgk=SiSU_Env::SystemCall.new.imagemagick @@ -168,7 +168,7 @@ module SiSU_AO_Images images=dob.obj.scan(m) do |image| SiSU_Screen::Ansi.new( @md.opt.act[:color_state][:set], - '*WARN* where image dimensions have not been provided RMagick or imagemagick is required',image + '*WARN* where image dimensions have not been provided rmagick or imagemagick is required',image ).warn unless @md.opt.act[:quiet][:set]==:on end end |