RubyGems - rmagick - Versions diffs - 1.8.3 → 1.9.0 - Mend

rmagick 1.8.3 → 1.9.0

Potentially problematic release.

This version of rmagick might be problematic. Click here for more details.

Files changed (72) hide show

data/ChangeLog +5 -0
data/README.html +8 -8
data/README.txt +6 -6
data/configure +12 -11
data/configure.ac +2 -2
data/doc/draw.html +10 -10
data/doc/ex/InitialCoords.rb +1 -2
data/doc/ex/NewCoordSys.rb +1 -2
data/doc/ex/OrigCoordSys.rb +1 -2
data/doc/ex/PreserveAspectRatio.rb +4 -5
data/doc/ex/RotateScale.rb +1 -2
data/doc/ex/Skew.rb +1 -2
data/doc/ex/Use01.rb +3 -4
data/doc/ex/Use02.rb +3 -4
data/doc/ex/Use03.rb +3 -4
data/doc/ex/ViewBox.rb +1 -2
data/doc/ex/arcs01.rb +2 -3
data/doc/ex/arcs02.rb +3 -4
data/doc/ex/baseline_shift01.rb +1 -2
data/doc/ex/circle01.rb +2 -3
data/doc/ex/cubic01.rb +2 -3
data/doc/ex/cubic02.rb +2 -3
data/doc/ex/ellipse01.rb +2 -3
data/doc/ex/evenodd.rb +3 -4
data/doc/ex/font_styles.rb +1 -2
data/doc/ex/group.rb +3 -4
data/doc/ex/image.rb +1 -2
data/doc/ex/line01.rb +2 -3
data/doc/ex/nested_rvg.rb +2 -3
data/doc/ex/nonzero.rb +3 -4
data/doc/ex/polygon01.rb +2 -3
data/doc/ex/polyline01.rb +2 -3
data/doc/ex/quad01.rb +2 -3
data/doc/ex/rect01.rb +2 -3
data/doc/ex/rect02.rb +2 -3
data/doc/ex/rvg_clippath.rb +3 -4
data/doc/ex/rvg_linecap.rb +2 -3
data/doc/ex/rvg_linejoin.rb +2 -3
data/doc/ex/rvg_opacity.rb +1 -2
data/doc/ex/rvg_pattern.rb +3 -4
data/doc/ex/rvg_stroke_dasharray.rb +1 -2
data/doc/ex/stegano.rb +23 -7
data/doc/ex/stroke_fill.rb +1 -2
data/doc/ex/text01.rb +2 -3
data/doc/ex/text_styles.rb +1 -2
data/doc/ex/tref01.rb +3 -4
data/doc/ex/triangle01.rb +2 -3
data/doc/ex/tspan01.rb +2 -3
data/doc/ex/tspan02.rb +2 -3
data/doc/ex/tspan03.rb +2 -3
data/doc/ex/writing_mode01.rb +2 -3
data/doc/ex/writing_mode02.rb +2 -3
data/doc/imageattrs.html +92 -1
data/doc/info.html +29 -0
data/doc/magick.html +12 -6
data/doc/rvgstyle.html +0 -2
data/ext/RMagick/MANIFEST +1 -1
data/ext/RMagick/rmagick.h +8 -2
data/ext/RMagick/rmagick_config.h.in +2 -0
data/ext/RMagick/rmdraw.c +9 -4
data/ext/RMagick/rmimage.c +37 -1
data/ext/RMagick/rminfo.c +34 -1
data/ext/RMagick/rmmain.c +10 -3
data/ext/RMagick/rmutil.c +33 -2
data/lib/RMagick.rb +30 -9
data/lib/rvg/embellishable.rb +9 -9
data/lib/rvg/misc.rb +17 -17
data/lib/rvg/paint.rb +2 -2
data/lib/rvg/rvg.rb +13 -13
data/lib/rvg/text.rb +6 -6
data/rmagick.gemspec +1 -1
metadata +2 -2

data/ChangeLog CHANGED

@@ -1,3 +1,8 @@
+RMagick 1.9.0
+    o Added Image#monitor=, Image::Info#monitor=. Deprecated Magick.set_monitor.
+    o Fixed bug #2070, support color names with embedded spaces
+    o Fixed bug #2109, properly scope Magick constants in RVG
 RMagick 1.8.3
     o Tested with ImageMagick 6.2.3-2
     o Added comment, delay, dispose, fill, gravity, and label attributes to

data/README.html CHANGED

@@ -1,14 +1,14 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
   <head>
-    <title>RMagick 1.8.3 README</title>
+    <title>RMagick 1.9.0 README</title>
     <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
     <meta name="GENERATOR" content="BlueCloth">
   </head>
   <body>
-<h1>RMagick 1.8.3 README</h1>
+<h1>RMagick 1.9.0 README</h1>
-<h2>06/17/05</h2>
+<h2>07/15/05</h2>
 <h2>Table Of Contents</h2>
@@ -42,7 +42,7 @@ ImageMagick and GraphicsMagick image processing libraries.</p>
 <p><strong>Author:</strong> Tim Hunter</p>
-<p><strong>Email:</strong> <a href="&#x6D;&#x61;&#x69;&#108;&#116;&#111;:&#x72;&#109;&#x61;g&#x69;&#099;&#x6B;&#064;&#114;&#117;&#x62;&#x79;&#x66;&#111;&#114;&#103;&#101;&#046;&#111;r&#103;">&#x72;&#109;&#x61;g&#x69;&#099;&#x6B;&#064;&#114;&#117;&#x62;&#x79;&#x66;&#111;&#114;&#103;&#101;&#046;&#111;r&#103;</a></p>
+<p><strong>Email:</strong> <a href="&#109;&#x61;&#x69;&#108;&#x74;&#111;:&#x72;&#x6D;a&#x67;&#x69;&#x63;&#x6B;&#064;&#x72;&#x75;by&#102;&#x6F;&#x72;&#x67;&#101;.&#111;&#x72;&#x67;">&#x72;&#x6D;a&#x67;&#x69;&#x63;&#x6B;&#064;&#x72;&#x75;by&#102;&#x6F;&#x72;&#x67;&#101;.&#111;&#x72;&#x67;</a></p>
 <p><strong>RubyForge:</strong> <a href="http://rubyforge.org/projects/rmagick/">http://rubyforge.org/projects/rmagick/</a></p>
@@ -218,7 +218,7 @@ addition to the regular options, there are a few RMagick-specific options:</p>
 <h4 id="scripts">Running the <code>configure</code> and <code>make</code> scripts</h4>
-<p>De-compress the RMagick-1.8.3.tar.gz archive and enter the top
+<p>De-compress the RMagick-1.9.0.tar.gz archive and enter the top
 directory.  Then type:</p>
 <pre><code>$ ./configure &lt;configuration options&gt;
@@ -239,9 +239,9 @@ $ make clean
 <p>When make is running the examples, if you get a message like this:</p>
-<pre><code>/home/you/RMagick-1.8.3/lib/RMagick.rb:11:in `require': libMagick.so.0:
+<pre><code>/home/you/RMagick-1.9.0/lib/RMagick.rb:11:in `require': libMagick.so.0:
   cannot open shared object file: No such file or directory -
-  /home/you/RMagick-1.8.3/ext/RMagick/RMagick.so (LoadError)
+  /home/you/RMagick-1.9.0/ext/RMagick/RMagick.so (LoadError)
 </code></pre>
 <p>you probably do not have the directory in which the ImageMagick or GraphicsMagick
@@ -261,7 +261,7 @@ systems, see the documentation for the dynamic loading facility.</p>
 <p>When make is running the examples, if you get a message like this:</p>
-<pre><code>hook /home/me/src/RMagick-1.8.3/./post-setup.rb failed:
+<pre><code>hook /home/me/src/RMagick-1.9.0/./post-setup.rb failed:
 No such file or directory - "/tmp/rmagick6872.6"
 </code></pre>

data/README.txt CHANGED

@@ -1,6 +1,6 @@
-RMagick 1.8.3 README
+RMagick 1.9.0 README
 ================================
-06/17/05
+07/15/05
 --------
 Table Of Contents
@@ -188,7 +188,7 @@ addition to the regular options, there are a few RMagick-specific options:
 <h4 id="scripts">Running the <code>configure</code> and <code>make</code> scripts</h4>
-De-compress the RMagick-1.8.3.tar.gz archive and enter the top
+De-compress the RMagick-1.9.0.tar.gz archive and enter the top
 directory.  Then type:
     $ ./configure <configuration options>
@@ -206,9 +206,9 @@ The message can also refer to "libGraphicsMagick". Typically this message means
 #### Cannot open shared object file
 When make is running the examples, if you get a message like this:
-    /home/you/RMagick-1.8.3/lib/RMagick.rb:11:in `require': libMagick.so.0:
+    /home/you/RMagick-1.9.0/lib/RMagick.rb:11:in `require': libMagick.so.0:
       cannot open shared object file: No such file or directory -
-      /home/you/RMagick-1.8.3/ext/RMagick/RMagick.so (LoadError)
+      /home/you/RMagick-1.9.0/ext/RMagick/RMagick.so (LoadError)
 you probably do not have the directory in which the ImageMagick or GraphicsMagick
 library is installed in your load path. An easy way to fix this is to define the
@@ -225,7 +225,7 @@ systems, see the documentation for the dynamic loading facility.
 #### No such file or directory - "/tmp/rmagick6872.6"
 When make is running the examples, if you get a message like this:
-    hook /home/me/src/RMagick-1.8.3/./post-setup.rb failed:
+    hook /home/me/src/RMagick-1.9.0/./post-setup.rb failed:
     No such file or directory - "/tmp/rmagick6872.6"
 you probably do not have a temporary directory environment variable set. Set

data/configure CHANGED

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for RMagick 1.8.3.
+# Generated by GNU Autoconf 2.59 for RMagick 1.9.0.
 #
 # Report bugs to <rmagick@rubyforge.org>.
 #
@@ -268,9 +268,9 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='RMagick'
-PACKAGE_TARNAME='RMagick-1.8.3.tar.gz'
-PACKAGE_VERSION='1.8.3'
-PACKAGE_STRING='RMagick 1.8.3'
+PACKAGE_TARNAME='RMagick-1.9.0.tar.gz'
+PACKAGE_VERSION='1.9.0'
+PACKAGE_STRING='RMagick 1.9.0'
 PACKAGE_BUGREPORT='rmagick@rubyforge.org'
 # Factoring default headers for most tests.
@@ -779,7 +779,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures RMagick 1.8.3 to adapt to many kinds of systems.
+\`configure' configures RMagick 1.9.0 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -836,7 +836,7 @@ fi
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of RMagick 1.8.3:";;
+     short | recursive ) echo "Configuration of RMagick 1.9.0:";;
    esac
   cat <<\_ACEOF
@@ -981,7 +981,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-RMagick configure 1.8.3
+RMagick configure 1.9.0
 generated by GNU Autoconf 2.59
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -995,7 +995,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
-It was created by RMagick $as_me 1.8.3, which was
+It was created by RMagick $as_me 1.9.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
   $ $0 $@
@@ -5690,7 +5690,8 @@ done
-for ac_func in SepiaToneImage SigmoidalContrastImageChannel
+for ac_func in SepiaToneImage SigmoidalContrastImageChannel SetImageProgressMonitor
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -8453,7 +8454,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
-This file was extended by RMagick $as_me 1.8.3, which was
+This file was extended by RMagick $as_me 1.9.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
   CONFIG_FILES    = $CONFIG_FILES
@@ -8513,7 +8514,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-RMagick config.status 1.8.3
+RMagick config.status 1.9.0
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

data/configure.ac CHANGED

@@ -1,7 +1,7 @@
 # RMagick configure.ac
-AC_INIT(RMagick, 1.8.3, rmagick@rubyforge.org, RMagick-1.8.3.tar.gz)
+AC_INIT(RMagick, 1.9.0, rmagick@rubyforge.org, RMagick-1.9.0.tar.gz)
 echo "Configuring ${PACKAGE_STRING}"
 AC_CONFIG_HEADER([ext/RMagick/rmagick_config.h])
@@ -143,7 +143,7 @@ AC_CHECK_FUNCS([EvaluateImageChannel PosterizeImage GaussianBlurImageChannel])
 AC_CHECK_FUNCS([ConvolveImageChannel SpliceImage SharpenImageChannel])
 AC_CHECK_FUNCS([SetImageChannelDepth BlurImageChannel GetMultilineTypeMetrics])
 AC_CHECK_FUNCS([NormalizeImageChannel UnsharpMaskImageChannel ShadowImage])
-AC_CHECK_FUNCS([SepiaToneImage SigmoidalContrastImageChannel])
+AC_CHECK_FUNCS([SepiaToneImage SigmoidalContrastImageChannel SetImageProgressMonitor])
 # What typedefs?

data/doc/draw.html CHANGED

@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta name="generator" content=
-  "HTML Tidy for Linux/x86 (vers 1st September 2004), see www.w3.org" />
+  "HTML Tidy for Mac OS X (vers 1st September 2004), see www.w3.org" />
   <title>RMagick: class Draw</title>
   <meta http-equiv="Content-Type" content=
@@ -2529,15 +2529,15 @@ draw.stroke_opacity('40%')
     <a href="#spec_chars_table">special character sequences</a> in
     the text string.</p>
-    <p>If the text string contains an embedded blank, quote, or
-    apostrophe, surround the entire text string using a character
-    that is not in the text. &times;Magick uses these characters to
-    delimit the string but will strip them off before drawing the
-    text. You can use quotes, apostrophes, or braces ("{}"). You
-    can also escape a blank, quote, or apostrophe by preceding it
-    with a backslash ("\"). To include a backslash in the text, use
-    two consecutive backslashes. To include a '%' in the text, use
-    '%%'. See the examples below.</p>
+    <p>Generally it is a good idea to surround the text string with
+    quotes (""), apostrophes (''), or braces ({}). If the text
+    string starts with a digit or contains an embedded blank,
+    quote, or apostrophe, you must do this. &times;Magick removes
+    these characters before drawing the text. You can also escape a
+    blank, quote, or apostrophe by preceding it with a backslash
+    ("\"). To include a backslash in the text, use two consecutive
+    backslashes. To include a '%' in the text, use '%%'. See the
+    examples below.</p>
     <h4>Arguments</h4>

data/doc/ex/InitialCoords.rb CHANGED

@@ -1,7 +1,6 @@
 require 'rvg/rvg'
-include Magick
-rvg = RVG.new(300, 100) do |canvas|
+rvg = Magick::RVG.new(300, 100) do |canvas|
     canvas.desc = "Example InitialCoords - SVG's initial coordinate system"
     canvas.background_fill = 'white'
     canvas.g.styles(:fill=>'none', :stroke=>'black', :stroke_width=>3) do |grp|

data/doc/ex/NewCoordSys.rb CHANGED

@@ -1,7 +1,6 @@
 require 'rvg/rvg'
-include Magick
-rvg = RVG.new(400, 150) do |canvas|
+rvg = Magick::RVG.new(400, 150) do |canvas|
     canvas.background_fill = 'white'
     canvas.desc = 'Example NewCoordSys - New user coordinate system'
     canvas.g.styles(:fill=>'none', :stroke=>'black', :stroke_width=>3) do |grp|

data/doc/ex/OrigCoordSys.rb CHANGED

@@ -1,7 +1,6 @@
 require 'rvg/rvg'
-include Magick
-rvg = RVG.new(400, 150) do |canvas|
+rvg = Magick::RVG.new(400, 150) do |canvas|
     canvas.desc = "Example OrigCoordSys - Simple transformations: original picture"
     canvas.background_fill = 'white'

data/doc/ex/PreserveAspectRatio.rb CHANGED

@@ -1,14 +1,13 @@
 require 'rvg/rvg'
-include Magick
-rvg = RVG.new(450, 300) do |canvas|
+rvg = Magick::RVG.new(450, 300) do |canvas|
     canvas.desc = 'Example Preserve Aspect Ratio'
     canvas.background_fill = 'white'
     canvas.rect(448, 298, 1, 1).styles(:fill=>'none', :stroke=>'blue')
     # Define the smiley-face
-    smile = RVG::Group.new do |grp|
+    smile = Magick::RVG::Group.new do |grp|
         grp.translate(0, 5)
         grp.circle(10, 15, 15).styles(:fill=>'yellow', :stroke=>'none')
         grp.circle(1.5, 12, 12).styles(:fill=>'black', :stroke=>'none')
@@ -16,11 +15,11 @@ rvg = RVG.new(450, 300) do |canvas|
         grp.path("M10 19 A 8 8 0 0 0 20 19").styles(:stroke=>'black', :stroke_width=>2)
     end
-    viewport1 = RVG::Group.new do |grp|
+    viewport1 = Magick::RVG::Group.new do |grp|
         grp.rect(49, 29, 0.5, 0.5).styles(:fill => 'none', :stroke => 'blue')
     end
-    viewport2 = RVG::Group.new do |grp|
+    viewport2 = Magick::RVG::Group.new do |grp|
         grp.rect(29, 39, 0.5, 0.5).styles(:fill=>'black', :stroke=>'red')
     end

data/doc/ex/RotateScale.rb CHANGED

@@ -1,7 +1,6 @@
 require 'rvg/rvg'
-include Magick
-rvg = RVG.new(400, 120) do |canvas|
+rvg = Magick::RVG.new(400, 120) do |canvas|
     canvas.desc = 'Example RotateScale - Rotate and scale transforms'
     canvas.background_fill = 'white'
     canvas.g.styles(:fill=>'none', :stroke=>'black', :stroke_width=>3) do |grp|

data/doc/ex/Skew.rb CHANGED

@@ -1,7 +1,6 @@
 require 'rvg/rvg'
-include Magick
-rvg = RVG.new(400, 120) do |canvas|
+rvg = Magick::RVG.new(400, 120) do |canvas|
     canvas.desc = 'Example Skew - Show effects of skewX and skewY'
     canvas.background_fill = 'white'

data/doc/ex/Use01.rb CHANGED

@@ -1,12 +1,11 @@
 require 'rvg/rvg'
-include Magick
-RVG.dpi = 90
+Magick::RVG.dpi = 90
-rvg = RVG.new(10.cm, 3.cm).viewbox(0, 0, 100, 30) do |canvas|
+rvg = Magick::RVG.new(10.cm, 3.cm).viewbox(0, 0, 100, 30) do |canvas|
     canvas.background_fill = 'white'
     canvas.desc = "Example Use01 - Simple case of 'use' on a 'rect'"
-    r = RVG::Group.new do |grp|
+    r = Magick::RVG::Group.new do |grp|
             grp.rect(60, 10)
         end
     canvas.rect(99.6, 29.6, 0.1, 0.1).styles(:fill=>'none', :stroke=>'blue', :stroke_width=>0.2)

data/doc/ex/Use02.rb CHANGED

@@ -1,12 +1,11 @@
 require 'rvg/rvg'
-include Magick
-RVG.dpi = 90
+Magick::RVG.dpi = 90
-rvg = RVG.new(10.cm, 3.5.cm).viewbox(0, 0, 100, 35) do |canvas|
+rvg = Magick::RVG.new(10.cm, 3.5.cm).viewbox(0, 0, 100, 35) do |canvas|
     canvas.background_fill = 'white'
     canvas.desc = "Example Use02 - Chain 'styles' to 'use'"
-    r = RVG::Group.new do |grp|
+    r = Magick::RVG::Group.new do |grp|
             grp.rect(60, 10).styles(:fill=>'yellow')
         end
     canvas.rect(99.6, 34.6, 0.1, 0.1).styles(:fill=>'none', :stroke=>'blue', :stroke_width=>0.2)

data/doc/ex/Use03.rb CHANGED

@@ -1,13 +1,12 @@
 require 'rvg/rvg'
-include Magick
-RVG.dpi = 90
+Magick::RVG.dpi = 90
-rvg = RVG.new(10.cm, 3.cm).viewbox(0, 0, 100, 30) do |canvas|
+rvg = Magick::RVG.new(10.cm, 3.cm).viewbox(0, 0, 100, 30) do |canvas|
     canvas.background_fill = 'white'
     canvas.desc = "Example Use03 - 'use' with a 'transform' attribute"
-    myrect = RVG::Group.new do |grp|
+    myrect = Magick::RVG::Group.new do |grp|
                  grp.rect(60, 10)
              end
     canvas.rect(99.6, 29.6, 0.1, 0.1).styles(:fill=>'none', :stroke=>'blue', :stroke_width=>0.2)

data/doc/ex/ViewBox.rb CHANGED

@@ -1,8 +1,7 @@
 require 'rvg/rvg'
-include Magick
 def example(cols, rows)
-    rvg = RVG.new(cols, rows) do |canvas|
+    rvg = Magick::RVG.new(cols, rows) do |canvas|
         canvas.background_fill = 'white'
         canvas.desc = <<-'END_DESC'
             Example ViewBox - uses the viewBox attribute to automatically create an

data/doc/ex/arcs01.rb CHANGED

@@ -1,9 +1,8 @@
 require 'rvg/rvg'
-include Magick
-RVG.dpi = 90
+Magick::RVG.dpi = 90
-rvg = RVG.new(12.cm, 5.25.cm).viewbox(0, 0, 1200, 400) do |canvas|
+rvg = Magick::RVG.new(12.cm, 5.25.cm).viewbox(0, 0, 1200, 400) do |canvas|
     canvas.title = "Example arcs01 - arc commands in path data"
     canvas.desc = <<-END_DESC
         Picture of a pie chart with two pie wedges and a picture

data/doc/ex/arcs02.rb CHANGED

@@ -1,12 +1,11 @@
 require 'rvg/rvg'
-include Magick
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 PathStyles = {:fill=>'none', :stroke=>'red', :stroke_width=>6}
 BaseEllipsesStyles = {:font_size=>20, :font_family=>'Verdana',:fill=>'none', :stroke=>'#888', :stroke_width=>2}
-rvg = RVG.new(12.cm, (5.25).cm).viewbox(0, 0, 1200, 525) do |canvas|
+rvg = Magick::RVG.new(12.cm, (5.25).cm).viewbox(0, 0, 1200, 525) do |canvas|
     canvas.title = "Example arcs02 - arc options in paths"
     canvas.desc = <<-END_DESC
         Pictures showing the result of setting
@@ -15,7 +14,7 @@ rvg = RVG.new(12.cm, (5.25).cm).viewbox(0, 0, 1200, 525) do |canvas|
     END_DESC
     canvas.background_fill = 'white'
-    base_ellipses = RVG::Group.new.styles(BaseEllipsesStyles) do |base|
+    base_ellipses = Magick::RVG::Group.new.styles(BaseEllipsesStyles) do |base|
         base.ellipse(100, 50, 125, 125)
         base.ellipse(100, 50, 225, 75)
         base.text(35, 70, "Arc start")

data/doc/ex/baseline_shift01.rb CHANGED

@@ -1,7 +1,6 @@
 require 'rvg/rvg'
-include Magick
-rvg = RVG.new(150, 100) do |canvas|
+rvg = Magick::RVG.new(150, 100) do |canvas|
     canvas.background_fill = 'white'
     canvas.text(40, 35).styles(:font_weight=>'bold', :font_size=>28) do |txt|
         txt.tspan('H')

data/doc/ex/circle01.rb CHANGED

@@ -1,9 +1,8 @@
 require 'rvg/rvg'
-include Magick
-RVG.dpi = 90
+Magick::RVG.dpi = 90
-rvg = RVG.new(12.cm, 4.cm) do |canvas|
+rvg = Magick::RVG.new(12.cm, 4.cm) do |canvas|
     canvas.viewbox(0, 0, 1200, 400)
     canvas.background_fill = 'white'
     canvas.desc = "Example circle01 - circle filled with red and stroked with blue"

data/doc/ex/cubic01.rb CHANGED

@@ -1,7 +1,6 @@
 require 'rvg/rvg'
-include Magick
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 Border       = {:fill=>'none', :stroke=>'blue', :stroke_width=>1}
 Connect      = {:fill=>'none', :stroke=>'#888', :stroke_width=>2}
@@ -11,7 +10,7 @@ CtlPoint     = {:fill=>'#888', :stroke=>'none'}
 AutoCtlPoint = {:fill=>'none', :stroke=>'blue', :stroke_width=>4}
 Label        = {:font_size=>22, :font_family=>'Verdana'}
-rvg = RVG.new(5.cm, 4.cm).viewbox(0, 0, 500, 400) do |canvas|
+rvg = Magick::RVG.new(5.cm, 4.cm).viewbox(0, 0, 500, 400) do |canvas|
     canvas.title = "Example cubic01 - cubic Bezier commands in path data"
     canvas.desc = <<-END_DESC
         Picture showing a simple example of path data using both a