diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-04-20 21:10:04 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-04-20 21:10:04 -0400 |
| commit | 0f740e9c185b6aaed05e193828545ce7664fdbec (patch) | |
| tree | d27e2672ad3a816c743ad65ac3de85e1eb237f46 /lib/sisu/v3/dal_images.rb | |
| parent | debian/changelog (3.0.6-1) (diff) | |
| parent | v2 v3: sisu-mode.el, header notes copyright assignment to FSF (GNU EMACS) (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v3/dal_images.rb')
| -rw-r--r-- | lib/sisu/v3/dal_images.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/sisu/v3/dal_images.rb b/lib/sisu/v3/dal_images.rb index 8c7e9f94..c2088874 100644 --- a/lib/sisu/v3/dal_images.rb +++ b/lib/sisu/v3/dal_images.rb @@ -75,8 +75,8 @@ module SiSU_images @rmgk=false end else - if @md.cmd =~/[vVM]/ - SiSU_Screen::Ansi.new(@md.cmd,'use of RMagick is not enabled in sisurc.yml').warn + if @md.opt.cmd =~/[vVM]/ + SiSU_Screen::Ansi.new(@md.opt.cmd,'use of RMagick is not enabled in sisurc.yml').warn end end data.each do |dob| @@ -101,8 +101,8 @@ module SiSU_images img=Magick::ImageList.new("#{image_path}/#{image}") img_col,img_row=img.columns,img.rows else - if @md.cmd =~/[vVM]/ - SiSU_Screen::Ansi.new(@md.cmd,'RMagick not present, will attempt to use imagemagick (identify) directly').warn + if @md.opt.cmd =~/[vVM]/ + SiSU_Screen::Ansi.new(@md.opt.cmd,'RMagick not present, will attempt to use imagemagick (identify) directly').warn end imgk=SiSU_Env::System_call.new.imagemagick gmgk=SiSU_Env::System_call.new.graphicksmagick @@ -139,7 +139,7 @@ module SiSU_images end else images=dob.obj.scan(m) do |image| - SiSU_Screen::Ansi.new(@md.cmd,'where image dimensions have not been provided RMagick or imagemagick is required',image).warn #unless @opt.cmd =~/q/ + SiSU_Screen::Ansi.new(@md.opt.cmd,'where image dimensions have not been provided RMagick or imagemagick is required',image).warn #unless @opt.cmd =~/q/ end end end |