diff options
| author | Ralph Amissah <ralph@amissah.com> | 2013-10-23 23:59:57 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2013-10-23 23:59:57 -0400 |
| commit | 8605801052c23ea408951b4d4054cb90d9caf1f6 (patch) | |
| tree | ee82b5108ccc570222ba3f0fd72418a85ca70344 /lib/sisu/v5/dal_images.rb | |
| parent | debian/changelog (4.2.7-1) (diff) | |
| parent | v4 v5: dal, collapsed levels implemented (diff) | |
Merge tag 'sisu_4.2.8' into debian/sid
SiSU 4.2.8
Diffstat (limited to 'lib/sisu/v5/dal_images.rb')
| -rw-r--r-- | lib/sisu/v5/dal_images.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/sisu/v5/dal_images.rb b/lib/sisu/v5/dal_images.rb index 1141447d..33a5e627 100644 --- a/lib/sisu/v5/dal_images.rb +++ b/lib/sisu/v5/dal_images.rb @@ -78,8 +78,10 @@ module SiSU_DAL_Images @rmgk=false end else - if @md.opt.cmd =~/[vVM]/ - SiSU_Screen::Ansi.new(@md.opt.cmd,'*WARN* use of RMagick is not enabled in sisurc.yml').warn + if (@md.opt.act[:verbose][:set]==:on \ + || @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 end data.each do |dob| @@ -104,8 +106,10 @@ module SiSU_DAL_Images img=Magick::ImageList.new("#{image_path}/#{image}") img_col,img_row=img.columns,img.rows else - if @md.opt.cmd =~/[vVM]/ - SiSU_Screen::Ansi.new(@md.opt.cmd,'*WARN* RMagick not present, will attempt to use imagemagick (identify) directly').warn + if (@md.opt.act[:verbose][:set]==:on \ + || @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 imgk=SiSU_Env::SystemCall.new.imagemagick gmgk=SiSU_Env::SystemCall.new.graphicksmagick @@ -142,7 +146,7 @@ module SiSU_DAL_Images end else images=dob.obj.scan(m) do |image| - SiSU_Screen::Ansi.new(@md.opt.cmd,'*WARN* where image dimensions have not been provided RMagick or imagemagick is required',image).warn #unless @opt.cmd =~/q/ + 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 unless @md.opt.act[:quiet][:set]==:on end end end |