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

rmagick 1.8.2 → 1.8.3

Potentially problematic release.

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

Files changed (16) hide show

data/ChangeLog +5 -0
data/README.html +8 -8
data/README.txt +6 -6
data/configure +75 -10
data/configure.ac +16 -1
data/doc/constants.html +10 -1
data/doc/imusage.html +39 -8
data/doc/index.html +2 -2
data/doc/info.html +148 -9
data/ext/RMagick/MANIFEST +1 -1
data/ext/RMagick/rmagick.h +38 -1
data/ext/RMagick/rmagick_config.h.in +2 -0
data/ext/RMagick/rminfo.c +409 -3
data/ext/RMagick/rmmain.c +15 -2
data/rmagick.gemspec +1 -1
metadata +2 -2

data/ChangeLog CHANGED

@@ -1,3 +1,8 @@
+RMagick 1.8.3
+    o Tested with ImageMagick 6.2.3-2
+    o Added comment, delay, dispose, fill, gravity, and label attributes to
+      Image::Info
 RMagick 1.8.2
     o Fix bug #1983, potential buffer overflow in version_constants
     o Added feature #2015, support the pointsize, authenticate,

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.2 README</title>
+    <title>RMagick 1.8.3 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.2 README</h1>
+<h1>RMagick 1.8.3 README</h1>
-<h2>06/10/05</h2>
+<h2>06/17/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="&#109;a&#105;&#x6C;&#x74;&#x6F;:r&#109;a&#x67;&#105;&#099;&#x6B;&#064;&#x72;&#117;&#098;&#x79;&#x66;&#111;&#114;&#103;&#101;&#046;&#x6F;&#x72;&#x67;">r&#109;a&#x67;&#105;&#099;&#x6B;&#064;&#x72;&#117;&#098;&#x79;&#x66;&#111;&#114;&#103;&#101;&#046;&#x6F;&#x72;&#x67;</a></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>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.2.tar.gz archive and enter the top
+<p>De-compress the RMagick-1.8.3.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.2/lib/RMagick.rb:11:in `require': libMagick.so.0:
+<pre><code>/home/you/RMagick-1.8.3/lib/RMagick.rb:11:in `require': libMagick.so.0:
   cannot open shared object file: No such file or directory -
-  /home/you/RMagick-1.8.2/ext/RMagick/RMagick.so (LoadError)
+  /home/you/RMagick-1.8.3/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.2/./post-setup.rb failed:
+<pre><code>hook /home/me/src/RMagick-1.8.3/./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.2 README
+RMagick 1.8.3 README
 ================================
-06/10/05
+06/17/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.2.tar.gz archive and enter the top
+De-compress the RMagick-1.8.3.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.2/lib/RMagick.rb:11:in `require': libMagick.so.0:
+    /home/you/RMagick-1.8.3/lib/RMagick.rb:11:in `require': libMagick.so.0:
       cannot open shared object file: No such file or directory -
-      /home/you/RMagick-1.8.2/ext/RMagick/RMagick.so (LoadError)
+      /home/you/RMagick-1.8.3/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.2/./post-setup.rb failed:
+    hook /home/me/src/RMagick-1.8.3/./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.2.
+# Generated by GNU Autoconf 2.59 for RMagick 1.8.3.
 #
 # 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.2.tar.gz'
-PACKAGE_VERSION='1.8.2'
-PACKAGE_STRING='RMagick 1.8.2'
+PACKAGE_TARNAME='RMagick-1.8.3.tar.gz'
+PACKAGE_VERSION='1.8.3'
+PACKAGE_STRING='RMagick 1.8.3'
 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.2 to adapt to many kinds of systems.
+\`configure' configures RMagick 1.8.3 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.2:";;
+     short | recursive ) echo "Configuration of RMagick 1.8.3:";;
    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.2
+RMagick configure 1.8.3
 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.2, which was
+It was created by RMagick $as_me 1.8.3, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
   $ $0 $@
@@ -7566,6 +7566,71 @@ _ACEOF
 fi
+echo "$as_me:$LINENO: checking for UndefinedGravity enum value" >&5
+echo $ECHO_N "checking for UndefinedGravity enum value... $ECHO_C" >&6
+if test "${rm_cv_enum_undefinedgravity+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include "magick/api.h"
+int
+main ()
+{
+GravityType x; x = UndefinedGravity
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  rm_cv_enum_undefinedgravity='yes'
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+rm_cv_enum_undefinedgravity='no'
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $rm_cv_enum_undefinedgravity" >&5
+echo "${ECHO_T}$rm_cv_enum_undefinedgravity" >&6
+if test "$rm_cv_enum_undefinedgravity" = yes; then
+  cat >>confdefs.h <<\_ACEOF
+#define HAVE_UNDEFINEDGRAVITY 1
+_ACEOF
+fi
 if test "$rm_have_getimagequantumdepth" = yes; then
    # IM 6.0.5 changed the number of arguments to GetImageQuantumDepth.
    echo "$as_me:$LINENO: checking if GetImageQuantumDepth has only 1 argument" >&5
@@ -8388,7 +8453,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
-This file was extended by RMagick $as_me 1.8.2, which was
+This file was extended by RMagick $as_me 1.8.3, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
   CONFIG_FILES    = $CONFIG_FILES
@@ -8448,7 +8513,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-RMagick config.status 1.8.2
+RMagick config.status 1.8.3
 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.2, rmagick@rubyforge.org, RMagick-1.8.2.tar.gz)
+AC_INIT(RMagick, 1.8.3, rmagick@rubyforge.org, RMagick-1.8.3.tar.gz)
 echo "Configuring ${PACKAGE_STRING}"
 AC_CONFIG_HEADER([ext/RMagick/rmagick_config.h])
@@ -392,6 +392,21 @@ if test "$rm_cv_enum_jpeg2000compression" = yes; then
   AC_DEFINE(HAVE_JPEG2000COMPRESSION)
 fi
+AC_CACHE_CHECK(for UndefinedGravity enum value, rm_cv_enum_undefinedgravity,
+  [AC_TRY_COMPILE(
+[#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include "magick/api.h"],
+     [GravityType x; x = UndefinedGravity],
+     rm_cv_enum_undefinedgravity='yes',
+     rm_cv_enum_undefinedgravity='no')])
+if test "$rm_cv_enum_undefinedgravity" = yes; then
+  AC_DEFINE(HAVE_UNDEFINEDGRAVITY)
+fi
 if test "$rm_have_getimagequantumdepth" = yes; then
    # IM 6.0.5 changed the number of arguments to GetImageQuantumDepth.
    AC_CACHE_CHECK(if GetImageQuantumDepth has only 1 argument, rm_cv_args_get_image_quantum_depth,

data/doc/constants.html CHANGED

@@ -148,7 +148,7 @@
     <dd>An extended form of the <code>Version</code> constant with
     the format shown here:<br />
-    <code>This is RMagick 1.4.0 ($Date: 2005/04/30 14:29:49 $)
+    <code>This is RMagick 1.4.0 ($Date: 2005/06/12 22:13:21 $)
     Copyright (C) 2005 by Timothy P. Hunter<br />
     Built with ImageMagick 6.0.0 02/25/04 Q8
     http://www.imagemagick.org<br />
@@ -765,11 +765,20 @@
   <dl>
     <dt>UndefinedDispose</dt>
+    <dd>No disposal specified.</dd>
     <dt>NoneDispose</dt>
+    <dd>Do not dispose between frames.</dd>
     <dt>BackgroundDispose</dt>
+    <dd>Overwrite the image area with the background color.</dd>
     <dt>PreviousDispose</dt>
+    <dd>Overwrite the image area with what was there prior to
+    rendering the image.</dd>
   </dl>
   <h3 class="const" id="EndianType">EndianType</h3>

data/doc/imusage.html CHANGED

@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta name="generator" content=
-  "HTML Tidy for Mac OS X (vers 1st September 2004), see www.w3.org" />
+  "HTML Tidy for Linux/x86 (vers 1st March 2005), see www.w3.org" />
   <title>RMagick: ImageMagick/GraphicsMagick Conventions</title>
   <meta http-equiv="Content-Type" content=
@@ -99,7 +99,7 @@
   <h2 id="formats">Image formats and filenames</h2>
   <p>&times;Magick supports over 90 major <a href=
-  "http://www.imagemagick.org/www/formats.html">image
+  "http://www.imagemagick.org/script/formats.php">image
   formats</a>.</p>
   <p>&times;Magick determines the format (GIF, PNG, JPEG, etc.) of
@@ -223,8 +223,9 @@
   <p><em>Hint:</em> You can specify the transparent color as
   "none", "transparent", or "#000000ff".</p>
-  <p><a href="http://www.imagemagick.org/www/color.html">This</a>
-  is ImageMagick's page about color names.</p>
+  <p><a href=
+  "http://www.imagemagick.org/script/command-line-options.php#fill">
+  This</a> is ImageMagick's page about color names.</p>
   <h2 id="geometry">The geometry string</h2>
@@ -240,8 +241,9 @@
 </pre>
   <p><a href=
-  "http://www.imagemagick.org/www/utilities.html">This</a> is the
-  ImageMagick description of the geometry string:</p>
+  "http://www.imagemagick.org/script/command-line-options.php#geometry">
+  This</a> is the ImageMagick description of the geometry
+  string:</p>
   <div class="imquote">
     <p>By default, the width and height are maximum values. That
@@ -334,6 +336,35 @@ i = Image.read("gradient:red-blue") { self.size = "100x200" }
   more examples of reading built-in formats.</p>
   <div id="bi_format_list">
+    <h4>caption<sup>*</sup></h4>
+    <p>The caption format is used to create an image from a text
+    string. Ex: "caption:My caption text".</p>
+    <p>If you specify only the width in the <code>size</code>
+    argument, &times;Magick will wrap the text and compute the
+    necessary height. In addition to <code>size</code> (which is
+    required) you can use the following <a href=
+    "info.html">optional arguments</a>:</p>
+    <ul>
+      <li>antialias</li>
+      <li>background_color</li>
+      <li>border_color</li>
+      <li>density</li>
+      <li>fill</li>
+      <li>font</li>
+      <li>gravity</li>
+      <li>pointsize</li>
+    </ul>
     <h4>gradient<sup>*</sup></h4>
     <p>Gradient filenames have the form
@@ -369,7 +400,7 @@ i = Image.read("gradient:red-blue") { self.size = "100x200" }
     may be referenced by specifying the pattern name. For example,
     <code>pattern:checkerboard</code>. For a list of acceptable
     patterns, see <a href=
-    "http://www.imagemagick.org/www/formats.html">this
+    "http://www.imagemagick.org/script/formats.php">this
     page.</a></p>
     <h4>plasma<sup>*</sup></h4>
@@ -392,7 +423,7 @@ i = Image.read("gradient:red-blue") { self.size = "100x200" }
     an image.</p>
   </div>
-  <p class="spacer"> </p>
+  <p class="spacer">&nbsp;</p>
   <div class="nav">
     &laquo; <a href="usage.html">Prev</a> | <a href=

data/doc/index.html CHANGED

@@ -399,7 +399,7 @@
   <code>Magick::Long_version</code> constant:</p>
   <pre class="example" id="version">
 irb(main):001:0&gt; puts Magick::Long_version
-This is RMagick 1.7.0 ($Date: 2005/04/30 14:43:19 $) Copyright (C) 2004 by Timothy P. Hunter
+This is RMagick 1.7.0 ($Date: 2005/06/12 22:13:21 $) Copyright (C) 2004 by Timothy P. Hunter
 Built with GraphicsMagick 1.1.4 2004-11-13 Q8 http://www.GraphicsMagick.org/
 Built for ruby 1.8.1 (2003-12-25) [i686-linux]
 Web page: http://rmagick.rubyforge.org
@@ -415,7 +415,7 @@ Email: rmagick@rubyforge.org
   your questions to <code>comp.lang.ruby</code>. For help with
   ImageMagick or GraphicsMagick, join the ImageMagick or
   GraphicsMagick mailing list. See the instructions at <a href=
-  "http://www.imagemagick.org/www/magick-list.html">http://www.imagemagick.org/www/magick-list.html</a>
+  "http://www.imagemagick.org/script/mailing-list.php">http://www.imagemagick.org/script/mailing-list.php</a>
   or <a href=
   "http://sourceforge.net/projects/graphicsmagick/">http://sourceforge.net/projects/graphicsmagick/</a>.</p>

data/doc/info.html CHANGED

@@ -83,46 +83,58 @@
         <li><a href="#colorspace">colorspace</a></li>
+        <li><a href="#comment">comment</a></li>
         <li><a href="#compression">compression</a></li>
+        <li><a href="#delay">delay</a></li>
         <li><a href="#density">density</a></li>
         <li><a href="#depth">depth</a></li>
+        <li><a href="#dispose">dispose</a></li>
         <li><a href="#dither">dither</a></li>
         <li><a href="#extract">extract</a></li>
-        <li><a href="#filename">filename</a></li>
       </ul>
     </div>
     <div class="toccol">
       <ul>
+        <li><a href="#filename">filename</a></li>
+        <li><a href="#fill">fill</a></li>
         <li><a href="#font">font</a></li>
         <li><a href="#format">format</a></li>
         <li><a href="#fuzz">fuzz</a></li>
+        <li><a href="#gravity">gravity</a></li>
         <li><a href="#image_type">image_type</a></li>
         <li><a href="#interlace">interlace</a></li>
+        <li><a href="#label">label</a></li>
         <li><a href="#matte_color">matte_color</a></li>
         <li><a href="#monochrome">monochrome</a></li>
         <li><a href="#number_scenes">number_scenes</a></li>
-        <li><a href="#page">page</a></li>
-        <li><a href="#pointsize">pointsize</a></li>
       </ul>
     </div>
     <div class="toccol">
       <ul>
+        <li><a href="#page">page</a></li>
+        <li><a href="#pointsize">pointsize</a></li>
         <li><a href="#quality">quality</a></li>
         <li><a href="#sampling_factor">sampling_factor</a></li>
@@ -401,7 +413,7 @@ self.undefine("tiff", "bits-per-sample")
     <h3 id="background_color">background_color</h3>
     <p><span class="arg">self.</span>background_color= <span class=
-    "arg">aPixel</span> or <em>aPixel</em></p>
+    "arg">aString</span> or <span class="arg">aPixel</span></p>
   </div>
   <div class="desc">
@@ -449,6 +461,28 @@ self.undefine("tiff", "bits-per-sample")
     "constants.html#ColorspaceType">ColorspaceType</a> constant.
   </div>
+  <div class="sig">
+    <h3 id="comment">comment</h3>
+    <p><span class="arg">self.</span>comment= <span class=
+    "arg">aString</span></p>
+  </div>
+  <div class="desc">
+    <h4>Description</h4>
+    <p class="imquote">Use this option to assign a specific comment
+    to the image, when writing to an image format that supports
+    comments.</p>
+    <h4>Arguments</h4>
+    <p class="imquote">You can include the image filename, type,
+    width, height, or other image attribute by embedding special
+    format characters listed under the <a href=
+    "draw.html#annotate">annotate</a> method.</p>
+  </div>
   <div class="sig">
     <h3 id="compression">compression</h3>
@@ -655,6 +689,23 @@ self.undefine("tiff", "bits-per-sample")
     and <code>height</code> is the vertical resolution.</p>
   </div>
+  <div class="sig">
+    <h3 id="delay">delay</h3>
+    <p><span class="arg">self.</span>delay= <span class=
+    "arg">anInteger</span></p>
+  </div>
+  <div class="desc">
+    <h4>Description</h4>
+    <p class="imquote">This attribute is useful for regulating the
+    animation of image sequences. <em>delay</em>/100 seconds must
+    expire before the display of the next image. The default is no
+    delay between each showing of the image sequence. The maximum
+    delay is 65535.</p>
+  </div>
   <div class="sig">
     <h3 id="depth">depth</h3>
@@ -678,6 +729,25 @@ self.undefine("tiff", "bits-per-sample")
     "#size"><code>size</code></a>.</p>
   </div>
+  <div class="sig">
+    <h3 id="dispose">dispose</h3>
+    <p><span class="arg">self.</span>dispose= <span class=
+    "arg">aDisposeType</span></p>
+  </div>
+  <div class="desc">
+    <h4>Description</h4>
+    <p class="imquote">The argument indicates the way in which the
+    graphic is to be treated after being displayed.</p>
+    <h4>Argument</h4>
+    <p>A <a href="constants.html#DisposeType">DisposeType</a>
+    constant.</p>
+  </div>
   <div class="sig">
     <h3 id="dither">dither</h3>
@@ -739,6 +809,26 @@ self.undefine("tiff", "bits-per-sample")
     <p>See <a href="image1.html#capture">capture</a>.</p>
   </div>
+  <div class="sig">
+    <h3 id="fill">fill</h3>
+    <p><span class="arg">self.</span>fill= <span class=
+    "arg">aString</span> or <span class="arg">aPixel</span></p>
+  </div>
+  <div class="desc">
+    <h4>Description</h4>
+    <p>In the <code>Image::Info</code> class, the <code>fill</code>
+    attribute specifies the fill color to use when creating an
+    image with the "caption:" format..</p>
+    <h4>Arguments</h4>
+    <p>A <a href="imusage.html#color_names">color name</a> or a
+    <a href="struct.html#Pixel">aPixel</a>.</p>
+  </div>
   <div class="sig">
     <h3 id="font">font</h3>
@@ -797,6 +887,34 @@ self.undefine("tiff", "bits-per-sample")
     0.05*MaxRGB.</p>
   </div>
+  <div class="sig">
+    <h3 id="gravity">gravity</h3>
+    <p><span class="arg">self.</span>gravity= <span class=
+    "arg">aGravityType</span></p>
+  </div>
+  <div class="desc">
+    <h4>Description</h4>
+    <p class="imquote">The direction text gravitates to when
+    annotating the image.</p>
+    <p class="imquote">The direction you choose specifies where to
+    position the text when annotating the image. For example, a
+    gravity of <code>CenterGravity</code> forces the text to be
+    centered within the image. By default, the image gravity is
+    <code>NorthWestGravity</code>.</p>
+    <p>This attribute can be used to position the text when
+    creating an image with the "caption:" format.</p>
+    <h4>Arguments</h4>
+    <p>A <a href="constants.html#GravityType">GravityType</a>
+    constant.</p>
+  </div>
   <div class="sig">
     <h3 id="image_type">image_type</h3>
@@ -837,8 +955,29 @@ self.undefine("tiff", "bits-per-sample")
     interlaced GIF or progressive JPEG image.</span> The default is
     NoInterlace.</p>
-    <h4>Arguments</h4>An <a href=
-    "constants.html#InterlaceType">InterlaceType</a> constant.
+    <h4>Arguments</h4>
+    <p>An <a href="constants.html#InterlaceType">InterlaceType</a>
+    constant.</p>
+  </div>
+  <div class="sig">
+    <h3 id="label">label</h3>
+    <p><span class="arg">self.</span>label= <span class=
+    "arg">aString</span></p>
+  </div>
+  <div class="desc">
+    <h4>Description</h4>
+    <p><span class="imquote">Use this option to assign a specific
+    label to the image, when writing to an image format that
+    supports labels, such as TIFF, PNG, MIFF, or PostScript. You
+    can include the the image filename, type, width, height, or
+    other image attribute by embedding special format
+    characters.</span> See <a href=
+    "draw.html#annotate">annotate</a> for details.</p>
   </div>
   <div class="sig">

data/ext/RMagick/MANIFEST CHANGED

@@ -1,4 +1,4 @@
-MANIFEST for RMagick-1.8.2 - 18:44:23 06/10/05
+MANIFEST for RMagick-1.8.3 - 17:30:19 06/17/05
 configure
 README.html

data/ext/RMagick/rmagick.h CHANGED

@@ -1,4 +1,4 @@
-/* $Id: rmagick.h,v 1.85 2005/06/10 22:41:19 rmagick Exp $ */
+/* $Id: rmagick.h,v 1.88 2005/06/14 22:41:02 rmagick Exp $ */
 /*=============================================================================
 |               Copyright (C) 2005 by Timothy P. Hunter
 | Name:     rmagick.h
@@ -19,6 +19,14 @@
 #include "ruby.h"
 #include "intern.h"
 #include "rubyio.h"
+// Undef Ruby's versions of these symbols
+#undef PACKAGE_VERSION
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_TARNAME
 #include "magick/api.h"
@@ -192,6 +200,10 @@ typedef size_t magick_uint64_t;
 typedef unsigned int MagickBooleanType;
 #endif
+#if !defined(HAVE_UNDEFINEDGRAVITY)
+#define UndefinedGravity 0
+#endif
 // This implements the "omitted storage class model" for external variables.
 // (Ref: Harbison & Steele.) The rmmain.c file defines MAIN, which causes
 // the single defining declarations to be generated. No other source files
@@ -403,6 +415,25 @@ EXTERN ID ID_y;                 // "y"
     ATTR_READER(class, attr)\
     ATTR_WRITER(class, attr)
+/*
+ *  Define functions to get/set attributes in Image::Info that
+ *  use the Get/SetImageOption API.
+*/
+#define OPTION_ATTR_READER(opt, key) \
+    VALUE Info_##opt(VALUE self)\
+    {\
+        return get_option(self, #key);\
+    }
+#define OPTION_ATTR_WRITER(opt, key) \
+    VALUE Info_##opt##_eq(VALUE self, VALUE string)\
+    {\
+        return set_option(self, #key, string);\
+    }
+#define OPTION_ATTR_ACCESSOR(opt, key)\
+    OPTION_ATTR_READER(opt, key)\
+    OPTION_ATTR_WRITER(opt, key)
 /*
  *  Declare Pixel channel attribute writers
 */
@@ -555,18 +586,24 @@ ATTR_ACCESSOR(Info, authenticate)
 ATTR_ACCESSOR(Info, background_color)
 ATTR_ACCESSOR(Info, border_color)
 ATTR_ACCESSOR(Info, colorspace)
+ATTR_ACCESSOR(Info, comment)
 ATTR_ACCESSOR(Info, compression)
+ATTR_ACCESSOR(Info, delay)
 ATTR_ACCESSOR(Info, density)
 ATTR_ACCESSOR(Info, depth)
+ATTR_ACCESSOR(Info, dispose)
 ATTR_ACCESSOR(Info, dither)
 ATTR_ACCESSOR(Info, extract)
 ATTR_ACCESSOR(Info, filename)
+ATTR_ACCESSOR(Info, fill)
 ATTR_ACCESSOR(Info, font)
 ATTR_ACCESSOR(Info, format)
 ATTR_ACCESSOR(Info, fuzz)
+ATTR_ACCESSOR(Info, gravity)
 ATTR_ACCESSOR(Info, group)
 ATTR_ACCESSOR(Info, image_type)
 ATTR_ACCESSOR(Info, interlace)
+ATTR_ACCESSOR(Info, label)
 ATTR_ACCESSOR(Info, matte_color)
 ATTR_ACCESSOR(Info, monochrome)
 ATTR_ACCESSOR(Info, number_scenes)

data/ext/RMagick/rmagick_config.h.in CHANGED

@@ -169,6 +169,8 @@
 #undef HAVE_THRESHOLDIMAGECHANNEL
 #undef HAVE_THUMBNAILIMAGE
 #undef HAVE_TINTIMAGE
+/* Introduced in IM 6.0.0 */
+#undef HAVE_UNDEFINEDGRAVITY
 #undef HAVE_UNISTD_H
 /* Introduced in IM 6.1.0 */
 #undef HAVE_UNSHARPMASKIMAGECHANNEL

data/ext/RMagick/rminfo.c CHANGED

@@ -1,4 +1,4 @@
-/* $Id: rminfo.c,v 1.30 2005/06/10 22:41:19 rmagick Exp $ */
+/* $Id: rminfo.c,v 1.32 2005/06/12 21:07:56 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2005 by Timothy P. Hunter
 | Name:     rminfo.c
@@ -8,6 +8,10 @@
 #include "rmagick.h"
+static VALUE get_option(VALUE, char *);
+static VALUE set_option(VALUE, char *, VALUE);
 DEF_ATTR_ACCESSOR(Info, antialias, bool)
 /*
@@ -283,6 +287,8 @@ Info_colorspace_eq(VALUE self, VALUE colorspace)
     return self;
 }
+OPTION_ATTR_ACCESSOR(comment, Comment)
 /*
     Method:  Info#compression
     Purpose: Get the compression type
@@ -417,6 +423,91 @@ Info_define(int argc, VALUE *argv, VALUE self)
 #endif
 }
+/*
+    Method:     Info#delay
+    Purpose:    Get the delay attribute
+    Notes:      Convert from string to numeric
+*/
+VALUE
+Info_delay(VALUE self)
+{
+#if defined(HAVE_SETIMAGEOPTION)
+    Info *info;
+    const char *delay;
+    char *p;
+    long d;
+    Data_Get_Struct(self, Info, info);
+    delay = GetImageOption(info, "delay");
+    if (delay)
+    {
+        d = strtol(delay, &p, 10);
+        if (*p != '\0')
+        {
+            rb_raise(rb_eRangeError, "failed to convert %s to Numeric", delay);
+        }
+        return LONG2NUM(d);
+    }
+    return Qnil;
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
+/*
+ * Will raise an exception if `arg' can't be converted to an int.
+*/
+#if defined(HAVE_SETIMAGEOPTION)
+static VALUE
+arg_is_integer(VALUE arg)
+{
+    double d;
+    d = NUM2INT(arg);
+    d = d;      // satisfy icc
+    return arg;
+}
+#endif
+/*
+    Method:     Info#delay=
+    Purpose:    Set the delay attribute
+    Notes:      Convert from numeric value to string.
+*/
+VALUE
+Info_delay_eq(VALUE self, VALUE string)
+{
+#if defined(HAVE_SETIMAGEOPTION)
+    Info *info;
+    int delay;
+    int not_num;
+    char dstr[20];
+    Data_Get_Struct(self, Info, info);
+    if (NIL_P(string))
+    {
+        (void) RemoveImageOption(info, "delay");
+    }
+    else
+    {
+        not_num = 0;
+        rb_protect(arg_is_integer, string, &not_num);
+        if (not_num)
+        {
+            rb_raise(rb_eTypeError, "failed to convert %s into Integer", rb_class2name(CLASS_OF(string)));
+        }
+        delay = NUM2INT(string);
+        sprintf(dstr, "%d", delay);
+        (void) SetImageOption(info, "delay", dstr);
+    }
+    return self;
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
 DEF_ATTR_READER(Info, density, str)
@@ -487,6 +578,107 @@ Info_depth_eq(VALUE self, VALUE depth)
     return self;
 }
+/*
+    Method:     Info#dispose
+    Purpose:    Retrieve a dispose option string and convert it to
+                a DisposeType enumerator
+*/
+#if defined(HAVE_SETIMAGEOPTION)
+static struct
+{
+    char *string;
+    char *enum_name;
+    DisposeType enumerator;
+} Dispose_Option[] = {
+    { "Background", "BackgroundDispose", BackgroundDispose },
+    { "None",       "NoneDispose",       NoneDispose },
+    { "Previous",   "PreviousDispose",   PreviousDispose },
+    { "Undefined",  "UndefinedDispose",  UndefinedDispose },
+    { "0",          "UndefinedDispose",  UndefinedDispose },
+    { "1",          "NoneDispose",       NoneDispose },
+    { "2",          "BackgroundDispose", BackgroundDispose },
+    { "3",          "PreviousDispose",   PreviousDispose },
+    };
+#define N_DISPOSE_OPTIONS (sizeof(Dispose_Option)/sizeof(Dispose_Option[0]))
+#endif
+VALUE
+Info_dispose(VALUE self)
+{
+#if defined(HAVE_SETIMAGEOPTION)
+    Info *info;
+    int x;
+    ID dispose_id;
+    const char *dispose;
+    Data_Get_Struct(self, Info, info);
+    dispose_id = rb_intern("UndefinedDispose");
+    // Map the dispose option string to a DisposeType enumerator.
+    dispose=GetImageOption(info, "dispose");
+    if (dispose)
+    {
+        for (x = 0; x < N_DISPOSE_OPTIONS; x++)
+        {
+            if (strcmp(dispose, Dispose_Option[x].string) == 0)
+            {
+                dispose_id = rb_intern(Dispose_Option[x].enum_name);
+                break;
+            }
+        }
+    }
+    return rb_const_get(Module_Magick, dispose_id);
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
+/*
+    Method:     Info#dispose=
+    Purpose:    Convert a DisposeType enumerator into the equivalent
+                dispose option string
+*/
+VALUE
+Info_dispose_eq(VALUE self, VALUE disp)
+{
+#if defined(HAVE_SETIMAGEOPTION)
+    Info *info;
+    DisposeType dispose;
+    char *option;
+    int x;
+    Data_Get_Struct(self, Info, info);
+    if (NIL_P(disp))
+    {
+        (void) RemoveImageOption(info, "dispose");
+        return self;
+    }
+    VALUE_TO_ENUM(disp, dispose, DisposeType);
+    option = "Undefined";
+    for(x = 0; x < N_DISPOSE_OPTIONS; x++)
+    {
+        if (dispose == Dispose_Option[x].enumerator)
+        {
+            option = Dispose_Option[x].string;
+            break;
+        }
+    }
+    (void) SetImageOption(info, "dispose", option);
+    return self;
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
 DEF_ATTR_ACCESSOR(Info, dither, bool)
 #ifdef HAVE_IMAGE_EXTRACT_INFO
@@ -649,6 +841,37 @@ Info_filename_eq(VALUE self, VALUE filename)
     return self;
 }
+/*
+    Method:     Info#fill
+    Purpose:    return the fill (a.k.a pen) color as a String
+    Note:       Compare with Image#fill!
+*/
+VALUE
+Info_fill(VALUE self)
+{
+    Info *info;
+    Data_Get_Struct(self, Info, info);
+    return PixelPacket_to_Color_Name_Info(info, &info->pen);
+}
+/*
+    Method:     Info#fill=<aString>
+    Purpose:    set the fill (a.k.a. pen) color
+    Raises:     ArgumentError
+*/
+VALUE
+Info_fill_eq(VALUE self, VALUE color)
+{
+    Info *info;
+    Data_Get_Struct(self, Info, info);
+    Color_to_PixelPacket(&info->pen, color);
+    return self;
+}
 /*
     Methods:    aString=Info#font
                 Info#font=aString
@@ -742,6 +965,112 @@ VALUE Info_fuzz_eq(VALUE self, VALUE fuzz)
     return self;
 }
+/*
+    Method:     Info#gravity
+    Purpose:    Return the value of the gravity option as a GravityType enumerator
+*/
+#if defined(HAVE_SETIMAGEOPTION)
+static struct
+{
+    char *string;
+    char *enum_name;
+    GravityType enumerator;
+} Gravity_Option[] = {
+    { "Undefined",  "UndefinedGravity", UndefinedGravity },
+    { "None",       "UndefinedGravity", UndefinedGravity },
+    { "Center",     "CenterGravity",    CenterGravity },
+    { "East",       "EastGravity",      EastGravity},
+    { "Forget",     "ForgetGravity",    ForgetGravity },
+    { "NorthEast",  "NorthEastGravity", NorthEastGravity },
+    { "North",      "NorthGravity",     NorthGravity },
+    { "NorthWest",  "NorthWestGravity", NorthWestGravity },
+    { "SouthEast",  "SouthEastGravity", SouthEastGravity },
+    { "South",      "SouthGravity",     SouthGravity },
+    { "SouthWest",  "SouthWestGravity", SouthWestGravity },
+    { "West",       "WestGravity",      WestGravity },
+    { "Static",     "StaticGravity",    StaticGravity }
+    };
+#define N_GRAVITY_OPTIONS (sizeof(Gravity_Option)/sizeof(Gravity_Option[0]))
+#endif
+VALUE Info_gravity(VALUE self)
+{
+#if defined(HAVE_SETIMAGEOPTION)
+    Info *info;
+    const char *gravity;
+    int x;
+    ID gravity_id;
+    Data_Get_Struct(self, Info, info);
+    gravity_id = rb_intern("UndefinedGravity");
+    // Map the gravity option string to a GravityType enumerator.
+    gravity=GetImageOption(info, "gravity");
+    if (gravity)
+    {
+        for (x = 0; x < N_GRAVITY_OPTIONS; x++)
+        {
+            if (strcmp(gravity, Gravity_Option[x].string) == 0)
+            {
+                gravity_id = rb_intern(Gravity_Option[x].enum_name);
+                break;
+            }
+        }
+    }
+    return rb_const_get(Module_Magick, gravity_id);
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
+/*
+    Method:     Info#gravity=
+    Purpose:    Convert a GravityType enum to a gravity option name and
+                store in the Info structure
+*/
+VALUE
+Info_gravity_eq(VALUE self, VALUE grav)
+{
+#if defined(HAVE_SETIMAGEOPTION)
+    Info *info;
+    GravityType gravity;
+    char *option;
+    int x;
+    Data_Get_Struct(self, Info, info);
+    if (NIL_P(grav))
+    {
+        (void) RemoveImageOption(info, "gravity");
+        return self;
+    }
+    VALUE_TO_ENUM(grav, gravity, GravityType);
+    option = "Undefined";
+    for(x = 0; x < N_GRAVITY_OPTIONS; x++)
+    {
+        if (gravity == Gravity_Option[x].enumerator)
+        {
+            option = Gravity_Option[x].string;
+            break;
+        }
+    }
+    (void) SetImageOption(info, "gravity", option);
+    return self;
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
 DEF_ATTR_ACCESSOR(Info, group, long)
@@ -803,6 +1132,8 @@ Info_interlace_eq(VALUE self, VALUE inter)
     return self;
 }
+OPTION_ATTR_ACCESSOR(label, Label)
 /*
     Method:     Info#matte_color
     Purpose:    return the name of the matte color as a String
@@ -895,7 +1226,22 @@ Info_orientation_eq(VALUE self, VALUE inter)
 #endif
 }
-DEF_ATTR_READER(Info, page, str)
+VALUE
+Info_page(VALUE self)
+{
+    Info *info;
+    const char *page;
+    Data_Get_Struct(self, Info, info);
+#if defined(HAVE_SETIMAGEOPTION)
+    page = GetImageOption(info, "page");
+#else
+    page = (const char *)info->page;
+#endif
+    return page ? rb_str_new2(page) : Qnil;
+}
 /*
     Method:     Info#page=<aString> or <aGeometry>
@@ -916,7 +1262,7 @@ Info_page_eq(VALUE self, VALUE page_arg)
         return self;
     }
     geom_str = rb_funcall(page_arg, ID_to_s, 0);
-    geometry=PostscriptGeometry(STRING_PTR(geom_str));
+    geometry=GetPageGeometry(STRING_PTR(geom_str));
     if (*geometry == '\0')
     {
         magick_free(info->page);
@@ -924,6 +1270,9 @@ Info_page_eq(VALUE self, VALUE page_arg)
         return self;
     }
     magick_clone_string(&info->page, geometry);
+#if defined(HAVE_SETIMAGEOPTION)
+    (void) SetImageOption(info, "page", STRING_PTR(geom_str));
+#endif
     return self;
 }
@@ -1319,3 +1668,60 @@ Info_initialize(VALUE self)
     }
     return self;
 }
+/*
+    Method:     Info#get_option
+    Purpose:    Return the value of the specified option
+*/
+static VALUE
+get_option(VALUE self, char *key)
+{
+#if defined(HAVE_SETIMAGEOPTION)
+    Info *info;
+    const char *value;
+    Data_Get_Struct(self, Info, info);
+    value = GetImageOption(info, key);
+    if (value)
+    {
+        return rb_str_new2(value);
+    }
+    return Qnil;
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
+/*
+    Method:     Info#set_option
+    Purpose:    Set the specified option to this value.
+                If the value is nil just unset any current value
+*/
+static VALUE
+set_option(VALUE self, char *key, VALUE string)
+{
+#if defined(HAVE_SETIMAGEOPTION)
+    Info *info;
+    char *value;
+    Data_Get_Struct(self, Info, info);
+    if (NIL_P(string))
+    {
+        (void) RemoveImageOption(info, key);
+    }
+    else
+    {
+        value = STRING_PTR(string);
+        (void) SetImageOption(info, key, value);
+    }
+    return self;
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}

data/ext/RMagick/rmmain.c CHANGED

@@ -1,4 +1,4 @@
-/* $Id: rmmain.c,v 1.87 2005/06/10 22:41:19 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.89 2005/06/12 21:07:56 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2005 by Timothy P. Hunter
 | Name:     rmmain.c
@@ -937,17 +937,23 @@ Init_RMagick(void)
     DCL_ATTR_ACCESSOR(Info, background_color)
     DCL_ATTR_ACCESSOR(Info, border_color)
     DCL_ATTR_ACCESSOR(Info, colorspace)
+    DCL_ATTR_ACCESSOR(Info, comment)        // new in 6.0.0
     DCL_ATTR_ACCESSOR(Info, compression)
+    DCL_ATTR_ACCESSOR(Info, delay)          // new in 6.0.0
     DCL_ATTR_ACCESSOR(Info, density)
     DCL_ATTR_ACCESSOR(Info, depth)
+    DCL_ATTR_ACCESSOR(Info, dispose)        // new in 6.0.0
     DCL_ATTR_ACCESSOR(Info, dither)
     DCL_ATTR_ACCESSOR(Info, extract)    // new in 5.5.6, replaces tile
     DCL_ATTR_ACCESSOR(Info, filename)
+    DCL_ATTR_ACCESSOR(Info, fill)
     DCL_ATTR_ACCESSOR(Info, font)
     DCL_ATTR_ACCESSOR(Info, format)
     DCL_ATTR_ACCESSOR(Info, fuzz)
+    DCL_ATTR_ACCESSOR(Info, gravity)
     DCL_ATTR_ACCESSOR(Info, group)
     DCL_ATTR_ACCESSOR(Info, interlace)
+    DCL_ATTR_ACCESSOR(Info, label)          // new in 6.0.0
     DCL_ATTR_ACCESSOR(Info, matte_color)
     DCL_ATTR_ACCESSOR(Info, monochrome)
     DCL_ATTR_ACCESSOR(Info, number_scenes)  // new in 5.5.6, replaces subrange
@@ -1252,6 +1258,13 @@ Init_RMagick(void)
     // GravityType constants
     DEF_ENUM(GravityType)
+#if defined(HAVE_UNDEFINEDGRAVITY)
+        ENUMERATOR(UndefinedGravity)
+#else
+        // Provide this enumerator in older (pre 6.0.0) versions of ImageMagick
+        _enum = rm_enum_new(_cls, ID2SYM(rb_intern("UndefinedGravity")), INT2FIX(0));\
+        rb_define_const(Module_Magick, "UndefinedGravity", _enum);
+#endif
         ENUMERATOR(ForgetGravity)
         ENUMERATOR(NorthWestGravity)
         ENUMERATOR(NorthGravity)
@@ -1518,7 +1531,7 @@ static void version_constants(void)
     rb_define_const(Module_Magick, "Version", rb_str_new2(PACKAGE_STRING));
     sprintf(long_version,
-        "This is %s ($Date: 2005/06/10 22:41:19 $) Copyright (C) 2005 by Timothy P. Hunter\n"
+        "This is %s ($Date: 2005/06/12 21:07:56 $) Copyright (C) 2005 by Timothy P. Hunter\n"
         "Built with %s\n"
         "Built for %s\n"
         "Web page: http://rmagick.rubyforge.org\n"

data/rmagick.gemspec CHANGED

@@ -1,7 +1,7 @@
 require 'date'
 Gem::Specification.new do |s|
   s.name = %q{rmagick}
-  s.version = "1.8.2"
+  s.version = "1.8.3"
   s.date = Date.today.to_s
   s.summary = %q{RMagick is an interface between the Ruby programming language and the ImageMagick and GraphicsMagick image processing libraries.}
   s.description =<<DESCRIPTION

metadata CHANGED

@@ -3,8 +3,8 @@ rubygems_version: 0.8.3
 specification_version: 1
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 1.8.2
-date: 2005-06-10
+  version: 1.8.3
+date: 2005-06-17
 summary: RMagick is an interface between the Ruby programming language and the ImageMagick and GraphicsMagick image processing libraries.
 require_paths:
   - lib