aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-05-12 23:06:54 -0400
committerRalph Amissah <ralph@amissah.com>2014-05-12 23:06:54 -0400
commitd6f28e09d7517df9e15c375f61a2e481bda534f1 (patch)
treec8dd718ff415f62860b45e87ce81d03a6a9a8077
parentv6: ao, document markup structure check, skip processing file on major error (diff)
v6: ao_images, reduce warnings when ruby RMagic absent as program used directly
* reduced dependency on ruby RMagic library (as some time way back had issues)
-rw-r--r--lib/sisu/v6/ao_images.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/sisu/v6/ao_images.rb b/lib/sisu/v6/ao_images.rb
index 05bc8e63..030dbd19 100644
--- a/lib/sisu/v6/ao_images.rb
+++ b/lib/sisu/v6/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