rmagick 1.14.1 → 1.15.0

data/configure.ac

@@ -1,7 +1,7 @@
 
 # RMagick configure.ac
 
-AC_INIT(RMagick, 1.14.1, rmagick@rubyforge.org, RMagick-1.14.1.tar.gz)
+AC_INIT(RMagick, 1.15.0, rmagick@rubyforge.org, RMagick-1.15.0.tar.gz)
 echo "Configuring ${PACKAGE_STRING}"
 
 AC_CONFIG_HEADER([ext/RMagick/rmagick_config.h])
@@ -77,9 +77,6 @@ AC_SUBST(MAGICKNAME)
 AC_SUBST(MAGICKCONFIG)
 AC_DEFINE_UNQUOTED(MAGICKNAME, $MAGICKNAME)
 
-AC_CHECK_HEADER(magick/api.h, [],
-    [AC_MSG_ERROR([Can't find magick/api.h])])
-
 # What standard functions?
 AC_CHECK_FUNCS([snprintf])
 
@@ -104,8 +101,8 @@ AC_CHECK_FUNCS([AddNoiseImageChannel BilevelImageChannel BlackThresholdImage])
 AC_CHECK_FUNCS([BlurImageChannel ClearMagickException CompareImageChannels])
 AC_CHECK_FUNCS([CompareImageLayers CompositeImageChannel ContrastStretchImageChannel])
 AC_CHECK_FUNCS([ConvolveImageChannel EvaluateImageChannel ExportImagePixels])
-AC_CHECK_FUNCS([FuzzyColorCompare GammaImageChannel GaussianBlurImageChannel])
-AC_CHECK_FUNCS([GetColorHistogram GetColorInfoArray])
+AC_CHECK_FUNCS([FuzzyColorCompare FxImageChannel GammaImageChannel])
+AC_CHECK_FUNCS([GaussianBlurImageChannel GetColorHistogram GetColorInfoArray])
 
 # We need to be able to query these symbols later in the configure script, so set a shell
 # variable here as well as defining symbols.
@@ -156,11 +153,12 @@ fi
 
 AC_CHECK_FUNCS([GrayscalePseudoClassImage ImagesToBlob ImportImagePixels])
 AC_CHECK_FUNCS([InheritException InterpolatePixelColor InterpretImageAttributes IsColorSimilar])
-AC_CHECK_FUNCS([IsImageSimilar NegateImageChannel])
-AC_CHECK_FUNCS([NormalizeImageChannel ParseSizeGeometry PosterizeImage PreviewImage])
+AC_CHECK_FUNCS([IsImageSimilar LinearStretchImage NegateImageChannel])
+AC_CHECK_FUNCS([NormalizeImageChannel OrderedPosterizeImageChannel])
+AC_CHECK_FUNCS([ParseSizeGeometry PolaroidImage PosterizeImage PreviewImage])
 AC_CHECK_FUNCS([QuantumOperatorRegionImage RadialBlurImage RadialBlurImageChannel])
 AC_CHECK_FUNCS([RandomChannelThresholdImage RandomThresholdImageChannel])
-AC_CHECK_FUNCS([SeparateImageChannel SepiaToneImage])
+AC_CHECK_FUNCS([RecolorImage SeparateImageChannel SepiaToneImage])
 AC_CHECK_FUNCS([SetImageBackgroundColor SetImageChannelDepth SetImageColorspace SetImageExtent])
 AC_CHECK_FUNCS([SetImageInfoFile SetImageOption SetImageStorageClass])
 AC_CHECK_FUNCS([SetImageProgressMonitor ShadowImage SharpenImageChannel])
@@ -355,21 +353,6 @@ if test "$rm_cv_enum_logcolorspace" = yes; then
   AC_DEFINE(HAVE_LOGCOLORSPACE)
 fi
 
-AC_CACHE_CHECK(for CopyCyanCompositeOp enum value, rm_cv_enum_copycyancompositeop,
-  [AC_TRY_COMPILE(
-[#include <stdio.h>
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#include "magick/api.h"],
-     [CompositeOperator x; x = CopyCyanCompositeOp],
-     rm_cv_enum_copycyancompositeop='yes',
-     rm_cv_enum_copycyancompositeop='no')])
-
-if test "$rm_cv_enum_copycyancompositeop" = yes; then
-  AC_DEFINE(HAVE_COPYCYANCOMPOSITEOP)
-fi
-
 AC_CACHE_CHECK(for ReplaceCompositeOp enum value, rm_cv_enum_replacecompositeop,
   [AC_TRY_COMPILE(
 [#include <stdio.h>
@@ -549,6 +532,21 @@ if test "$rm_cv_enum_maxevaluateoperator" = yes; then
   AC_DEFINE(HAVE_MAXEVALUATEOPERATOR)
 fi
 
+AC_CACHE_CHECK(for PaletteBilevelMatteType enum value, rm_cv_enum_palettebilevelmattetype,
+  [AC_TRY_COMPILE(
+[#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include "magick/api.h"],
+     [ImageType x; x = PaletteBilevelMatteType],
+     rm_cv_enum_palettebilevelmattetype='yes',
+     rm_cv_enum_palettebilevelmattetype='no')])
+
+if test "$rm_cv_enum_palettebilevelmattetype" = yes; then
+  AC_DEFINE(HAVE_PALETTEBILEVELMATTETYPE)
+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

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
 
-  <title>RMagick: Common Tasks</title>
+  <title>RMagick 1.15.0: Common Tasks</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -31,7 +31,7 @@
 </head>
 
 <body>
-  <h6 id="header">RMagick User's Guide and Reference</h6>
+  <h6 id="header">RMagick 1.15.0 User's Guide and Reference</h6>
 
   <div class="nav">
     &laquo;&nbsp;<a href="optequiv.html">Prev</a> | <a href=

data/doc/constants.html

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
 
-  <title>RMagick: Constants</title>
+  <title>RMagick 1.15.0: Constants</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -61,7 +61,7 @@
 </head>
 
 <body>
-  <h6 id="header">RMagick User's Guide and Reference</h6>
+  <h6 id="header">RMagick 1.15.0 User's Guide and Reference</h6>
 
   <div class="nav">
     &laquo;&nbsp;<a href="info.html">Prev</a> | <a href=
@@ -155,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/09/27 21:26:56 $)
+    <code>This is RMagick 1.10.0 ($Date: 2007/01/14 23:57:19 $)
     Copyright (C) 2006 by Timothy P. Hunter<br />
     Built with GraphicsMagick 1.2 unreleased Q16
     http://www.GraphicsMagick.org/<br />
@@ -186,9 +186,6 @@
       QuantumDepth and MaxRGB is summarized in this table.
 
       <table summary="number of bits in a quantum" id="maxrgb">
-        <caption>
-          How MaxRGB and QuantumDepth are related
-        </caption>
 
         <tr>
           <th>QuantumDepth</th>
@@ -997,6 +994,8 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
     <dt>ColorSeparationMatteType</dt>
 
     <dt>OptimizeType</dt>
+
+    <dt>PaletteBilevelMatteType</dt>
   </dl>
 
   <h3 class="const" id="InterlaceType">InterlaceType</h3>

data/doc/draw.html

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
 
-  <title>RMagick: class Draw</title>
+  <title>RMagick 1.15.0: class Draw</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -25,7 +25,7 @@
 </head>
 
 <body>
-  <h6 id="header">RMagick User's Guide and Reference</h6>
+  <h6 id="header">RMagick 1.15.0 User's Guide and Reference</h6>
 
   <div class="nav">
     &laquo;&nbsp;<a href="image3.html">Prev</a> | <a href=
@@ -272,7 +272,9 @@ gc = Draw.new
     <h3 id="annotate">annotate</h3>
 
     <p><span class="arg">draw.</span>annotate(<span class=
-    "arg">img, x_rotate, y_rotate, x, y, text</span>) <span class=
+    "arg">img</span>, <span class="arg">width</span>, <span class=
+    "arg">height</span>, <span class="arg">x</span>, <span class=
+    "arg">y</span>, <span class="arg">text</span>) <span class=
     "arg">[&nbsp;{ additional parameters }&nbsp;]</span> -&gt;
     <em>draw</em></p>
   </div>
@@ -281,12 +283,15 @@ gc = Draw.new
     <h4>Description</h4>
 
     <p>Annotates a image with text. The text is positioned
-    according to the <code>gravity</code> attribute, starting
-    <span class="arg">x</span> pixels from the left and with its
-    baseline at <span class="arg">y</span>. The <span class=
-    "arg">x_rotate</span> and <span class="arg">y_rotate</span>
-    arguments specify a rotation in degrees on the x-axis and
-    y-axis, respectively. The attributes described in <a href=
+    according to the <code>gravity</code> attribute around the
+    rectangle described by the <span class="arg">x</span>,
+    <span class="arg">y</span>, <span class="arg">width</span>, and
+    <span class="arg">height</span> arguments. If either of the
+    <span class="arg">width</span> or <span class=
+    "arg">height</span> arguments are 0, uses the image
+    width-<span class="arg">x</span> and the image
+    height-<span class="arg">y</span> to compute the rectangle
+    width and height. The attributes described in <a href=
     "#attributes">annotate attributes</a>, below, influence the
     appearance and position of the text. These attributes may be
     set in the Draw object before calling <code>annotate</code>, or
@@ -303,13 +308,15 @@ gc = Draw.new
 
       <dd>the image or imagelist to be annotated</dd>
 
-      <dt>x-rotate</dt>
+      <dt>width</dt>
 
-      <dd>rotation on the x-axis, in degrees</dd>
+      <dd>width of the rectangle within which the text is
+      positioned</dd>
 
-      <dt>y-rotate</dt>
+      <dt>height</dt>
 
-      <dd>rotation on the y-axis, in degrees</dd>
+      <dd>height of the rectangle within which the text is
+      positioned</dd>
 
       <dt>x</dt>
 
@@ -1038,7 +1045,19 @@ draw.inspect &raquo;
     masked.</p>
 
     <p>Before using a clip-path, you must create it using the
-    <a href="#define_clip_path">define_clip_path</a> method.</p>
+    <a href="#define_clip_path">define_clip_path</a> method. You
+    must precede <code>clip_path</code> with <a href=
+    "#push">push</a> and terminate the primitives that draw within
+    the clip path with <a href="#pop">pop</a>. For example,</p>
+    <pre>
+gc.push
+gc.clip_path('mypath')
+# drawing primitives within the clip path
+gc.pop
+gc.draw
+</pre>
+
+    <p>Also see the example below.</p>
 
     <h4>Arguments</h4>
 

data/doc/ex/clip_path.rb

@@ -15,6 +15,7 @@ pr.define_clip_path('example') {
     }
 
 # Enable the clip-path
+pr.push
 pr.clip_path('example')
 
 # Composite the Flower Hat image over
@@ -34,6 +35,8 @@ girl.change_geometry("290") do |c,r|
     rows = r
 end
 
+pr.pop
+
 # Create a canvas to draw on, a bit bigger than the star.
 canvas = Magick::Image.new(cols, rows)
 

data/doc/ex/path.rb

@@ -39,7 +39,7 @@ gc.stroke_width 3
 gc.circle 170,220, 173,223
 
 # Add labels
-gc.stroke "#000000ff"       # unset stroke color
+gc.stroke "none"       # unset stroke color
 gc.fill 'black'
 
 # Add end point labels

data/doc/ex/polaroid.rb

@@ -0,0 +1,23 @@
+#! /usr/local/bin/ruby -w
+require 'RMagick'
+require 'date'
+
+# Demonstrate the Image#polaroid method
+
+img = Magick::Image.read('images/Flower_Hat.jpg').first
+img[:Caption] = "\nLosha\n" + Date.today.to_s
+
+begin
+    picture = img.polaroid { self.gravity = Magick::CenterGravity }
+
+    # Composite it on a white background so the result is opaque.
+    background = Magick::Image.new(picture.columns, picture.rows)
+    result = background.composite(picture, Magick::CenterGravity, Magick::OverCompositeOp)
+
+rescue NotImplementedError
+    result = Magick::Image.read('images/notimplemented.gif').first
+    result.resize!(img.columns, img.rows)
+end
+
+
+result.write('polaroid.jpg')

data/doc/ex/tspan01.rb

@@ -6,8 +6,8 @@ rvg = Magick::RVG.new(10.cm, 3.cm).viewbox(0,0,1000,300) do |canvas|
     canvas.background_fill = 'white'
     canvas.desc = "Example tspan01 - using tspan to change visual attributes"
     canvas.g.styles(:font_family=>'Verdana', :font_size=>45) do |grp|
-        grp.text(200, 150, "You are ").styles(:fill=>'blue') do |txt|
-            txt.tspan("not").styles(:font_weight=>'bold', :fill=>'red')
+        grp.text(200, 150, "You are").styles(:fill=>'blue') do |txt|
+            txt.tspan(" not").styles(:font_weight=>'bold', :fill=>'red')
             txt.tspan(" a banana")
         end
     end

data/doc/ex/tspan02.rb

@@ -8,8 +8,8 @@ rvg = Magick::RVG.new(10.cm, 3.cm).viewbox(0,0,1000,300) do |canvas|
     canvas.desc = "Example tspan02 - using tspan's dx and dy attributes for incremental positioning adjustments"
     canvas.g.styles(:font_family=>'Verdana', :font_size=>45) do |_g|
         _g.text(200, 150, "But you").styles(:fill=>'blue') do |txt|
-            txt.tspan("are ").d(100, -50).styles(:font_weight=>'bold', :fill=>'red')
-            txt.tspan("a peach!").d(0, 100)
+            txt.tspan("are").d(100, -50).styles(:font_weight=>'bold', :fill=>'red')
+            txt.tspan(" a peach!").d(0, 100)
         end
     end
     canvas.rect(996, 296, 1, 1).styles(:fill=>'none', :stroke=>'blue')

data/doc/ex/tspan03.rb

@@ -7,9 +7,9 @@ rvg = Magick::RVG.new(10.cm, 3.cm).viewbox(0,0,1000,300) do |canvas|
 
     canvas.g.translate(100, 60) do |grp|
         grp.text.styles(:font_family=>'Verdana', :font_size=>45) do |txt|
-            txt.tspan("Rotation ")
-            txt.tspan("propogates ").rotate(20).styles(:fill=>'red') do |tsp|
-                tsp.tspan("to descendents").styles(:fill=>'green')
+            txt.tspan("Rotation")
+            txt.tspan(" propogates").rotate(20).styles(:fill=>'red') do |tsp|
+                tsp.tspan(" to descendents").styles(:fill=>'green')
             end
         end
     end

data/doc/ex/wet_floor.rb

@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby
+
+require 'RMagick'
+
+
+results = Magick::ImageList.new
+
+img = Magick::Image.new(270, 60)
+
+gc = Magick::Draw.new
+gc.annotate(img, 0, 0, 0, -25, "RUBY!") do
+    gc.fill = '#c00'
+    gc.stroke = 'black'
+    gc.stroke_width = 2
+    gc.pointsize = 80
+    gc.font_weight = Magick::BoldWeight
+    gc.font_family = 'times'
+    gc.gravity = Magick::SouthGravity
+end
+
+# Add a little bit of shading
+if Magick.const_defined? "HardLightCompositeOp"
+    shade = img.shade(true, 310, 30)
+    img.composite!(shade, Magick::CenterGravity, Magick::HardLightCompositeOp)
+end
+
+# Create the default reflection
+reflection = img.wet_floor
+
+ilist = Magick::ImageList.new
+ilist << img << reflection
+results << ilist.append(true)
+
+# Change the initial level of transparency and the rate of transition
+ilist[1] = img.wet_floor(0.25, 0.5)
+results << ilist.append(true)
+
+# Add a slant
+xform = Magick::AffineMatrix.new(1.0, 0.0, Math::PI/4.0, 1.0, 0.0, 0.0)
+ilist[1] = ilist[1].affine_transform(xform)
+results << ilist.append(true)
+
+# Add a ripple
+ilist[1] = ilist[1].rotate(90).wave(2, 20).rotate(-90)
+results << ilist.append(true)
+
+# Montage into a single demo image. Use a white background so
+# there won't be any problems with transparency in the browser.
+result = results.montage do
+    self.geometry = '270x120'
+    self.tile = '1x4'
+    self.background_color = 'white'
+end
+result.write('wet_floor.gif')

data/doc/ilist.html

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
 
-  <title>RMagick: class ImageList</title>
+  <title>RMagick 1.15.0: class ImageList</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -20,7 +20,7 @@
 </head>
 
 <body>
-  <h6 id="header">RMagick User's Guide and Reference</h6>
+  <h6 id="header">RMagick 1.15.0 User's Guide and Reference</h6>
 
   <div class="nav">
     &laquo;&nbsp;<a href="magick.html">Prev</a> | <a href=
@@ -91,18 +91,20 @@
 
         <li><a href="#from_blob">from_blob</a></li>
 
+        <li><a href="#fx">fx</a></li>
+
         <li><a href="#inspect">inspect</a></li>
 
         <li><a href="#map">map</a></li>
 
         <li><a href="#montage">montage</a></li>
-
-        <li><a href="#morph">morph</a></li>
       </ul>
     </div>
 
     <div class="toccol">
       <ul>
+        <li><a href="#morph">morph</a></li>
+
         <li><a href="#mosaic">mosaic</a></li>
 
         <li><a href="#new_image">new_image</a></li>
@@ -860,6 +862,83 @@ ilist.display
     <p>BlobToImageList</p>
   </div>
 
+  <div class="sig">
+    <h3 id="fx">fx</h3>
+
+    <p>imagelist.fx(expression [, channel...]) -&gt; anImage</p>
+  </div>
+
+  <div class="desc">
+    <h4>Description</h4>
+
+    <p>Applies the specified mathematical expression to the input
+    images. This method corresponds to ImageMagick's <a href=
+    "http://redux.imagemagick.org/script/fx.php">-fx</a>
+    operator.</p>
+
+    <h4>Arguments</h4>
+
+    <dl>
+      <dt>expression</dt>
+
+      <dd>A mathematical expression of the form accepted by the -fx
+      operator..</dd>
+
+      <dt>channel...</dt>
+
+      <dd>0 or more <a href=
+      "constants.html#ChannelType">ChannelType</a> arguments.
+      Specify the output channels. If no channels are specified the
+      result is set over all channels except the opacity
+      channel.</dd>
+    </dl>
+
+    <h4>Notes</h4>
+
+    <ul>
+      <li>Fx expressions are interpreted. Therefore this method can
+      be quite slow depending on the complexity of the expression.
+      Generally you will get better performance by accessing the
+      image pixels as <a href="struct.html#Pixel">Pixel</a> objects
+      (see <a href="image2.html#get_pixel">get_pixel</a> and
+      <a href="image3.html#view">view</a>) and using Ruby code to
+      perform the mathematics.</li>
+
+      <li>The <code>u</code> and <code>v</code> symbols refer to
+      the 0th and 1st image in the list. The image reference index
+      (<code>u[2]</code> for example) works as expected. The
+      current <a href="#scene">scene number</a> has no meaning in
+      the context of the <code>fx</code> method.</li>
+
+      <li>To specify a non-default pixel interpolation method, set
+      the <a href=
+      "imageattrs.html#pixel_interpolation_method">pixel_interpolation_method</a>
+      attribute of the last image in the list.</li>
+    </ul>
+
+    <h4>Returns</h4>
+
+    <p>The image created by the expression.</p>
+
+    <h4>Example</h4>
+    <pre>
+# Produce a navy blue image from a black image
+imgl = Magick::ImageList.new
+imgl &lt;&lt; Magick::Image.new(64, 64) {self.background_color = 'black'}
+
+res = imgl.fx('1/2', Magick::BlueChannel)
+</pre>
+
+    <h4>ImageMagick API</h4>
+
+    <p>FxImageChannel</p>
+
+    <h4>See also</h4>
+
+    <p><a href="image2.html#get_pixel">get_pixel</a>, <a href=
+    "image3.html#view">view</a></p>
+  </div>
+
   <div class="sig">
     <h3 id="inspect">inspect</h3>