diff options
| author | Ralph Amissah <ralph@amissah.com> | 2014-08-20 20:36:21 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2014-08-20 20:36:21 -0400 |
| commit | 68113824863c29cf751f492a170593360ea31f82 (patch) | |
| tree | a4a1b776adeb9935321b26f98bae68c83ac3ed61 /lib/sisu/v5/ao_images.rb | |
| parent | debian/changelog (5.6.1-1) (diff) | |
| parent | documentation related, sisu manual book index, and --no-stop command (diff) | |
Merge tag 'sisu_5.6.2' into debian/sid
SiSU 5.6.2
Diffstat (limited to 'lib/sisu/v5/ao_images.rb')
| -rw-r--r-- | lib/sisu/v5/ao_images.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/sisu/v5/ao_images.rb b/lib/sisu/v5/ao_images.rb index dce92fc5..dd33833d 100644 --- a/lib/sisu/v5/ao_images.rb +++ b/lib/sisu/v5/ao_images.rb @@ -134,6 +134,17 @@ module SiSU_AO_Images end img_col,img_row=/(\d+)x(\d+)/m.match(imgsys)[1,2] img_col,img_row=img_col.to_i,img_row.to_i + else + errmsg='imagemagick or graphicksmagick are required to process images' + if @md.opt.act[:no_stop][:set]==:on + SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia). + error("#{errmsg}, proceeding (as requested) without image processing") + break + else + SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia). + error("#{errmsg}, STOPPING") + exit + end end end row=((img && defined? img.rows) ? img.rows : img_row) |