RubyGems - rmagick - Versions diffs - 1.9.2 → 1.9.3 - Mend

rmagick 1.9.2 → 1.9.3

Potentially problematic release.

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

Files changed (21) hide show

data/ChangeLog +8 -2
data/README.html +8 -8
data/README.txt +6 -6
data/configure +113 -17
data/configure.ac +2 -5
data/doc/comtasks.html +23 -5
data/doc/constants.html +21 -3
data/doc/image1.html +54 -32
data/doc/image2.html +9 -12
data/doc/image3.html +7 -10
data/doc/usage.html +12 -6
data/ext/RMagick/MANIFEST +1 -1
data/ext/RMagick/rmagick.h +2 -1
data/ext/RMagick/rmagick_config.h.in +4 -0
data/ext/RMagick/rmilist.c +5 -1
data/ext/RMagick/rmimage.c +73 -5
data/ext/RMagick/rmmain.c +5 -2
data/ext/RMagick/rmutil.c +17 -5
data/lib/RMagick.rb +2 -2
data/rmagick.gemspec +1 -1
metadata +2 -2

data/ChangeLog CHANGED

@@ -1,7 +1,13 @@
+RMagick 1.9.3
+    o Feature #2521, add Image#distortion_channel method
+    o Fixed bug #2546, ImageList#to_blob builds multi-image blobs again. (ImageMagick 6.2.0
+      silently broke the ImageToBlob method.) Thanks to Tom Werner for reporting this bug.
+    o Test with GraphicsMagick 1.1.7
 RMagick 1.9.2
-    o Feature 2412, add the virtual_pixel_method attribute and the VirtualPixelMethod
+    o Feature #2412, add the virtual_pixel_method attribute and the VirtualPixelMethod
       enumeration
-    o Feature 2462, add the ticks_per_second attribute
+    o Feature #2462, add the ticks_per_second attribute
 RMagick 1.9.1
     o Fixed bug #2157, Image#total_colors is now an alias of Image#number_colors

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.9.2 README</title>
+    <title>RMagick 1.9.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.9.2 README</h1>
+<h1>RMagick 1.9.3 README</h1>
-<h2>09/15/05</h2>
+<h2>10/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="&#x6D;a&#x69;&#x6C;&#x74;&#x6F;:&#x72;&#109;&#097;&#x67;&#105;&#x63;&#x6B;&#x40;&#x72;&#117;&#x62;&#121;&#102;&#111;&#114;&#x67;&#x65;&#046;&#x6F;&#x72;&#103;">&#x72;&#109;&#097;&#x67;&#105;&#x63;&#x6B;&#x40;&#x72;&#117;&#x62;&#121;&#102;&#111;&#114;&#x67;&#x65;&#046;&#x6F;&#x72;&#103;</a></p>
+<p><strong>Email:</strong> <a href="&#109;&#097;&#x69;&#x6C;&#116;&#x6F;:&#x72;&#x6D;&#x61;&#103;&#105;&#099;&#107;&#064;&#114;&#117;&#098;&#121;&#x66;&#x6F;&#x72;&#x67;&#101;&#046;&#x6F;&#x72;&#x67;">&#x72;&#x6D;&#x61;&#103;&#105;&#099;&#107;&#064;&#114;&#117;&#098;&#121;&#x66;&#x6F;&#x72;&#x67;&#101;&#046;&#x6F;&#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.9.2.tar.gz archive and enter the top
+<p>De-compress the RMagick-1.9.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.9.2/lib/RMagick.rb:11:in `require': libMagick.so.0:
+<pre><code>/home/you/RMagick-1.9.3/lib/RMagick.rb:11:in `require': libMagick.so.0:
   cannot open shared object file: No such file or directory -
-  /home/you/RMagick-1.9.2/ext/RMagick/RMagick.so (LoadError)
+  /home/you/RMagick-1.9.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.9.2/./post-setup.rb failed:
+<pre><code>hook /home/me/src/RMagick-1.9.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.9.2 README
+RMagick 1.9.3 README
 ================================
-09/15/05
+10/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.9.2.tar.gz archive and enter the top
+De-compress the RMagick-1.9.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.9.2/lib/RMagick.rb:11:in `require': libMagick.so.0:
+    /home/you/RMagick-1.9.3/lib/RMagick.rb:11:in `require': libMagick.so.0:
       cannot open shared object file: No such file or directory -
-      /home/you/RMagick-1.9.2/ext/RMagick/RMagick.so (LoadError)
+      /home/you/RMagick-1.9.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.9.2/./post-setup.rb failed:
+    hook /home/me/src/RMagick-1.9.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.9.2.
+# Generated by GNU Autoconf 2.59 for RMagick 1.9.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.9.2.tar.gz'
-PACKAGE_VERSION='1.9.2'
-PACKAGE_STRING='RMagick 1.9.2'
+PACKAGE_TARNAME='RMagick-1.9.3.tar.gz'
+PACKAGE_VERSION='1.9.3'
+PACKAGE_STRING='RMagick 1.9.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.9.2 to adapt to many kinds of systems.
+\`configure' configures RMagick 1.9.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.9.2:";;
+     short | recursive ) echo "Configuration of RMagick 1.9.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.9.2
+RMagick configure 1.9.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.9.2, which was
+It was created by RMagick $as_me 1.9.3, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
   $ $0 $@
@@ -5794,6 +5794,109 @@ fi
 done
+for ac_func in GetImageChannelDistortion ImagesToBlob
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+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.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+#undef $ac_func
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 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_exeext'
+  { (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
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+fi
+done
 # What typedefs?
 # Need a separate test for this so we can set an env. variable to test below.
@@ -7877,13 +7980,6 @@ fi
 echo "$as_me:$LINENO: result: $rm_cv_enum_quantumpixel" >&5
 echo "${ECHO_T}$rm_cv_enum_quantumpixel" >&6
-if test "$rm_cv_enum_quantumpixel" = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_QUANTUMPIXEL 1
-_ACEOF
-fi
 echo "$as_me:$LINENO: checking for TransparentVirtualPixelMethod enum value" >&5
 echo $ECHO_N "checking for TransparentVirtualPixelMethod enum value... $ECHO_C" >&6
 if test "${rm_cv_enum_transparentvirtualpixelmethod+set}" = set; then
@@ -8772,7 +8868,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
-This file was extended by RMagick $as_me 1.9.2, which was
+This file was extended by RMagick $as_me 1.9.3, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
   CONFIG_FILES    = $CONFIG_FILES
@@ -8832,7 +8928,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-RMagick config.status 1.9.2
+RMagick config.status 1.9.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.9.2, rmagick@rubyforge.org, RMagick-1.9.2.tar.gz)
+AC_INIT(RMagick, 1.9.3, rmagick@rubyforge.org, RMagick-1.9.3.tar.gz)
 echo "Configuring ${PACKAGE_STRING}"
 AC_CONFIG_HEADER([ext/RMagick/rmagick_config.h])
@@ -144,6 +144,7 @@ AC_CHECK_FUNCS([ConvolveImageChannel SpliceImage SharpenImageChannel])
 AC_CHECK_FUNCS([SetImageChannelDepth BlurImageChannel GetMultilineTypeMetrics])
 AC_CHECK_FUNCS([NormalizeImageChannel UnsharpMaskImageChannel ShadowImage])
 AC_CHECK_FUNCS([SepiaToneImage SigmoidalContrastImageChannel SetImageProgressMonitor])
+AC_CHECK_FUNCS([GetImageChannelDistortion ImagesToBlob])
 # What typedefs?
@@ -440,10 +441,6 @@ AC_CACHE_CHECK(for QuantumPixel enum value, rm_cv_enum_quantumpixel,
      rm_cv_enum_quantumpixel='yes',
      rm_cv_enum_quantumpixel='no')])
-if test "$rm_cv_enum_quantumpixel" = yes; then
-  AC_DEFINE(HAVE_QUANTUMPIXEL)
-fi
 AC_CACHE_CHECK(for TransparentVirtualPixelMethod enum value, rm_cv_enum_transparentvirtualpixelmethod,
   [AC_TRY_COMPILE(
 [#include <stdio.h>

data/doc/comtasks.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 July 2004), see www.w3.org" />
+  "HTML Tidy for Linux/x86 (vers 1st March 2005), see www.w3.org" />
   <title>RMagick: Common Tasks</title>
   <meta http-equiv="Content-Type" content=
@@ -44,7 +44,7 @@
   <div id="toc">
     <h2>Table of Contents</h2>
-    <ul style="margin-left: 15px; padding-top: 1em">
+    <ul style="margin-left: 15px; padding-top: 1em;">
       <li><a href="#info">Getting information about an
       image</a></li>
@@ -56,13 +56,15 @@
       <li><a href="#resizing">Resizing to a maximum (or minimum)
       size</a></li>
+      <li><a href="#blob">Writing to or reading from a string
+      instead of a file</a></li>
       <li><a href="#gray">Converting a color image to
       grayscale</a></li>
       <li><a href="#compressing">Compressing image files</a></li>
       <li><a href="#shadow">Making a drop shadow</a></li>
     </ul>
   </div>
@@ -175,6 +177,23 @@ thumb.write "thumb.gif"
   value from the block. The <code>change_geometry</code> method
   then returns that value to its caller.</p>
+  <h2><a id="blob" name="blob">Writing to or reading from a string
+  instead of a file</a></h2>
+  <p>Use the <a href="image1.html#from_blob">Image.from_blob</a>
+  method to construct an Image object from a string. Use the
+  <a href="image3.html#to_blob">Image#to_blob</a> method to convert
+  an image to a string. A blob is simply an in-memory version of an
+  image file. That is, you could use <code>File.read</code> to read
+  an JPEG file into a string, then create an image by using that
+  string as an argument to <code>from_blob</code>. Similarly, if
+  you create a string version of an image with
+  <code>to_blob</code>, then write the string to a file, any image
+  viewer will be able to display it just as if you had written the
+  image directly to a file. Blobs are very useful in web
+  applications when you want to modify an image and then stream it
+  back to the client.</p>
   <h2 id="gray">Converting a color image to grayscale</h2>
   <p>Use the <a href=
@@ -227,10 +246,9 @@ img.write("myimage.jpg") { self.quality = 50 }
     "ex/drop_shadow.gif" title="Click to see the example script"
     alt="drop shadow example" /></a>
   </div>
   <hr />
-  <p class="spacer"> </p>
+  <p class="spacer">&nbsp;</p>
   <div class="nav">
     &laquo; <a href="imusage.html">Prev</a> | <a href=

data/doc/constants.html CHANGED

@@ -113,13 +113,13 @@
         <li><a href="#InterlaceType">InterlaceType</a></li>
-        <li><a href="#NoiseType">NoiseType</a></li>
+        <li><a href="#MetricType">MetricType</a></li>
       </ul>
     </div>
     <div class="toccol">
       <ul>
-        <li>&nbsp;</li>
+        <li><a href="#NoiseType">NoiseType</a></li>
         <li><a href="#Opacity">Opacity</a></li>
@@ -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/07/31 14:57:29 $)
+    <code>This is RMagick 1.4.0 ($Date: 2005/09/26 23:35:06 $)
     Copyright (C) 2005 by Timothy P. Hunter<br />
     Built with ImageMagick 6.0.0 02/25/04 Q8
     http://www.imagemagick.org<br />
@@ -995,6 +995,24 @@
     image.R, image.G, and image.B)</dd>
   </dl>
+  <h3 class="const" id="MetricType">MetricType</h3>
+  <p>The distortion metric type. See <a href=
+  "image1.html#compare_channel">compare_channel</a>, <a href=
+  "image1.html#distortion_channel">distortion_channel</a>.</p>
+  <dl>
+    <dt>MeanAbsoluteErrorMetric</dt>
+    <dt>MeanSquaredErrorMetric</dt>
+    <dt>PeakAbsoluteErrorMetric</dt>
+    <dt>PeakSignalToNoiseRatioMetric</dt>
+    <dt>RootMeanSquaredErrorMetric</dt>
+  </dl>
   <h3 class="const" id="NoiseType">NoiseType</h3>
   <p><span class="imquote">Select the type of noise to be added to

data/doc/image1.html CHANGED

@@ -155,13 +155,13 @@ float: left;
           <li><a href="#composite">composite</a></li>
           <li><a href="#composite_bang">composite!</a></li>
+          <li><a href="#composite_affine">composite_affine</a></li>
         </ul>
       </div>
       <div class="toccol">
         <ul>
-          <li><a href="#composite_affine">composite_affine</a></li>
           <li><a href=
           "#compress_colormap_bang">compress_colormap!</a></li>
@@ -187,6 +187,8 @@ float: left;
           <li><a href="#display">display</a></li>
+          <li><a href="#distortion_channel">distortion_channel</a></li>
           <li><a href="#dup">dup</a></li>
           <li><a href="#each_profile">each_profile</a></li>
@@ -903,8 +905,7 @@ img = Magick::Image.read_inline(content)
     <h3 id="bilevel_channel">bilevel_channel</h3>
     <p><span class="arg">image</span>.bilevel_channel(<span class=
-    "arg">threshold</span>, [<span class="arg">channel</span>[,
-    <span class="arg">channel</span>...]] = <em>aNewImage</em></p>
+    "arg">threshold</span> [,<span class="arg">channel...</span>]) = <em>aNewImage</em></p>
   </div>
   <div class="desc">
@@ -963,8 +964,7 @@ img = Magick::Image.read_inline(content)
     <p><span class="arg">image</span>.blur_channel(<span class=
     "arg">radius=0.0</span>, <span class=
-    "arg">sigma=1.0</span><span class="arg">[, channel[,
-    channel...]]</span>) -&gt; <em>anImage</em></p>
+    "arg">sigma=1.0</span><span class="arg">[, channel...]]</span>) -&gt; <em>anImage</em></p>
   </div>
   <div class="desc">
@@ -1294,7 +1294,7 @@ mona.change_geometry!('320x240') { |cols, rows, img|
     <h3 id="channel_depth">channel_depth</h3>
     <p><span class="arg">image</span>.channel_depth([<span class=
-    "arg">channel</span> [, <span class="arg">channel</span>]...])
+    "arg">channel</span>...])
     -&gt; <em>aNumeric</em></p>
   </div>
@@ -1307,7 +1307,7 @@ mona.change_geometry!('320x240') { |cols, rows, img|
     <h4>Arguments</h4>
     <dl>
-      <dt>[channel [, channel...]]</dt>
+      <dt>channel...</dt>
       <dd>Zero or more <a href=
       "constants.html#ChannelType">ChannelType</a> constants. If no
@@ -1332,7 +1332,7 @@ mona.change_geometry!('320x240') { |cols, rows, img|
     <h3 id="channel_extrema">channel_extrema</h3>
     <p><span class="arg">image</span>.channel_extrema([<span class=
-    "arg">channel</span> [, <span class="arg">channel</span>]...])
+    "arg">channel</span>...])
     -&gt; <em>[aNumeric, aNumeric]</em></p>
   </div>
@@ -1345,7 +1345,7 @@ mona.change_geometry!('320x240') { |cols, rows, img|
     <h4>Arguments</h4>
     <dl>
-      <dt>[channel [, channel...]]</dt>
+      <dt>channel...</dt>
       <dd>Zero or more <a href=
       "constants.html#ChannelType">ChannelType</a> values. If no
@@ -1375,7 +1375,7 @@ mona.change_geometry!('320x240') { |cols, rows, img|
     <h3 id="channel_mean">channel_mean</h3>
     <p><span class="arg">image</span>.channel_mean([<span class=
-    "arg">channel</span> [, <span class="arg">channel</span>]...])
+    "arg">channel</span>...])
     -&gt; <em>[aNumeric, aNumeric]</em></p>
   </div>
@@ -1388,7 +1388,7 @@ mona.change_geometry!('320x240') { |cols, rows, img|
     <h4>Arguments</h4>
     <dl>
-      <dt>[channel [, channel...]]</dt>
+      <dt>channel...</dt>
       <dd>Zero or more <a href=
       "constants.html#ChannelType">ChannelType</a> values. If no
@@ -1914,24 +1914,10 @@ f.color_reset!(red)
       <dt>metric</dt>
       <dd>
-        The desired distortion metric. One of the following
-        constants:
-        <ul style=
-        "list-style-type: none; list-style-image: none; list-style-position: outside;">
-        <li>MeanAbsoluteErrorMetric</li>
-          <li>MeanSquaredErrorMetric</li>
-          <li>PeakAbsoluteErrorMetric</li>
-          <li>PeakSignalToNoiseRatioMetric</li>
-          <li>RootMeanSquaredErrorMetric</li>
-        </ul>
+        The desired distortion metric. A <a href="constants.html#MetricType">MetricType</a> value.
       </dd>
-      <dt>[channel [, channel...]]</dt>
+      <dt>channel...</dt>
       <dd>Zero or more <a href=
       "constants.html##ChannelType">ChannelType</a> values. All the
@@ -1949,7 +1935,8 @@ f.color_reset!(red)
     <h4>See also</h4>
     <p><a href="#difference">difference</a>, <a href=
-    "#spaceship">&lt;=&gt;</a></p>
+    "#spaceship">&lt;=&gt;</a>,
+    <a href="#distortion_channel">distortion_channel</a></p>
     <h4>Magick API</h4>
@@ -2342,9 +2329,8 @@ f.colors &raquo; 108
     <h3 id="convolve_channel">convolve_channel</h3>
     <p><span class="arg">image</span>.convolve_channel(<span class=
-    "arg">order</span>, <span class="arg">kernel</span>[,
-    <span class="arg">channel</span>[, <span class=
-    "arg">channel</span>...]]) -&gt; <em>anImage</em></p>
+    "arg">order</span>, <span class="arg">kernel</span> [,
+    <span class="arg">channel</span>...]) -&gt; <em>anImage</em></p>
   </div>
   <div class="desc">
@@ -2873,6 +2859,42 @@ exit
     <p>DisplayImages</p>
   </div>
+  <div class="sig">
+      <h3 id="distortion_channel">distortion_channel</h3>
+    <p><span class="arg">image</span>.distortion_channel(<span class="arg">reconstructed_image</span>, <span class="arg">metric</span>[, <span class="arg">channel</span>...]) -&gt; <em>aFloat</em></p>
+  </div>
+  <div class="desc">
+      <h4>Description</h4>
+    <p class="imquote">(C)ompares one or more image channels of an image to a reconstructed image and returns the specified distortion metric.</p>
+    <h4>Arguments</h4>
+    <dl>
+    <dt>reconstructed_image</dt>
+      <dd>Either an imagelist or an image. If an imagelist, uses
+      the current image.</dd>
+      <dt>metric</dt>
+      <dd>
+        The desired distortion metric. A <a href="constants.html#MetricType">MetricType</a> value.
+      </dd>
+      <dt>channel...</dt>
+      <dd>Zero or more <a href=
+      "constants.html##ChannelType">ChannelType</a> values. All the
+      specified channels contribute to the comparison and the
+      distortion value. If no channels are specified, compares all
+      channels.</dd>
+    </dl>
+    <h4>Returns</h4>
+    <h4>Magick API</h4>
+    <p>GetImageChannelDistortion (available in ImageMagick 6.2.0)</p>
+    <h4>See also</h4>
+    <p><a href="#compare_channel">compare_channel</a>,
+    <a href="#difference">difference</a></p>
+  </div>
   <div class="sig">
     <h3 id="dup">dup</h3>

data/doc/image2.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: class Image (instance methods, part 2)</title>
   <meta http-equiv="Content-Type" content=
@@ -493,9 +493,8 @@ scanline = img.export_pixels(0, r, img.columns, 1, "RGB");
                                                           --><img class="hide"
     id="framed" onmouseover=
     "this.style.display='none';frameless.style.display='';" src=
-    "ex/frame.jpg" alt="frame example" /></a>
-    <img src="ex/images/spin.gif" alt="" style=
-    "margin-bottom: 280px" title=
+    "ex/frame.jpg" alt="frame example" /></a> <img src=
+    "ex/images/spin.gif" alt="" style="margin-bottom: 280px" title=
     "Mouse over the example to see the original image" /></p>
     <h4>See also</h4>
@@ -511,8 +510,8 @@ scanline = img.export_pixels(0, r, img.columns, 1, "RGB");
     <h3 id="gamma_channel">gamma_channel</h3>
     <p><span class="arg">image</span>.gamma_channel(<span class=
-    "arg">gamma</span>, [<span class="arg">channel</span>[,
-    <span class="arg">channel</span>...]] = <em>anImage</em></p>
+    "arg">gamma</span>, [<span class="arg">channel</span>...]) =
+    <em>anImage</em></p>
   </div>
   <div class="desc">
@@ -655,8 +654,8 @@ scanline = img.export_pixels(0, r, img.columns, 1, "RGB");
     <p><span class=
     "arg">image</span>.gaussian_blur_channel(<span class=
     "arg">radius</span>=0.0, <span class="arg">sigma</span>=1.0[,
-    <span class="arg">channel</span>[, <span class=
-    "arg">channel</span>...]) -&gt; <em>anImage</em></p>
+    <span class="arg">channel</span>...]) -&gt;
+    <em>anImage</em></p>
   </div>
   <div class="desc">
@@ -1870,8 +1869,7 @@ f.inspect &raquo; "images/Flower_Hat.jpg JPEG 200x250 DirectClass 8-bit 9kb"
     <p><span class="arg">image</span>.negate_channel(<span class=
     "arg">grayscale</span>=<code>false</code>, [<span class=
-    "arg">channel</span>[, <span class="arg">channel</span>...]] =
-    <em>anImage</em></p>
+    "arg">channel</span>...]) = <em>anImage</em></p>
   </div>
   <div class="desc">
@@ -1965,8 +1963,7 @@ f.inspect &raquo; "images/Flower_Hat.jpg JPEG 200x250 DirectClass 8-bit 9kb"
     <p><span class=
     "arg">image</span>.normalize_channel([<span class=
-    "arg">channel</span>[, <span class="arg">channel</span>...]]) =
-    <em>anImage</em></p>
+    "arg">channel</span>...]) = <em>anImage</em></p>
   </div>
   <div class="desc">

data/doc/image3.html CHANGED

@@ -667,8 +667,7 @@ img.quantum_operator(DivideQuantumOperator, 2, RedChannel)
     <p><span class="arg">image</span>.random_threshold_channel(
     <span class="arg">thresholds</span>, [<span class=
-    "arg">channel</span>, <span class="arg">channel</span>...] )
-    -&gt; <em>anImage</em></p>
+    "arg">channel</span>...] ) -&gt; <em>anImage</em></p>
   </div>
   <div class="desc">
@@ -1475,8 +1474,8 @@ random_threshold_channel(geom, RedChannel)
     <p><span class="arg">image</span>.sharpen_channel( <span class=
     "arg">radius</span>, <span class="arg">sigma</span>
-    [,<span class="arg">channel</span>, <span class=
-    "arg">channel</span>...] ) -&gt; <em>anImage</em></p>
+    [,<span class="arg">channel</span>...] ) -&gt;
+    <em>anImage</em></p>
   </div>
   <div class="desc">
@@ -1658,9 +1657,8 @@ random_threshold_channel(geom, RedChannel)
     "arg">image</span>.sigmoidal_contrast_channel(<span class=
     "arg">contrast</span>=3.0, <span class=
     "arg">midpoint</span>=50.0, <span class=
-    "arg">sharpen</span>=false[,<span class="arg"><span class=
-    "arg">channel</span></span>, <span class="arg"><span class=
-    "arg">channel</span></span>...]) -&gt; <em>anImage</em></p>
+    "arg">sharpen</span>=false[,<span class=
+    "arg">channel</span>...]) -&gt; <em>anImage</em></p>
   </div>
   <div class="desc">
@@ -2723,9 +2721,8 @@ img.to_color(pixel)
     "arg">image</span>.unsharp_mask_channel(<span class=
     "arg">radius=0.0</span>, <span class="arg">sigma=1.0</span>,
     <span class="arg">amount=1.0</span>, <span class=
-    "arg">threshold=0.05</span> [,<span class="arg">channel</span>,
-    <span class="arg">channel</span>...]) -&gt;
-    <em>anImage</em></p>
+    "arg">threshold=0.05</span> [,<span class=
+    "arg">channel</span>...]) -&gt; <em>anImage</em></p>
   </div>
   <div class="desc">

data/doc/usage.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: How to use RMagick</title>
   <meta http-equiv="Content-Type" content=
@@ -447,6 +447,12 @@ exit
       <dd>Compute the difference between two images</dd>
+      <dt><a href=
+      "image1.html#distortion_channel">distortion_channel</a></dt>
+      <dd>Compare one or more channels to a reconstructed
+      image</dd>
       <dt><a href="image1.html#dup">dup</a></dt>
       <dd>Return a shallow copy of the image</dd>
@@ -927,10 +933,10 @@ exit
       <dd>Segment an image by analyzing the histograms of the color
       components and identifying units that are homogeneous with
       the fuzzy c-means technique</dd>
-      <dt><a href="image3.html#random_threshold_channel">
-      random_threshold_channel</a></dt>
+      <dt><a href=
+      "image3.html#random_threshold_channel">random_threshold_channel</a></dt>
       <dd>Change the value of individual pixels based on the
       intensity of each pixel compared to a random threshold.</dd>
@@ -1333,7 +1339,7 @@ exit
     use radians instead of degrees.</p>
   </div>
-  <p class="spacer"> </p>
+  <p class="spacer">&nbsp;</p>
   <div class="nav">
     &laquo; <a href="index.html">Prev</a> | <a href=

data/ext/RMagick/MANIFEST CHANGED

@@ -1,4 +1,4 @@
-MANIFEST for RMagick-1.9.2 - 17:43:02 09/15/05
+MANIFEST for RMagick-1.9.3 - 18:59:35 10/17/05
 configure
 README.html

data/ext/RMagick/rmagick.h CHANGED

@@ -1,4 +1,4 @@
-/* $Id: rmagick.h,v 1.94 2005/09/13 23:37:21 rmagick Exp $ */
+/* $Id: rmagick.h,v 1.95 2005/09/26 23:37:04 rmagick Exp $ */
 /*=============================================================================
 |               Copyright (C) 2005 by Timothy P. Hunter
 | Name:     rmagick.h
@@ -756,6 +756,7 @@ extern VALUE Image_despeckle(VALUE);
 extern VALUE Image_difference(VALUE, VALUE);
 extern VALUE Image_dispatch(int, VALUE *, VALUE);
 extern VALUE Image_display(VALUE);
+extern VALUE Image_distortion_channel(int, VALUE *, VALUE);
 extern VALUE Image__dump(VALUE, VALUE);
 extern VALUE Image_dup(VALUE);
 extern VALUE Image_each_profile(VALUE);

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

@@ -59,8 +59,12 @@
 #undef HAVE_GETIMAGECHANNELEXTREMA
 /* Introduced in IM 6.0.0, GM 1.1 */
 #undef HAVE_GETIMAGECHANNELMEAN
+/* Introduced in IM 6.2.0 */
+#undef HAVE_GETIMAGECHANNELDISTORTION
 /* Introduced in IM 6.0.0, GM 1.1 */
 #undef HAVE_GETIMAGEHISTOGRAM
+/* Introduced in IM 6.1.5 */
+#undef HAVE_IMAGESTOBLOB
 /* Introduced in IM 6.0.0, GM 1.1 */
 #undef HAVE_GETIMAGEPROFILE
 /* Introduced in IM 6.0.0 */

data/ext/RMagick/rmilist.c CHANGED

@@ -1,4 +1,4 @@
-/* $Id: rmilist.c,v 1.25 2005/08/07 21:21:08 rmagick Exp $ */
+/* $Id: rmilist.c,v 1.27 2005/10/13 23:01:29 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2005 by Timothy P. Hunter
 | Name:     rmilist.c
@@ -584,7 +584,11 @@ ImageList_to_blob(VALUE self)
     // doesn't support multi-image files.
     info->adjoin = True;
     GetExceptionInfo(&exception);
+#if defined(HAVE_IMAGESTOBLOB)
+    blob = ImagesToBlob(info, images, &length, &exception);
+#else
     blob = ImageToBlob(info, images, &length, &exception);
+#endif
     rm_split(images);
     HANDLE_ERROR

data/ext/RMagick/rmimage.c CHANGED

@@ -1,4 +1,4 @@
-/* $Id: rmimage.c,v 1.121 2005/09/13 23:37:21 rmagick Exp $ */
+/* $Id: rmimage.c,v 1.123 2005/09/26 23:37:04 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2005 by Timothy P. Hunter
 | Name:     rmimage.c
@@ -1142,7 +1142,7 @@ Image_color_histogram(VALUE self)
     for (x = 0; x < colors; x++)
     {
         pixel = Pixel_from_PixelPacket(&histogram[x].pixel);
-        rb_hash_aset(hash, pixel, INT2NUM(histogram[x].count));
+        rb_hash_aset(hash, pixel, ULONG2NUM(histogram[x].count));
     }
     /*
@@ -1155,7 +1155,7 @@ Image_color_histogram(VALUE self)
 #elif defined(HAVE_GETIMAGEHISTOGRAM)
-    Image *image;
+    Image *image, *dc_copy = NULL;
     volatile VALUE hash, pixel;
     unsigned long x, colors;
     ColorPacket *histogram;
@@ -1164,14 +1164,34 @@ Image_color_histogram(VALUE self)
     Data_Get_Struct(self, Image, image);
     GetExceptionInfo(&exception);
+    // If image not DirectClass make a DirectClass copy.
+    if (image->storage_class != DirectClass)
+    {
+        dc_copy = CloneImage(image, 0, 0, True, &exception);
+        HANDLE_ERROR
+        SyncImage(dc_copy);
+        magick_free(dc_copy->colormap);
+        dc_copy->colormap = NULL;
+        dc_copy->storage_class = DirectClass;
+        image = dc_copy;
+    }
     histogram = GetImageHistogram(image, &colors, &exception);
+    if (dc_copy && (!histogram || exception.severity >= ErrorException))
+    {
+        DestroyImage(dc_copy);
+    }
+    if (!histogram)
+    {
+        rb_raise(rb_eNoMemError, "not enough memory to continue");
+    }
     HANDLE_ERROR
     hash = rb_hash_new();
     for (x = 0; x < colors; x++)
     {
         pixel = Pixel_from_PixelPacket(&histogram[x].pixel);
-        rb_hash_aset(hash, pixel, INT2NUM(histogram[x].count));
+        rb_hash_aset(hash, pixel, ULONG2NUM((unsigned long)histogram[x].count));
     }
     /*
@@ -1179,6 +1199,11 @@ Image_color_histogram(VALUE self)
     */
     RelinquishMagickMemory(histogram);
+    if (dc_copy)
+    {
+        DestroyImage(dc_copy);
+    }
     return hash;
 #else
     rm_not_implemented();
@@ -2631,6 +2656,48 @@ Image_dispose_eq(VALUE self, VALUE dispose)
     return self;
 }
+/*
+ *  Method:     Image#distortion_channel(reconstructed_image, metric[, channel...])
+ *  Purpose:    Call GetImageChannelDistortion
+*/
+VALUE
+Image_distortion_channel(int argc, VALUE *argv, VALUE self)
+{
+#if defined(HAVE_GETIMAGECHANNELDISTORTION)
+    Image *image, *reconstruct;
+    ChannelType channels;
+    ExceptionInfo exception;
+    MetricType metric;
+    double distortion;
+    Data_Get_Struct(self, Image, image);
+    channels = extract_channels(&argc, argv);
+    if (argc > 2)
+    {
+        raise_ChannelType_error(argv[argc-1]);
+    }
+    if (argc < 2)
+    {
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 2 or more)", argc);
+    }
+    Data_Get_Struct(ImageList_cur_image(argv[0]), Image, reconstruct);
+    VALUE_TO_ENUM(argv[1], metric, MetricType);
+    GetExceptionInfo(&exception);
+    (void) GetImageChannelDistortion(image, reconstruct, channels
+                                   , metric, &distortion, &exception);
+    HANDLE_ERROR_IMG(image)
+    HANDLE_ERROR
+    return rb_float_new(distortion);
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
 /*
     Method:     Image#_dump(aDepth)
     Purpose:    implement marshalling
@@ -3652,6 +3719,7 @@ Image_grayscale_pseudo_class(int argc, VALUE *argv, VALUE self)
 }
 /*
     Method:     Image#implode(amount=0.50)
     Purpose:    implode the image by the specified percentage
@@ -3838,7 +3906,7 @@ Image_import_pixels(int argc, VALUE *argv, VALUE self)
     // Everything worked. Replace the image with the clone and destroy the original.
     DATA_PTR(self) = clone_image;
-    DestroyImage(image);
+            DestroyImage(image);
     return self;

data/ext/RMagick/rmmain.c CHANGED

@@ -1,4 +1,4 @@
-/* $Id: rmmain.c,v 1.97 2005/09/13 23:37:21 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.99 2005/10/13 23:01:29 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2005 by Timothy P. Hunter
 | Name:     rmmain.c
@@ -670,6 +670,7 @@ Init_RMagick(void)
     rb_define_method(Class_Image, "difference", Image_difference, 1);
     rb_define_method(Class_Image, "dispatch", Image_dispatch, -1);
     rb_define_method(Class_Image, "display", Image_display, 0);
+    rb_define_method(Class_Image, "distortion_channel", Image_distortion_channel, -1);
     rb_define_method(Class_Image, "_dump", Image__dump, 1);
     rb_define_method(Class_Image, "dup", Image_dup, 0);
     rb_define_method(Class_Image, "each_profile", Image_each_profile, 0);
@@ -1429,7 +1430,9 @@ Init_RMagick(void)
     // StorageType
     DEF_ENUM(StorageType)
+#if defined(HAVE_UNDEFINEDGRAVITY)      // UndefinedGravity & UndefinedPixel were both introduced in IM 6.0.0
         ENUMERATOR(UndefinedPixel)
+#endif
         ENUMERATOR(CharPixel)
         ENUMERATOR(DoublePixel)
         ENUMERATOR(FloatPixel)
@@ -1572,7 +1575,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/09/13 23:37:21 $) Copyright (C) 2005 by Timothy P. Hunter\n"
+        "This is %s ($Date: 2005/10/13 23:01:29 $) Copyright (C) 2005 by Timothy P. Hunter\n"
         "Built with %s\n"
         "Built for %s\n"
         "Web page: http://rmagick.rubyforge.org\n"

data/ext/RMagick/rmutil.c CHANGED

@@ -1,4 +1,4 @@
-/* $Id: rmutil.c,v 1.59 2005/09/11 16:41:40 rmagick Exp $ */
+/* $Id: rmutil.c,v 1.60 2005/10/13 23:01:29 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2005 by Timothy P. Hunter
 | Name:     rmutil.c
@@ -2504,8 +2504,6 @@ StorageType_name(StorageType type)
 {
     switch (type)
     {
-        default:
-        ENUM_TO_NAME(UndefinedPixel)
         ENUM_TO_NAME(CharPixel)
         ENUM_TO_NAME(DoublePixel)
         ENUM_TO_NAME(FloatPixel)
@@ -2515,6 +2513,12 @@ StorageType_name(StorageType type)
         ENUM_TO_NAME(QuantumPixel)
 #endif
         ENUM_TO_NAME(ShortPixel)
+        default:
+#if defined(HAVE_UNDEFINEDGRAVITY)      // UndefinedGravity & UndefinedPixel were both introduced in IM 6.0.0
+        ENUM_TO_NAME(UndefinedPixel)
+#else
+        return "UndefinedPixel";
+#endif
     }
 }
@@ -2527,8 +2531,6 @@ StretchType_name(StretchType stretch)
 {
     switch (stretch)
     {
-        default:
-        ENUM_TO_NAME(UndefinedStretch)
         ENUM_TO_NAME(NormalStretch)
         ENUM_TO_NAME(UltraCondensedStretch)
         ENUM_TO_NAME(ExtraCondensedStretch)
@@ -2539,6 +2541,12 @@ StretchType_name(StretchType stretch)
         ENUM_TO_NAME(ExtraExpandedStretch)
         ENUM_TO_NAME(UltraExpandedStretch)
         ENUM_TO_NAME(AnyStretch)
+        default:
+#if defined(HAVE_UNDEFINEDGRAVITY)      // UndefinedGravity & UndefinedStretch were both introduced in IM 6.0.0
+        ENUM_TO_NAME(UndefinedStretch)
+#else
+        return "UndefinedStretch";
+#endif
     }
 }
@@ -2557,7 +2565,11 @@ StyleType_name(StyleType style)
         ENUM_TO_NAME(ObliqueStyle)
         ENUM_TO_NAME(AnyStyle)
         default:
+#if defined(HAVE_UNDEFINEDGRAVITY)      // UndefinedGravity & UndefinedStyle were both introduced in IM 6.0.0
         ENUM_TO_NAME(UndefinedStyle)
+#else
+        return "UndefinedStyle";
+#endif
     }
 }

data/lib/RMagick.rb CHANGED

@@ -1,4 +1,4 @@
-# $Id: RMagick.rb,v 1.33 2005/09/13 23:37:21 rmagick Exp $
+# $Id: RMagick.rb,v 1.34 2005/10/17 22:17:38 rmagick Exp $
 #==============================================================================
 #                  Copyright (C) 2005 by Timothy P. Hunter
 #   Name:       RMagick.rb
@@ -1225,7 +1225,7 @@ public
         return a
     end
-    if self.superclass.instance_methods.include? 'insert' then
+    if self.superclass.instance_methods(true).include? 'insert' then
         def insert(*args)
             raise(ArgumentError, "can't insert nil") unless args.length > 1
             is_a_image_array args[1,args.length-1]

data/rmagick.gemspec CHANGED

@@ -1,7 +1,7 @@
 require 'date'
 Gem::Specification.new do |s|
   s.name = %q{rmagick}
-  s.version = "1.9.2"
+  s.version = "1.9.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.9.2
-date: 2005-09-15
+  version: 1.9.3
+date: 2005-10-17
 summary: RMagick is an interface between the Ruby programming language and the ImageMagick and GraphicsMagick image processing libraries.
 require_paths:
   - lib