summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2015-12-15 04:16:06 +0000
committerRalph Amissah <ralph@amissah.com>2015-12-15 05:04:01 +0000
commit07970cd90b8717dac008a59ac40177369bda9a80 (patch)
tree6f2b472812674a7d2a766729a505c0564b504f04
parentfilename reference version update sisu_7a_sqlite.cgi (diff)
downloadsisu-07970cd90b8717dac008a59ac40177369bda9a80.zip
sisu-07970cd90b8717dac008a59ac40177369bda9a80.tar.xz
ao_images, require 'rmagick' (instead of 'RMagick' depreciated)
-rw-r--r--data/doc/sisu/CHANGELOG_v72
-rw-r--r--lib/sisu/ao_images.rb12
2 files changed, 8 insertions, 6 deletions
diff --git a/data/doc/sisu/CHANGELOG_v7 b/data/doc/sisu/CHANGELOG_v7
index 7a2e777..a10d34a 100644
--- a/data/doc/sisu/CHANGELOG_v7
+++ b/data/doc/sisu/CHANGELOG_v7
@@ -33,6 +33,8 @@ Reverse Chronological:
* filename reference version update sisu_7a_sqlite.cgi
+ * ao_images, require 'rmagick' (instead of 'RMagick' depreciated)
+
* sisu_7.1.5.orig.tar.xz (2015-06-02:22/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.5
diff --git a/lib/sisu/ao_images.rb b/lib/sisu/ao_images.rb
index 06aec13..018152e 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