rmagick 1.13.0 → 1.14.0

data/configure.ac

@@ -1,7 +1,7 @@
 
 # RMagick configure.ac
 
-AC_INIT(RMagick, 1.13.0, rmagick@rubyforge.org, RMagick-1.13.0.tar.gz)
+AC_INIT(RMagick, 1.14.0, rmagick@rubyforge.org, RMagick-1.14.0.tar.gz)
 echo "Configuring ${PACKAGE_STRING}"
 
 AC_CONFIG_HEADER([ext/RMagick/rmagick_config.h])
@@ -98,7 +98,8 @@ if test "$rm_have_acquirestringinfo" = yes; then
    AC_DEFINE(HAVE_ACQUIRESTRINGINFO)
 fi
 
-AC_CHECK_FUNCS([AdaptiveSharpenImage AdaptiveThresholdImage AddDefinitions])
+AC_CHECK_FUNCS([AdaptiveBlurImageChannel AdaptiveResizeImage AdaptiveSharpenImage])
+AC_CHECK_FUNCS([AdaptiveThresholdImage AddDefinitions])
 AC_CHECK_FUNCS([AddNoiseImageChannel BilevelImageChannel BlackThresholdImage])
 AC_CHECK_FUNCS([BlurImageChannel ClearMagickException CompareImageChannels])
 AC_CHECK_FUNCS([CompareImageLayers CompositeImageChannel ContrastStretchImageChannel])
@@ -116,7 +117,7 @@ if test "$rm_have_getcolorinfolist" = yes; then
 fi
 
 AC_CHECK_FUNCS([GetImageChannelDepth GetImageChannelDistortion])
-AC_CHECK_FUNCS([GetImageChannelExtrema GetImageChannelMean])
+AC_CHECK_FUNCS([GetImageChannelExtrema GetImageChannelMean GetImageClipMask])
 AC_CHECK_FUNCS([GetImageHistogram GetImageProfile])
 
 # We need to be able to query this later in the configure script, so set a shell variable here
@@ -147,16 +148,17 @@ if test "$rm_have_gettypeinfolist" = yes; then
 fi
 
 AC_CHECK_FUNCS([GetMagickResourceLimit GrayscalePseudoClassImage ImagesToBlob ImportImagePixels])
-AC_CHECK_FUNCS([InheritException InterpretImageAttributes IsColorSimilar NegateImageChannel])
+AC_CHECK_FUNCS([InheritException InterpolatePixelColor InterpretImageAttributes IsColorSimilar])
+AC_CHECK_FUNCS([IsImageSimilar NegateImageChannel])
 AC_CHECK_FUNCS([NormalizeImageChannel ParseSizeGeometry PosterizeImage PreviewImage])
 AC_CHECK_FUNCS([QuantumOperatorRegionImage RadialBlurImage RadialBlurImageChannel])
-AC_CHECK_FUNCS([RandomChannelThresholdImage])
-AC_CHECK_FUNCS([RandomThresholdImageChannel SeparateImageChannel SepiaToneImage])
+AC_CHECK_FUNCS([RandomChannelThresholdImage RandomThresholdImageChannel])
+AC_CHECK_FUNCS([SeparateImageChannel SepiaToneImage])
 AC_CHECK_FUNCS([SetImageBackgroundColor SetImageChannelDepth SetImageColorspace SetImageExtent])
 AC_CHECK_FUNCS([SetImageInfoFile SetImageOption SetImageStorageClass])
 AC_CHECK_FUNCS([SetImageProgressMonitor ShadowImage SharpenImageChannel])
-AC_CHECK_FUNCS([SigmoidalContrastImageChannel SpliceImage StripImage])
-AC_CHECK_FUNCS([ThresholdImageChannel TintImage TransposeImage TransverseImage])
+AC_CHECK_FUNCS([SigmoidalContrastImageChannel SketchImage SpliceImage StripImage])
+AC_CHECK_FUNCS([ThresholdImageChannel TintImage TransposeImage TransverseImage UniqueImageColors])
 AC_CHECK_FUNCS([UnsharpMaskImageChannel VignetteImage WhiteThresholdImage XImportImage])
 
 # What typedefs?
@@ -179,7 +181,8 @@ AC_CHECK_TYPES([magick_int64_t,
                 ExtendedSignedIntegralType,
                 ExtendedUnsignedIntegralType,
                 MagickOffsetType,
-                MagickSizeType],
+                MagickSizeType,
+                MagickPixelPacket],
                 [], [],
                 [#include <stdio.h>
                  #if HAVE_SYS_TYPES_H
@@ -195,34 +198,20 @@ AC_CHECK_MEMBERS([ExceptionInfo.module],,,
                  #endif
                  #include "magick/api.h"])
 
-
-AC_CHECK_MEMBERS([Image.orientation],,,
+AC_CHECK_MEMBERS([Image.bias, Image.orientation, Image.quality, Image.ticks_per_second, Image.transparent_color],,,
                 [#include <stdio.h>
                  #if HAVE_SYS_TYPES_H
                  #include <sys/types.h>
                  #endif
                  #include "magick/api.h"])
 
-AC_CHECK_MEMBERS([ImageInfo.orientation],,,
+AC_CHECK_MEMBERS([ImageInfo.orientation, ImageInfo.channel],,,
                 [#include <stdio.h>
                  #if HAVE_SYS_TYPES_H
                  #include <sys/types.h>
                  #endif
                  #include "magick/api.h"])
 
-AC_CHECK_MEMBERS([Image.quality],,,
-                [#include <stdio.h>
-                 #if HAVE_SYS_TYPES_H
-                 #include <sys/types.h>
-                 #endif
-                 #include "magick/api.h"])
-
-AC_CHECK_MEMBERS([Image.ticks_per_second],,,
-                [#include <stdio.h>
-                 #if HAVE_SYS_TYPES_H
-                 #include <sys/types.h>
-                 #endif
-                 #include "magick/api.h"])
 
 # Don't use AC_CHECK_MEMBERS!
 AC_CACHE_CHECK(for Image.extract_info, rm_cv_member_Image_extract_info,
@@ -419,7 +408,6 @@ if test "$rm_cv_enum_ColorDodgeCompositeOp" = yes; then
   AC_DEFINE(HAVE_COLORDODGECOMPOSITEOP)
 fi
 
-
 AC_CACHE_CHECK(for IndexChannel enum value, rm_cv_enum_indexchannel,
   [AC_TRY_COMPILE(
 [#include <stdio.h>
@@ -539,6 +527,21 @@ if test "$rm_cv_enum_coalescelayer" = yes; then
   AC_DEFINE(HAVE_COALESCELAYER)
 fi
 
+AC_CACHE_CHECK(for MaxEvaluateOperator enum value, rm_cv_enum_maxevaluateoperator,
+  [AC_TRY_COMPILE(
+[#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include "magick/api.h"],
+     [MagickEvaluateOperator x; x = MaxEvaluateOperator],
+     rm_cv_enum_maxevaluateoperator='yes',
+     rm_cv_enum_maxevaluateoperator='no')])
+
+if test "$rm_cv_enum_maxevaluateoperator" = yes; then
+  AC_DEFINE(HAVE_MAXEVALUATEOPERATOR)
+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/comtasks.html

@@ -34,7 +34,7 @@
   <h6 id="header">RMagick User's Guide and Reference</h6>
 
   <div class="nav">
-    &laquo;&nbsp;<a href="imusage.html">Prev</a> | <a href=
+    &laquo;&nbsp;<a href="optequiv.html">Prev</a> | <a href=
     "index.html">Contents</a> | <a href=
     "magick.html">Next</a>&nbsp;&raquo;
   </div>
@@ -210,8 +210,7 @@ thumb.write "thumb.gif"
   "constants.html#ColorspaceType">Magick::GRAYColorspace</a>
   argument. If you want real "grayscale," quantize the image to 256
   colors. If you want to convert a color image to black-and-white,
-  use 2 colors. See <a href=
-  "javascript:popup('demo.rb.html')">demo.rb</a>.</p>
+  use 2 colors. (See the <code>demo.rb</code> example.)</p>
 
   <h2 id="compressing">Compressing image files</h2>
 
@@ -259,7 +258,7 @@ img.write("myimage.jpg") { self.quality = 50 }
   <p class="spacer"> </p>
 
   <div class="nav">
-    &laquo; <a href="imusage.html">Prev</a> | <a href=
+    &laquo; <a href="optequiv.html">Prev</a> | <a href=
     "index.html">Contents</a> | <a href="magick.html">Next</a>
     &raquo;
   </div>

data/doc/constants.html

@@ -113,16 +113,19 @@
 
         <li><a href="#InterlaceType">InterlaceType</a></li>
 
+        <li><a href=
+        "#InterpolatePixelMethod">InterpolatePixelMethod</a></li>
+
         <li><a href="#MetricType">MetricType</a></li>
 
         <li><a href="#NoiseType">NoiseType</a></li>
-
-        <li><a href="#Opacity">Opacity</a></li>
       </ul>
     </div>
 
     <div class="toccol">
       <ul>
+        <li><a href="#Opacity">Opacity</a></li>
+
         <li><a href="#OrientationType">OrientationType</a></li>
 
         <li><a href="#PaintMethod">PaintMethod</a></li>
@@ -152,7 +155,7 @@
 
     <dd>An extended form of the <code>Version</code> constant with
     the format shown here:<br />
-    <code>This is RMagick 1.10.0 ($Date: 2006/01/28 23:40:31 $)
+    <code>This is RMagick 1.10.0 ($Date: 2006/09/27 21:26:56 $)
     Copyright (C) 2006 by Timothy P. Hunter<br />
     Built with GraphicsMagick 1.2 unreleased Q16
     http://www.GraphicsMagick.org/<br />
@@ -238,7 +241,8 @@
   <h3 class="const" id="ChannelType">ChannelType</h3>
 
   <p>Specify an image channel. See <a href=
-  "image1.html#channel">channel</a>.</p>
+  "image1.html#channel">Image#channel</a> and <a href=
+  "info.html#channel">Image::Info#channel=</a>.</p>
 
   <dl>
     <dt>UndefinedChannel</dt>
@@ -262,6 +266,20 @@
     <dt>AllChannels</dt>
 
     <dt>GrayChannel</dt>
+
+    <dt>AlphaChannel</dt>
+
+    <dd>Same as OpacityChannel</dd>
+
+    <dt>DefaultChannels</dt>
+
+    <dd>Same as AllChannels, excluding OpacityChannel</dd>
+
+    <dt>HueChannel</dt>
+
+    <dt>LuminosityChannel</dt>
+
+    <dt>SaturationChannel</dt>
   </dl>
 
   <h3 class="const" id="ClassType">ClassType</h3>
@@ -334,8 +352,6 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
 
     <dt>OHTAColorspace</dt>
 
-    <dd>&nbsp;</dd>
-
     <dt>XYZColorspace</dt>
 
     <dd>CIE XYZ</dd>
@@ -346,16 +362,10 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
 
     <dt>YCbCrColorspace</dt>
 
-    <dd>&nbsp; </dd>
-
     <dt>YIQColorspace</dt>
 
-    <dd>&nbsp; </dd>
-
     <dt>YPbPrColorspace</dt>
 
-    <dd>&nbsp; </dd>
-
     <dt>YUVColorspace</dt>
 
     <dd class="imquote">Y-signal, U-signal, and V-signal
@@ -385,19 +395,14 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
 
     <dt>HSBColorspace</dt>
 
-    <dd>&nbsp; </dd>
-
     <dt>LogColorspace</dt>
 
-    <dd>&nbsp; </dd>
-
     <dt>LABColorspace</dt>
-
-    <dd>&nbsp; </dd>
   </dl>
 
-  <p>The colorspaces in this group are typically associated with the DPX
-  and Cineon image formats used in the motion picture industry.</p>
+  <p>The colorspaces in this group are typically associated with
+  the DPX and Cineon image formats used in the motion picture
+  industry.</p>
 
   <dl>
     <dt>CineonLogRGBColorspace</dt>
@@ -544,8 +549,7 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
     <dt>ReplaceCompositeOp</dt>
 
     <dd class="imquote">The resulting image is image replaced with
-    composite image. Here the matte information is ignored.
-    </dd>
+    composite image. Here the matte information is ignored.</dd>
 
     <dt>CopyCompositeOp</dt>
 
@@ -582,27 +586,24 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
 
     <dt>DissolveCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
+    <dd>The operator used in the <a href=
+    "image1.html#dissolve">dissolve</a> method.</dd>
 
     <dt>DisplaceCompositeOp</dt>
 
     <dd>Displace target image pixels as defined by a displacement
-    map. The amount of displacement can be controlled via the
-    <a href="imageattrs.html#geometry">geometry</a> attribute of
-    the composite image. The default is "20x20".</dd>
+    map. The operator used by the <a href=
+    "image1.html#displace">Image#displace</a> method.</dd>
 
     <dt>ModulateCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
+    <dd>Used by the <a href="image3.html#watermark">watermark</a>
+    method.</dd>
 
     <dt>ThresholdCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
-
     <dt>NoCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
-
     <dt>DarkenCompositeOp</dt>
 
     <dd>Replace target image pixels with darker pixels from the
@@ -646,83 +647,77 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
 
     <dt>OverlayCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
-
     <dt>CopyCyanCompositeOp</dt>
 
     <dd>Copy the cyan channel from the composite image to the
-    target image. </dd>
+    target image.</dd>
 
     <dt>CopyMagentaCompositeOp</dt>
 
     <dd>Copy the magenta channel from the composite image to the
-    target image. </dd>
+    target image.</dd>
 
     <dt>CopyYellowCompositeOp</dt>
 
     <dd>Copy the yellow channel from the composite image to the
-    target image. </dd>
+    target image.</dd>
 
     <dt>CopyBlackCompositeOp</dt>
 
     <dd>Copy the black channel from the composite image to the
-    target image. </dd>
+    target image.</dd>
 
     <dt>DstAtopCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
-
     <dt>DstCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
-
     <dt>DstInCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
-
     <dt>DstOutCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
-
     <dt>DstOverCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
-
     <dt>SrcAtopCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
-
     <dt>SrcCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
-
     <dt>SrcInCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
-
     <dt>SrcOutCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
-
     <dt>SrcOverCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
-
     <dt>ColorDodgeCompositeOp</dt>
 
-    <dd class="imquote">Brightens the destination color to reflect the source color. Painting with black produces no change.</dd>
+    <dd class="imquote">Brightens the destination color to reflect
+    the source color. Painting with black produces no change.</dd>
 
     <dt>ExclusionCompositeOp</dt>
 
-    <dd>&nbsp;</dd>
-
     <dt>HardLightCompositeOp</dt>
 
-    <dd class="imquote">Multiplies or screens the colors, dependent on the source color value. If the source color is lighter than 0.5, the destination is lightened as if it were screened. If the source color is darker than 0.5, the destination is darkened, as if it were multiplied. The degree of lightening or darkening is proportional to the difference between the source color and 0.5. If it is equal to 0.5 the destination is unchanged. Painting with pure black or white produces black or white.</dd>
+    <dd class="imquote">Multiplies or screens the colors, dependent
+    on the source color value. If the source color is lighter than
+    0.5, the destination is lightened as if it were screened. If
+    the source color is darker than 0.5, the destination is
+    darkened, as if it were multiplied. The degree of lightening or
+    darkening is proportional to the difference between the source
+    color and 0.5. If it is equal to 0.5 the destination is
+    unchanged. Painting with pure black or white produces black or
+    white.</dd>
 
     <dt>SoftLightCompositeOp</dt>
 
-    <dd class="imquote">Darkens or lightens the colors, dependent on the source color value. If the source color is lighter than 0.5, the destination is lightened. If the source color is darker than 0.5, the destination is darkened, as if it were burned in. The degree of darkening or lightening is proportional to the difference between the source color and 0.5. If it is equal to 0.5, the destination is unchanged. Painting with pure black or white produces a distinctly darker or lighter area, but does not result in pure black or white.</dd>
+    <dd class="imquote">Darkens or lightens the colors, dependent
+    on the source color value. If the source color is lighter than
+    0.5, the destination is lightened. If the source color is
+    darker than 0.5, the destination is darkened, as if it were
+    burned in. The degree of darkening or lightening is
+    proportional to the difference between the source color and
+    0.5. If it is equal to 0.5, the destination is unchanged.
+    Painting with pure black or white produces a distinctly darker
+    or lighter area, but does not result in pure black or
+    white.</dd>
   </dl>
 
   <h3 class="const" id="CompressionType">CompressionType</h3>
@@ -747,7 +742,7 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
     <dt>BZipCompression</dt>
 
     <dd class="imquote">BZip (Burrows-Wheeler block-sorting text
-    compression algorithm and Huffman coding)  as used by bzip2
+    compression algorithm and Huffman coding) as used by bzip2
     utilities</dd>
 
     <dt>FaxCompression</dt>
@@ -1001,11 +996,7 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
 
     <dt>ColorSeparationMatteType</dt>
 
-    <dd> </dd>
-
     <dt>OptimizeType</dt>
-
-    <dd> </dd>
   </dl>
 
   <h3 class="const" id="InterlaceType">InterlaceType</h3>
@@ -1048,6 +1039,33 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
     image.R, image.G, and image.B)</dd>
   </dl>
 
+  <h3 class="const" id="InterpolatePixelMethod">
+  InterpolatePixelMethod</h3>
+
+  <p>The pixel color interpolation method. See <a href=
+  "imageattrs.html#pixel_interpolation_method">pixel_interpolation_method</a>.</p>
+
+  <dl>
+    <dt>AverageInterpolatePixel</dt>
+
+    <dt>BicubicInterpolatePixel</dt>
+
+    <dt>BilinearInterpolatePixel</dt>
+
+    <dt>FilterInterpolatePixel</dt>
+
+    <dt>IntegerInterpolatePixel</dt>
+
+    <dt>MeshInterpolatePixel</dt>
+
+    <dt>NearestNeighborInterpolatePixel</dt>
+  </dl>
+
+  <p>For FilterInterpolatePixel, specify the filter with the
+  <a href="imageattrs.html#filter">filter</a> attribute. Specify
+  the sharpness with the <a href="imageattrs.html#blur">blur</a>
+  attribute.</p>
+
   <h3 class="const" id="MetricType">MetricType</h3>
 
   <p>The distortion metric type. See <a href=