rmagick 1.13.0 → 1.14.0

data/doc/draw.html

@@ -231,6 +231,8 @@
 
         <li><a href="#text_antialias_eq">text_antialias</a></li>
 
+        <li><a href="#tile_eq">tile</a></li>
+
         <li><a href="#undercolor_eq">undercolor</a></li>
       </ul>
     </div>
@@ -3079,6 +3081,26 @@ gc.text(10,10, %q/{"What's up?"}/) &raquo; "What's up?"
     <p>self</p>
   </div>
 
+  <div class="sig">
+    <h3 id="tile_eq">tile=</h3>
+
+    <p><span class="arg">draw</span>.tile = <em>anImage</em></p>
+  </div>
+
+  <div class="desc">
+    <h4>Description</h4>
+
+    <p>Tile image when filling a graphic primitive.</p>
+
+    <h4>Arguments</h4>
+
+    <p>An image</p>
+
+    <h4>Returns</h4>
+
+    <p>self</p>
+  </div>
+
   <div class="sig">
     <h3 id="undercolor_eq">undercolor=</h3>
 

data/doc/ex/dissolve.rb

@@ -0,0 +1,13 @@
+#! /usr/local/bin/ruby -w
+
+require 'RMagick'
+
+bgnd = Magick::Image.read('images/Violin.jpg').first
+overlay = Magick::Image.read('images/Flower_Hat.jpg').first
+
+# Make the violin image the same size as the hat image
+bgnd.crop_resized!(overlay.columns, overlay.rows)
+
+composited = bgnd.dissolve(overlay, 0.50)
+composited.write('dissolve.jpg')
+

data/doc/ex/edge.rb

@@ -4,7 +4,7 @@ require 'RMagick'
 # Demonstrate the Image#edge method
 
 img = Magick::Image.read('images/Flower_Hat.jpg').first
-
+img = img.quantize(256, Magick::GRAYColorspace)
 img = img.edge(5)
 
 img.write('edge.jpg')

data/doc/ex/mask.rb

@@ -0,0 +1,37 @@
+#! /usr/local/bin/ruby -w
+
+require 'RMagick'
+
+# This example demonstrates the mask attribute. The mask image must
+# be the same size as the image being masked. Since this mask image does
+# not have an alpha channel, the intensity of each pixel is used to define the
+# mask. White pixels are more intense than black pixels, so the area of the
+# image masked by white pixels will remain unchanged, while the area of the
+# image masked by black pixels is affected by any transformations.
+
+# In this example the mask is simply the words "Flower Hat" in black text
+# positioned near the bottom of the white clip mask image.
+
+img = Magick::Image.read("images/Flower_Hat.jpg").first
+q = Magick::Image.new(img.columns, img.rows)
+
+gc = Magick::Draw.new
+gc.annotate(q, 0, 0, 0, 0, "Flower Hat") do
+    gc.gravity = Magick::SouthGravity
+    gc.font_family = "Helvetica"
+    gc.pointsize = 36
+    gc.font_weight = Magick::BoldWeight
+end
+
+# Set the matte attribute to false, indicating the absence of an alpha channel
+# in the mask image. Assign the mask image to the mask= attribute of the image 
+# being masked.
+
+q.matte = false
+img.mask = q
+
+# Use the #level method to darken the image under the black part of the mask.
+
+img = img.level(0, Magick::MaxRGB, 0.50)
+img.write('mask.jpg')
+

data/doc/ex/sketch.rb

@@ -0,0 +1,25 @@
+#! /usr/local/bin/ruby -w
+
+require 'RMagick'
+
+img = Magick::Image.read('images/Flower_Hat.jpg').first
+
+# Convert to grayscale
+sketch = img.quantize(256, Magick::GRAYColorspace)
+
+# Apply histogram equalization
+sketch = sketch.equalize
+
+# Sketch, then dissolve 25% of the original back in
+begin
+    sketch = sketch.sketch(0, 10, 135)
+    img = img.dissolve(sketch, 0.75, 0.25)
+
+rescue NotImplementedError
+    not_impl = Magick::Image.read('images/notimplemented.gif').first
+    not_impl.resize!(img.columns, img.rows)
+    img = not_impl
+end
+
+img.write('sketch.jpg')
+

data/doc/ex/watermark.rb

@@ -0,0 +1,23 @@
+#! /usr/local/bin/ruby -w
+
+require "RMagick"
+
+img = Magick::Image.read("images/Flower_Hat.jpg").first
+
+# Make a watermark from the word "RMagick"
+mark = Magick::Image.new(140, 40) {self.background_color = "none"}
+gc = Magick::Draw.new
+gc.annotate(mark, 0, 0, 0, -5, "RMagick") do
+    gc.gravity = Magick::CenterGravity
+    gc.pointsize = 32
+    gc.font_family = "Times"
+    gc.fill = "white"
+    gc.stroke = "none"
+end
+
+mark = mark.wave(2.5, 70).rotate(-90)
+
+# Composite the watermark in the lower right (southeast) corner.
+img2 = img.watermark(mark, 0.25, 0, Magick::SouthEastGravity)
+img2.write("watermark.jpg")
+

data/doc/ilist.html

@@ -383,8 +383,8 @@ imagelist.ticks_per_second = 1000
     <h4>Example</h4>
 
     <p>Add noise to a model image. Append the resulting image to
-    the imagelist in "example". (See: <a href=
-    "javascript:popup('demo.rb.html')">demo.rb</a>)</p>
+    the imagelist in "example". (See the <code>demo.rb</code>
+    example.)</p>
     <pre>
 example = Magick::ImageList.new
 model = Magick::ImageList.new "model.miff"
@@ -533,16 +533,17 @@ imagelist.animate { self.server_name = "other:0.0" }
      <img style="display:none" id="notaveraged" onmouseout=
     "this.style.display='none'; averaged.style.display=''; averagedspin.style.display='';"
     title="Click to see the example script" src=
-    "ex/average_before.gif" alt="average example"  /><!--
+    "ex/average_before.gif" alt="average example"
+     /><!--
                                   This img tag displays the averaged image when the mouse is not over
                                   --><img style="display:" id=
 "averaged" onmouseover=
 "this.style.display='none'; notaveraged.style.display=''; averagedspin.style.display='none';"
     src="ex/average_after.gif" alt="average example"
-    /></a> <img src="ex/images/spin.gif" alt="" class=
+     /></a> <img src="ex/images/spin.gif" alt="" class=
     "spin" style="left:131px; display:" id="averagedspin" title=
     "Mouse over the example to see the 3 original images"
-    /></p>
+     /></p>
 
     <h4>Magick API</h4>
 
@@ -1135,6 +1136,10 @@ self.tile = Magick::Geometry.new(4,10)
         on one composite image, <code>montage</code> creates
         multiple composite images.</p>
       </dd>
+
+      <dt>title=</dt>
+
+      <dd>Adds a title over the whole montage.</dd>
     </dl>
 
     <h4>Tile labels</h4>
@@ -1153,12 +1158,6 @@ img[2]['Label'] = "Mom's Birthday"
     <p>An imagelist that contains as many images as are required to
     display all the tiles.</p>
 
-    <h4>Example</h4><a href=
-    "javascript:popup('demo.rb.html')">demo.rb</a>
-
-    <h4>Example</h4><a href=
-    "javascript:popup('demo.rb.html')">demo.rb</a>
-
     <h4>Magick API</h4>
 
     <p>MontageImages</p>
@@ -1580,8 +1579,7 @@ number = '0'
         end
 </pre>
 
-    <p>Also see the <a href="#morph">morph</a> example and <a href=
-    "javascript:popup('demo.rb.html')">demo.rb</a>.</p>
+    <p>Also see the morph.rb example and the demo.rb example.</p>
 
     <h4>See also</h4>
 

data/doc/image1.html

@@ -92,6 +92,13 @@ float: left;
 
           <li><a href="#spaceship">&lt;=&gt;</a></li>
 
+          <li><a href="#adaptive_blur">adaptive_blur</a></li>
+
+          <li><a href=
+          "#adaptive_blur_channel">adaptive_blur_channel</a></li>
+
+          <li><a href="#adaptive_resize">adaptive_resize</a></li>
+
           <li><a href="#adaptive_sharpen">adaptive_sharpen</a></li>
 
           <li><a href=
@@ -102,6 +109,8 @@ float: left;
 
           <li><a href="#add_noise">add_noise</a></li>
 
+          <li><a href="#add_profile">add_profile</a></li>
+
           <li><a href=
           "#add_noise_channel">add_noise_channel</a></li>
 
@@ -117,22 +126,24 @@ float: left;
 
           <li><a href="#black_threshold">black_threshold</a></li>
 
+          <li><a href="#blend">blend</a></li>
+
           <li><a href="#blur_channel">blur_channel</a></li>
 
           <li><a href="#blur_image">blur_image</a></li>
 
           <li><a href="#border">border</a></li>
+        </ul>
+      </div>
 
+      <div class="toccol">
+        <ul>
           <li><a href="#border_bang">border!</a></li>
 
           <li><a href="#change_geometry">change_geometry</a></li>
 
           <li><a href="#changed_q">changed?</a></li>
-        </ul>
-      </div>
 
-      <div class="toccol">
-        <ul>
           <li><a href="#channel">channel</a></li>
 
           <li><a href="#channel_depth">channel_depth</a></li>
@@ -198,19 +209,28 @@ float: left;
 
           <li><a href="#cycle_colormap">cycle_colormap</a></li>
 
+          <li><a href="#delete_profile">delete_profile</a></li>
+
           <li><a href="#despeckle">despeckle</a></li>
 
           <li><a href="#difference">difference</a></li>
 
           <li><a href="#dispatch">dispatch</a></li>
 
+          <li><a href="#displace">displace</a></li>
+
           <li><a href="#display">display</a></li>
 
+          <li><a href="#dissolve">dissolve</a></li>
+
           <li><a href=
           "#distortion_channel">distortion_channel</a></li>
 
           <li><a href="#dup">dup</a></li>
 
+          <li><a href=
+          "#each_iptc_dataset">each_iptc_dataset</a></li>
+
           <li><a href="#each_profile">each_profile</a></li>
 
           <li><a href="#edge">edge</a></li>
@@ -724,6 +744,166 @@ img = Magick::Image.read_inline(content)
     <p>SignatureImage</p>
   </div>
 
+  <div class="sig">
+    <h3 id="adaptive_blur">adaptive_blur</h3>
+
+    <p><span class="arg">image</span>.adaptive_blur(<span class=
+    "arg">radius</span>=0.0, <span class="arg">sigma</span>=1.0)
+    -&gt; <em>anImage</em></p>
+  </div>
+
+  <div class="desc">
+    <h4>Description</h4>
+
+    <p><span class="imquote">Adaptively blurs the image by bluring
+    more intensely near image edges and less intensely far from
+    edges.</span> The adaptive_blur method blurs <span class=
+    "imquote">the image with a Gaussian operator of the
+    given</span> <span class="arg">radius</span> <span class=
+    "imquote">and standard deviation</span> (<span class=
+    "arg">sigma</span>). <span class="imquote">For reasonable
+    results,</span> <span class="arg">radius</span> <span class=
+    "imquote">should be larger than</span> <span class=
+    "arg">sigma</span>. <span class="imquote">Use a</span>
+    <span class="arg">radius</span> <span class="imquote">of 0 and
+    adaptive_blur selects a suitable</span> <span class=
+    "arg">radius</span> <span class="imquote">for you.</span></p>
+
+    <h4>Arguments</h4>
+
+    <dl>
+      <dt>radius</dt>
+
+      <dd><span class="imquote">The radius of the Gaussian in
+      pixels, not counting the center pixel.</span> The default is
+      0.0.</dd>
+
+      <dt>sigma</dt>
+
+      <dd><span class="imquote">The standard deviation of the
+      Laplacian, in pixels.</span> The default is 1.0.</dd>
+    </dl>
+
+    <h4>Returns</h4>
+
+    <p>A new image</p>
+
+    <h4>See also</h4>
+
+    <p><a href=
+    "#adaptive_blur_channel">adaptive_blur_channel</a></p>
+
+    <h4>Magick API</h4>
+
+    <p>AdaptiveBlurImage (available in ImageMagick 6.2.8)</p>
+  </div>
+
+  <div class="sig">
+    <h3 id="adaptive_blur_channel">adaptive_blur_channel</h3>
+
+    <p><span class="arg">image</span>.adaptive_blur(<span class=
+    "arg">radius</span>=0.0, <span class="arg">sigma</span>=1.0
+    [,<span class="arg">channel</span>...]) -&gt;
+    <em>anImage</em></p>
+  </div>
+
+  <div class="desc">
+    <h4>Description</h4>
+
+    <p>The same as <code>adaptive_blur</code> except only the
+    specified channels are blurred.</p>
+
+    <h4>Arguments</h4>
+
+    <dl>
+      <dt>radius</dt>
+
+      <dd><span class="imquote">The radius of the Gaussian in
+      pixels, not counting the center pixel.</span> The default is
+      0.0.</dd>
+
+      <dt>sigma</dt>
+
+      <dd><span class="imquote">The standard deviation of the
+      Laplacian, in pixels.</span> The default is 1.0.</dd>
+
+      <dt>channel...</dt>
+
+      <dd>0 or more <a href=
+      "constants.html#ChannelType">ChannelType</a> arguments. If no
+      channels are specified, blurs all the channels. Specifying no
+      channel arguments has the same effect as the
+      <code>adaptive_blur</code> method, above.</dd>
+    </dl>
+
+    <h4>Returns</h4>
+
+    <p>A new image</p>
+
+    <h4>See also</h4>
+
+    <p><a href="#adaptive_blur">adaptive_blur</a></p>
+
+    <h4>Magick API</h4>
+
+    <p>AdaptiveBlurImageChannel (available in ImageMagick
+    6.2.8)</p>
+  </div>
+
+  <div class="sig">
+    <h3 id="adaptive_resize">adaptive_resize</h3>
+
+    <p><span class="arg">image</span>.adaptive_resize(<span class=
+    "arg">new_width</span>, <span class="arg">new_height</span>)
+    -&gt; <em>anImage</em><br />
+    <span class="arg">image</span>.adaptive_resize(<span class=
+    "arg">scale_factor</span>) -&gt; <span class=
+    "arg">anImage</span></p>
+  </div>
+
+  <div class="desc">
+    <h4>Description</h4>
+
+    <p>Resizes the image with data dependent triangulation.</p>
+
+    <h4>Arguments</h4>
+
+    <p>You can specify the new size in two ways. Either specify the
+    new width and height explicitly, or specify a <em>scale
+    factor</em>, a number that represents the percentage
+    change.</p>
+
+    <p>Use the <a href="#change_geometry">change_geometry</a>
+    method to compute new dimensions for an image with constraints
+    such as "maintain the current proportions."</p>
+
+    <dl>
+      <dt>new_width, new_height</dt>
+
+      <dd>The desired width and height.</dd>
+
+      <dt>scale_factor</dt>
+
+      <dd>You can use this argument instead of specifying the
+      desired width and height. The percentage size change. For
+      example, 1.25 makes the new image 125% of the size of the
+      receiver. The scale factor 0.5 makes the new image 50% of the
+      size of the receiver.</dd>
+    </dl>
+
+    <h4>Returns</h4>
+
+    <p>A new image</p>
+
+    <h4>See also</h4>
+
+    <p><a href="#resize">resize</a></p>
+
+    <h4>Magick API</h4>
+
+    <p>AdaptiveResizeImage (available in ImageMagick 6.2.9)</p>
+  </div>
+
   <div class="sig">
     <h3 id="adaptive_sharpen">adaptive_sharpen</h3>
 
@@ -955,10 +1135,55 @@ img = Magick::Image.read_inline(content)
     <p><a href="#add_noise_channel">add_noise_channel</a></p>
   </div>
 
+  <div class="sig">
+    <h3 id="add_profile">add_profile</h3>
+
+    <p><span class="arg">image</span>.add_profile(<span class=
+    "arg">filename</span>) -&gt; <span class="arg">self</span></p>
+  </div>
+
+  <div class="desc">
+    <h4>Description</h4>
+
+    <p>Adds an ICC (a.k.a. ICM), IPTC, or generic profile. If the
+    file contains more than one profile all the profiles are
+    added.</p>
+
+    <h4>Arguments</h4>
+
+    <p>The filename of a file containing the profile.</p>
+
+    <h4>Returns</h4>
+
+    <p>self</p>
+
+    <h4>Example</h4>
+    <pre>
+    img.add_profile('my_cmyk.icm')
+</pre>
+
+    <h4>See also</h4>
+
+    <p>The <a href="imageattrs.html#iptc_profile">iptc_profile</a>
+    and <a href="imageattrs.html#color_profile">color_profile</a>
+    attributes provide very similar functionality, except that
+    these attributes accept the profile data in the form of a
+    string. The <a href="image3.html#profile_bang">profile!</a>
+    method can also be used to add a profile. The type of profile
+    must be specified and the profile data must be in the form of a
+    string. Also see <a href="#delete_profile">delete_profile</a>
+    and <a href="image1.html#each_profile">each_profile</a>.</p>
+
+    <h4>Magick API</h4>
+
+    <p>ProfileImage</p>
+  </div>
+
   <div class="sig">
     <h3 id="add_noise_channel">add_noise_channel</h3>
 
-    <p>image.add_noise_channel(<span class="arg">noise_type</span>
+    <p><span class=
+    "arg">image</span>.add_noise_channel(<span class="arg">noise_type</span>
     [,<span class="arg">channel</span>...]) -&gt;
     <em>anImage</em></p>
   </div>
@@ -1193,6 +1418,125 @@ img = Magick::Image.read_inline(content)
     <p>BilevelImageChannel</p>
   </div>
 
+  <div class="sig">
+    <h3 id="black_threshold">black_threshold</h3>
+
+    <p><span class="arg">image</span>.black_threshold(<span class=
+    "arg">red_channel</span> [, <span class=
+    "arg">green_channel</span> [, <span class=
+    "arg">blue_channel</span> [, <span class=
+    "arg">opacity_channel</span>]]]) -&gt; <em>anImage</em></p>
+  </div><!-- this example is larger than normal -->
+
+  <div class="desc">
+    <h4>Description</h4>
+
+    <p class="imquote">Forces all pixels below the threshold into
+    black while leaving all pixels above the threshold
+    unchanged.</p>
+
+    <h4>Arguments</h4>
+
+    <p>Each channel argument is a number between 0 and MaxRGB. All
+    arguments except the first may be omitted. If the <span class=
+    "arg">green_channel</span> or <span class=
+    "arg">blue_channel</span> argument is omitted, the default
+    value is the <span class="arg">red_channel</span> value. If the
+    <span class="arg">opacity_channel</span> argument is omitted,
+    the default value is <a href=
+    "constants.html#Opacity">OpaqueOpacity</a>.</p>
+
+    <h4>Returns</h4>
+
+    <p>A new image</p>
+
+    <h4>See also</h4>
+
+    <p><a href="image3.html#white_threshold">white_threshold</a>,
+    <a href="#bilevel_channel">bilevel_channel</a></p>
+
+    <h4>Magick API</h4>
+
+    <p>BlackThresholdImage</p>
+  </div>
+
+  <div class="sig">
+    <h3 id="blend">blend</h3>
+
+    <p><span class="arg">image</span>.blend(<span class=
+    "arg">overlay</span>, <span class="arg">src_percentage</span>,
+    <span class="arg">dst_percentage</span>, <span class=
+    "arg">x_offset</span>=0, <span class="arg">y_offset</span>=0)
+    -&gt; <em>anImage</em><br />
+    <span class="arg">image</span>.blend(<span class=
+    "arg">overlay</span>, <span class="arg">src_percentage</span>,
+    <span class="arg">dst_percentage</span>, <span class=
+    "arg">gravity</span>, <span class="arg">x_offset</span>=0,
+    <span class="arg">y_offset</span>=0) -&gt; <em>anImage</em></p>
+  </div>
+
+  <div class="desc">
+    <h4>Description</h4>
+
+    <p>Adds the <span class="arg">overlay</span> image to the
+    target image according to <span class="arg">src_percent</span>
+    and <span class="arg">dst_percent</span>.</p>
+
+    <p>This method corresponds to the -blend option of
+    &times;Magick's <code>composite</code> command.</p>
+
+    <h4>Arguments</h4>
+
+    <dl>
+      <dt>overlay</dt>
+
+      <dd>The source image for the composite operation. Either an
+      imagelist or an image. If an imagelist, uses the current
+      image.</dd>
+
+      <dt>src_percentage</dt>
+
+      <dd>Either a non-negative number a string in the form "NN%".
+      If <span class="arg">src_percentage</span> is a number it is
+      interpreted as a percentage. Both 0.25 and "25%" mean 25%.
+      This argument is required.</dd>
+
+      <dt>dst_percentage</dt>
+
+      <dd>Either a non-negative number a string in the form "NN%".
+      If <span class="arg">src_percentage</span> is a number it is
+      interpreted as a percentage. Both 0.25 and "25%" mean 25%.
+      This argument may omitted if no other arguments follow it. In
+      this case the default is 100%-<span class=
+      "arg">src_percentage</span>.</dd>
+    </dl>
+
+    <p>The <code>blend</code> method can be called with or without
+    a <span class="arg">gravity</span> argument. The <span class=
+    "arg">gravity</span>, <span class="arg">x_offset</span>, and
+    <span class="arg">y_offset</span> arguments are described in
+    the documentation for <a href=
+    "image3.html#watermark">watermark</a>.</p>
+
+    <h4>Example</h4>
+
+    <p>See <a href=
+    "http://www.cit.gu.edu.au/~anthony/graphics/imagick6/compose/#blend">
+    "Blend Two Images Together"</a> in Anthony Thyssen's
+    <cite><a href=
+    "http://www.cit.gu.edu.au/~anthony/graphics/imagick6/">Examples
+    of ImageMagick Usage</a></cite>.</p>
+
+    <h4>Returns</h4>
+
+    <p>A new image</p>
+
+    <h4>See also</h4>
+
+    <p><a href="#dissolve">dissolve</a>, <a href=
+    "#composite">composite</a></p>
+  </div>
+
   <div class="sig">
     <h3 id="blur_channel">blur_channel</h3>
 
@@ -1295,48 +1639,6 @@ img = Magick::Image.read_inline(content)
     <p>BlurImage</p>
   </div>
 
-  <div class="sig">
-    <h3 id="black_threshold">black_threshold</h3>
-
-    <p><span class="arg">image</span>.black_threshold(<span class=
-    "arg">red_channel</span> [, <span class=
-    "arg">green_channel</span> [, <span class=
-    "arg">blue_channel</span> [, <span class=
-    "arg">opacity_channel</span>]]]) -&gt; <em>anImage</em></p>
-  </div><!-- this example is larger than normal -->
-
-  <div class="desc">
-    <h4>Description</h4>
-
-    <p class="imquote">Forces all pixels below the threshold into
-    black while leaving all pixels above the threshold
-    unchanged.</p>
-
-    <h4>Arguments</h4>
-
-    <p>Each channel argument is a number between 0 and MaxRGB. All
-    arguments except the first may be omitted. If the <span class=
-    "arg">green_channel</span> or <span class=
-    "arg">blue_channel</span> argument is omitted, the default
-    value is the <span class="arg">red_channel</span> value. If the
-    <span class="arg">opacity_channel</span> argument is omitted,
-    the default value is <a href=
-    "constants.html#Opacity">OpaqueOpacity</a>.</p>
-
-    <h4>Returns</h4>
-
-    <p>A new image</p>
-
-    <h4>See also</h4>
-
-    <p><a href="image3.html#white_threshold">white_threshold</a>,
-    <a href="#bilevel_channel">bilevel_channel</a></p>
-
-    <h4>Magick API</h4>
-
-    <p>BlackThresholdImage</p>
-  </div>
-
   <div class="sig">
     <h3 id="border">border</h3>
 
@@ -2358,7 +2660,9 @@ f.color_reset!(red)
 
     <h4>See also</h4>
 
-    <p><a href="#composite_bang">composite!</a></p>
+    <p><a href="#composite_bang">composite!</a>, <a href=
+    "#dissolve">dissolve</a>, <a href=
+    "image3.html#watermark">watermark</a></p>
 
     <h4>Magick API</h4>
 
@@ -3046,6 +3350,40 @@ cropped = img.crop(x, y, width, height, true)
     <p>CycleColormapImage</p>
   </div>
 
+  <div class="sig">
+    <h3 id="delete_profile">delete_profile</h3>
+
+    <p><span class="arg">image</span>.delete_profile(<span class=
+    "arg">profile_name</span>) -&gt; <span class=
+    "arg">self</span></p>
+  </div>
+
+  <div class="desc">
+    <h4>Description</h4>
+
+    <p>Deletes the specified profile. This method is effectively
+    the same as passing a <code>nil</code> 2nd argument to <a href=
+    "image3.html#profile_bang">profile!</a>.</p>
+
+    <h4>Arguments</h4>
+
+    <p>The profile name, "IPTC" or "ICC" for example. Specify "*"
+    to delete all the profiles in the image.</p>
+
+    <h4>See also</h4>
+
+    <p>Setting the <a href=
+    "imageattrs.html#iptc_profile">iptc_profile</a> attribute or
+    <a href="imageattrs.html#color_profile">color_profile</a>
+    attribute to nil causes the profile to be deleted. Also see
+    <a href="image3.html#strip_bang">strip!</a> and <a href=
+    "imageattrs.html#add_profile">add_profile</a>.</p>
+
+    <h4>Magick API</h4>
+
+    <p>ProfileImage</p>
+  </div>
+
   <div class="sig">
     <h3 id="despeckle">despeckle</h3>
 
@@ -3207,12 +3545,84 @@ exit
 
     <h4>Magick API</h4>
 
-    <p>DispatchImage (GraphicsMagick), or ExportImagePixels (ImageMagick)</p>
+    <p>DispatchImage (GraphicsMagick), or ExportImagePixels
+    (ImageMagick)</p>
 
     <h4>Note</h4>
 
-    <p>This method is deprecated in ImageMagick.
-    Use the <code>export_pixels</code> method instead.</p>
+    <p>This method is deprecated in ImageMagick. Use the
+    <code>export_pixels</code> method instead.</p>
+  </div>
+
+  <div class="sig">
+    <h3 id="displace">displace</h3>
+
+    <p><span class="arg">image</span>.displace(<span class=
+    "arg">displacement_map</span>, <span class=
+    "arg">x_amplitude</span>, <span class="arg">y_amplitude</span>,
+    <span class="arg">x_offset</span>=0, <span class=
+    "arg">y_offset</span>=0) -&gt; <em>anImage</em><br />
+    <span class="arg">image</span>.displace(<span class=
+    "arg">displacement_map</span>, <span class=
+    "arg">x_amplitude</span>, <span class="arg">y_amplitude</span>,
+    <span class="arg">gravity</span>, <span class=
+    "arg">x_offset</span>=0, <span class="arg">y_offset</span>=0)
+    -&gt; <em>anImage</em></p>
+  </div>
+
+  <div class="desc">
+    <h4>Description</h4>
+
+    <p>Uses <span class="arg">displacement_map</span> to move color
+    from <span class="arg">image</span> to the output image.</p>
+
+    <p>This method corresponds to the -displace option of
+    &times;Magick's <code>composite</code> command.</p>
+
+    <h4>Arguments</h4>
+
+    <dl>
+      <dt>displacement_map</dt>
+
+      <dd>The source image for the composite operation. Either an
+      imagelist or an image. If an imagelist, uses the current
+      image.</dd>
+
+      <dt>x_amplitude</dt>
+
+      <dd>The maximum displacement on the x-axis.</dd>
+
+      <dt>y_amplitude</dt>
+
+      <dd>The maximum displacement on the y-axis. This argument may
+      omitted if no other arguments follow it. In this case the
+      default is the value of <span class=
+      "arg">x_amplitude</span>.</dd>
+    </dl>
+
+    <p>The <code>displace</code> method can be called with or
+    without a <span class="arg">gravity</span> argument. The
+    <span class="arg">gravity</span>, <span class=
+    "arg">x_offset</span>, and <span class="arg">y_offset</span>
+    arguments are described in the documentation for <a href=
+    "image3.html#watermark">watermark</a>.</p>
+
+    <h4>Example</h4>
+
+    <p>See <a href=
+    "http://www.cit.gu.edu.au/~anthony/graphics/imagick6/compose/#displace">
+    "Composite Displacement Maps"</a> in Anthony Thyssen's
+    <cite><a href=
+    "http://www.cit.gu.edu.au/~anthony/graphics/imagick6/">Examples
+    of ImageMagick Usage</a></cite>.</p>
+
+    <h4>Returns</h4>
+
+    <p>A new image</p>
+
+    <h4>See also</h4>
+
+    <p><a href="#composite">composite</a></p>
   </div>
 
   <div class="sig">
@@ -3252,6 +3662,102 @@ exit
     <p>DisplayImages</p>
   </div>
 
+  <div class="sig">
+    <h3 id="dissolve">dissolve</h3>
+
+    <p><span class="arg">image</span>.dissolve(<span class=
+    "arg">overlay</span>, <span class="arg">src_percentage</span>,
+    <span class="arg">dst_percentage</span>, <span class=
+    "arg">x_offset</span>=0, <span class="arg">y_offset</span>=0)
+    -&gt; <em>anImage</em><br />
+    <span class="arg">image</span>.dissolve(<span class=
+    "arg">overlay</span>, <span class="arg">src_percentage</span>,
+    <span class="arg">dst_percentage</span>, <span class=
+    "arg">gravity</span>, <span class="arg">x_offset</span>=0,
+    <span class="arg">y_offset</span>=0) -&gt; <em>anImage</em></p>
+  </div>
+
+  <div class="desc">
+    <h4>Description</h4>
+
+    <p>Composites the <span class="arg">overlay</span> image into
+    the target image. The opacity of <span class="arg">image</span>
+    is multiplied by <span class="arg">dst_percentage</span> and
+    opacity of <span class="arg">overlay</span> is multiplied by
+    <span class="arg">src_percentage</span>.</p>
+
+    <p>This method corresponds to the -dissolve option of
+    &times;Magick's <code>composite</code> command.</p>
+
+    <h4>Arguments</h4>
+
+    <dl>
+      <dt>overlay</dt>
+
+      <dd>The source image for the composite operation. Either an
+      imagelist or an image. If an imagelist, uses the current
+      image.</dd>
+
+      <dt>src_percentage</dt>
+
+      <dd>Either a non-negative number a string in the form "NN%".
+      If <span class="arg">src_percentage</span> is a number it is
+      interpreted as a percentage. Both 0.25 and "25%" mean 25%.
+      This argument is required.</dd>
+
+      <dt>dst_percentage (with ImageMagick)</dt>
+
+      <dd>Either a non-negative number a string in the form "NN%".
+      If <span class="arg">src_percentage</span> is a number it is
+      interpreted as a percentage. Both 0.25 and "25%" mean 25%.
+      This argument may omitted if no other arguments follow it. In
+      this case <span class="arg">image</span>'s opacity is
+      unchanged.</dd>
+
+      <dt>dst_percentage (with GraphicsMagick)</dt>
+
+      <dd>With GraphicsMagick, <code>dissolve</code> ignores the
+      value and uses <code>1.0-<span class=
+      "arg">src_percentage</span></code> instead.</dd>
+    </dl>
+
+    <p>The <code>dissolve</code> method can be called with or
+    without a <span class="arg">gravity</span> argument. The
+    <span class="arg">gravity</span>, <span class=
+    "arg">x_offset</span>, and <span class="arg">y_offset</span>
+    arguments are described in the documentation for <a href=
+    "image3.html#watermark">watermark</a>.</p>
+
+    <h4>Example</h4>
+
+    <p>See " <a href=
+    "http://www.cit.gu.edu.au/~anthony/graphics/imagick6/compose/#dissolve">
+    Dissolve One Image Over Another</a>" in Anthony Thyssen's
+    <cite><a href=
+    "http://www.cit.gu.edu.au/~anthony/graphics/imagick6/">Examples
+    of ImageMagick Usage</a></cite>.</p>
+
+    <p><code>bgnd.dissolve(overlay, 0.50, 1.0)</code></p>
+
+    <p class="rollover"><a href=
+    "javascript:popup('dissolve.rb.html')"><img onmouseover=
+    "this.src='ex/images/Flower_Hat.jpg'" onmouseout=
+    "this.src='ex/dissolve.jpg'" src="ex/dissolve.jpg" alt=
+    "dissolve example" title=
+    "Click to see the example script" /></a> <img src=
+    "ex/images/spin.gif" alt="" class="spin" title=
+    "Mouse over the example to see the original image" /></p>
+
+    <h4>Returns</h4>
+
+    <p>A new image</p>
+
+    <h4>See also</h4>
+
+    <p><a href="#blend">blend</a>, <a href=
+    "#composite">composite</a></p>
+  </div>
+
   <div class="sig">
     <h3 id="distortion_channel">distortion_channel</h3>
 
@@ -3325,6 +3831,40 @@ exit
     <p><a href="#clone">clone</a></p>
   </div>
 
+  <div class="sig">
+    <h3 id="each_iptc_dataset">each_iptc_dataset</h3>
+
+    <p>image.each_iptc_dataset -&gt; <code>nil</code></p>
+  </div>
+
+  <div class="desc">
+    <h4>Description</h4>
+
+    <p>Iterates over the IPTC DataSet constants in Magick::IPTC. If
+    the image's IPTC profile has the DataSet and the data field has
+    non-0 length, yields to the block. The IPTC DataSet constants
+    are listed <a href="image2.html#get_iptc_dataset">here</a>.</p>
+
+    <h4>Arguments</h4>
+
+    <p>The block arguments are:</p>
+
+    <dl>
+      <dt>dataset</dt>
+
+      <dd>The DataSet name</dd>
+
+      <dt>data_field</dt>
+
+      <dd>The data field</dd>
+    </dl>
+
+    <h4>See also</h4>
+
+    <p><a href=
+    "image2.html#get_iptc_dataset">get_iptc_dataset</a></p>
+  </div>
+
   <div class="sig">
     <h3 id="each_profile">each_profile</h3>
 
@@ -3338,7 +3878,16 @@ exit
     for each profile in the image, passing the profile name and
     value as parameters.
 
-    <h4>Returns</h4>the last value returned by the block
+    <h4>Returns</h4>
+
+    <p>the last value returned by the block</p>
+
+    <h4>See also</h4>
+
+    <p>The <a href=
+    "imageattrs.html#color_profile">color_profile</a> and <a href=
+    "imageattrs.html#iptc_profile">iptc_profile</a> attributes
+    return the ICC and IPTC profiles, respectively.</p>
 
     <h4>Magick API</h4>