rmagick 2.6.0 → 2.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

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

Files changed (42) hide show
  1. data/ChangeLog +14 -0
  2. data/README.html +7 -7
  3. data/doc/comtasks.html +2 -2
  4. data/doc/constants.html +9 -9
  5. data/doc/draw.html +2 -2
  6. data/doc/ex/clip_path.rb +2 -2
  7. data/doc/ex/{affinity.rb → remap.rb} +1 -1
  8. data/doc/ex/{affinity_images.rb → remap_images.rb} +2 -2
  9. data/doc/ilist.html +75 -65
  10. data/doc/image1.html +83 -97
  11. data/doc/image2.html +21 -22
  12. data/doc/image3.html +74 -17
  13. data/doc/imageattrs.html +2 -2
  14. data/doc/imusage.html +2 -2
  15. data/doc/index.html +3 -3
  16. data/doc/info.html +2 -2
  17. data/doc/magick.html +2 -2
  18. data/doc/optequiv.html +30 -30
  19. data/doc/rvg.html +2 -2
  20. data/doc/rvgclip.html +2 -2
  21. data/doc/rvggroup.html +2 -2
  22. data/doc/rvgimage.html +2 -2
  23. data/doc/rvgpattern.html +2 -2
  24. data/doc/rvgshape.html +2 -2
  25. data/doc/rvgstyle.html +2 -2
  26. data/doc/rvgtext.html +2 -2
  27. data/doc/rvgtspan.html +2 -2
  28. data/doc/rvgtut.html +2 -2
  29. data/doc/rvguse.html +2 -2
  30. data/doc/rvgxform.html +2 -2
  31. data/doc/struct.html +2 -2
  32. data/doc/usage.html +18 -29
  33. data/ext/RMagick/MANIFEST +3 -3
  34. data/ext/RMagick/extconf.rb +13 -8
  35. data/ext/RMagick/rmagick.h +3 -3
  36. data/ext/RMagick/rmilist.c +60 -49
  37. data/ext/RMagick/rmimage.c +58 -56
  38. data/ext/RMagick/rmmain.c +20 -5
  39. data/ext/RMagick/rmutil.c +4 -2
  40. data/lib/RMagick.rb +6 -1
  41. data/rmagick.gemspec +1 -1
  42. metadata +4 -4
data/ChangeLog CHANGED
@@ -1,3 +1,17 @@
1
+ RMagick 2.7.0
2
+ o Fix bug #22152, extconf.rb does not respect the LDFLAGS environment
3
+ variable (bug report by Joseph Sokol-Margolis)
4
+ o Fix bug #22190, the NoDitherMethod enum value is not defined in
5
+ ImageMagick 6.4.2
6
+ o Add the TrimBoundsLayer ImageLayerMethod enum value (available in
7
+ ImageMagick 6.4.3-8)
8
+ o Add the CopyAlphaChannel, ExtractAlphaChannel, OpaqueAlphaChannel,
9
+ ShapeAlphaChannel, and TransparentAlphaChannel AlphaChannelType enum
10
+ values (available in ImageMagick 6.4.3-7)
11
+ o Rename Image#affinity and ImageList#affinity to Image#remap and
12
+ ImageList#remap. Retain the old names as aliases. (Changed in ImageMagick
13
+ 6.4.4-0)
14
+
1
15
  RMagick 2.6.0
2
16
  o Fix bug #21237, Image::write ignores format attribute when called with a
3
17
  Tempfile pathname (bug report by Jack Shedd)
data/README.html CHANGED
@@ -1,15 +1,15 @@
1
1
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2
2
  <html>
3
3
  <head>
4
- <title>RMagick 2.6.0 README</title>
4
+ <title>RMagick 2.7.0 README</title>
5
5
  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
6
6
  <meta name="GENERATOR" content="RedCloth">
7
7
  </head>
8
8
  <body>
9
- <h1>RMagick 2.6.0 <span class="caps">README</span></h1>
9
+ <h1>RMagick 2.7.0 <span class="caps">README</span></h1>
10
10
 
11
11
 
12
- <h2>09/10/08</h2>
12
+ <h2>09/28/08</h2>
13
13
 
14
14
 
15
15
  <h3>Table of Contents</h3>
@@ -75,12 +75,12 @@ depending on which tarball you have:</p>
75
75
 
76
76
 
77
77
  <pre>
78
- tar xvzf RMagick-2.6.0-tar.gz (gzipped tarball)
79
- tar xvjf RMagick-2.6.0-tar.bz2 (bzipped tarball)
78
+ tar xvzf RMagick-2.7.0-tar.gz (gzipped tarball)
79
+ tar xvjf RMagick-2.7.0-tar.bz2 (bzipped tarball)
80
80
  7z e RMagick-x.y.z.tar.lzma -so | tar xv (7zipped tarball)
81
81
  </pre>
82
82
 
83
- <p>Change to the RMagick-2.6.0 directory. If you are not using any
83
+ <p>Change to the RMagick-2.7.0 directory. If you are not using any
84
84
  configuration options (usually you don&#8217;t need to) enter the command</p>
85
85
 
86
86
 
@@ -191,7 +191,7 @@ systems, see the documentation for the dynamic loading facility.</p>
191
191
 
192
192
 
193
193
  <pre>
194
- hook /home/me/src/RMagick-2.6.0/./post-setup.rb failed:
194
+ hook /home/me/src/RMagick-2.7.0/./post-setup.rb failed:
195
195
  No such file or directory - "/tmp/rmagick6872.6"
196
196
  </pre>
197
197
 
data/doc/comtasks.html CHANGED
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
8
8
 
9
- <title>RMagick 2.6.0: Common Tasks</title>
9
+ <title>RMagick 2.7.0: Common Tasks</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -31,7 +31,7 @@
31
31
  </head>
32
32
 
33
33
  <body>
34
- <h6 id="header">RMagick 2.6.0 User's Guide and Reference</h6>
34
+ <h6 id="header">RMagick 2.7.0 User's Guide and Reference</h6>
35
35
 
36
36
  <div class="nav">
37
37
  &laquo;&nbsp;<a href="optequiv.html">Prev</a> | <a href=
data/doc/constants.html CHANGED
@@ -4,19 +4,19 @@
4
4
  <html xmlns="http://www.w3.org/1999/xhtml">
5
5
  <head>
6
6
  <meta name="generator" content=
7
- "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
7
+ "HTML Tidy for Linux/x86 (vers 6 November 2007), see www.w3.org" />
8
8
 
9
- <title>RMagick 2.6.0: Constants</title>
9
+ <title>RMagick 2.7.0: Constants</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
13
13
  <meta name="Copyright" content=
14
14
  "Copyright (C) 2006 by Timothy P. Hunter" />
15
15
  <link rel="stylesheet" type="text/css" href="css/doc.css" />
16
- <script type="text/javascript" src="scripts/doc.js">
16
+ <script type="text/javascript" src="scripts/doc.js">
17
17
  </script>
18
- <style type="text/css">
19
- /*<![CDATA[*/
18
+ <style type="text/css">
19
+ /*<![CDATA[*/
20
20
 
21
21
  /* Styles local to this page. */
22
22
  dl, p {
@@ -57,11 +57,11 @@
57
57
  }
58
58
 
59
59
  /*]]>*/
60
- </style>
60
+ </style>
61
61
  </head>
62
62
 
63
63
  <body>
64
- <h6 id="header">RMagick 2.6.0 User's Guide and Reference</h6>
64
+ <h6 id="header">RMagick 2.7.0 User's Guide and Reference</h6>
65
65
 
66
66
  <div class="nav">
67
67
  &laquo;&nbsp;<a href="info.html">Prev</a> | <a href=
@@ -157,7 +157,7 @@
157
157
 
158
158
  <dd>An extended form of the <code>Version</code> constant with
159
159
  the format shown here:<br />
160
- <code>This is RMagick 2.0.0 ($Date: 2008/08/31 20:02:57 $)
160
+ <code>This is RMagick 2.0.0 ($Date: 2008/09/28 00:22:37 $)
161
161
  Copyright (C) 2008 by Timothy P. Hunter<br />
162
162
  Built with ImageMagick 6.3.7 01/05/08 Q16
163
163
  http://www.imagemagick.org<br />
@@ -915,7 +915,7 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
915
915
  <h3 class="const" id="DitherMethod">DitherMethod</h3>
916
916
 
917
917
  <p>Specify the method of dithering for <a href=
918
- "image1.html#affinity">affinity</a>, <a href=
918
+ "image1.html#remap">remap</a>, <a href=
919
919
  "image3.html#quantize">quantize</a>, <a href=
920
920
  "image3.html#posterize">posterize</a>, etc.</p>
921
921
 
data/doc/draw.html CHANGED
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
8
8
 
9
- <title>RMagick 2.6.0: class Draw</title>
9
+ <title>RMagick 2.7.0: class Draw</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -25,7 +25,7 @@
25
25
  </head>
26
26
 
27
27
  <body>
28
- <h6 id="header">RMagick 2.6.0 User's Guide and Reference</h6>
28
+ <h6 id="header">RMagick 2.7.0 User's Guide and Reference</h6>
29
29
 
30
30
  <div class="nav">
31
31
  &laquo;&nbsp;<a href="image3.html">Prev</a> | <a href=
data/doc/ex/clip_path.rb CHANGED
@@ -25,11 +25,11 @@ girl.read("images/Flower_Hat.jpg")
25
25
 
26
26
  cols = rows = nil
27
27
 
28
- # Our final image is about 290 pixels wide, so here
28
+ # Our final image is about 280 pixels wide, so here
29
29
  # we widen our picture to fit. The change_geometry
30
30
  # method will adjust the height proportionately.
31
31
 
32
- girl.change_geometry("290") do |c,r|
32
+ girl.change_geometry("280") do |c,r|
33
33
  pr.composite(0,0, c, r, girl)
34
34
  cols = c
35
35
  rows = r
data/doc/ex/{affinity.rb → remap.rb} RENAMED
@@ -8,5 +8,5 @@ begin
8
8
  rescue NotImplementedError
9
9
  img = Magick::Image.read("images/notimplemented.gif").first
10
10
  end
11
- img.write("affinity.jpg")
11
+ img.write("remap.jpg")
12
12
 
data/doc/ex/{affinity_images.rb → remap_images.rb} RENAMED
@@ -2,7 +2,7 @@ require 'RMagick'
2
2
 
3
3
  images = Magick::ImageList.new("images/Apple.miff", "images/Rocks_On_Beach.miff", "images/Leaf.miff")
4
4
  rose = Magick::Image.read("images/Yellow_Rose.miff").first
5
- rose[:Label] = "Affinity Image"
5
+ rose[:Label] = "Remap Image"
6
6
 
7
7
  result = Magick::ImageList.new
8
8
  result += images
@@ -16,6 +16,6 @@ rescue NotImplementedError
16
16
  montage = Magick::Image.read("images/notimplemented.gif").first
17
17
  end
18
18
 
19
- montage.write("affinity_images.jpg")
19
+ montage.write("remap_images.jpg")
20
20
 
21
21
 
data/doc/ilist.html CHANGED
@@ -4,23 +4,23 @@
4
4
  <html xmlns="http://www.w3.org/1999/xhtml">
5
5
  <head>
6
6
  <meta name="generator" content=
7
- "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
7
+ "HTML Tidy for Linux/x86 (vers 6 November 2007), see www.w3.org" />
8
8
 
9
- <title>RMagick 2.6.0: class ImageList</title>
9
+ <title>RMagick 2.7.0: class ImageList</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
13
13
  <meta name="Copyright" content=
14
14
  "Copyright (C) 2005 by Timothy P. Hunter" />
15
15
  <link rel="stylesheet" type="text/css" href="css/doc.css" />
16
- <script type="text/javascript" src="scripts/doc.js">
16
+ <script type="text/javascript" src="scripts/doc.js">
17
17
  </script>
18
- <script type="text/javascript" src="scripts/doc.js">
18
+ <script type="text/javascript" src="scripts/doc.js">
19
19
  </script>
20
20
  </head>
21
21
 
22
22
  <body>
23
- <h6 id="header">RMagick 2.6.0 User's Guide and Reference</h6>
23
+ <h6 id="header">RMagick 2.7.0 User's Guide and Reference</h6>
24
24
 
25
25
  <div class="nav">
26
26
  &laquo;&nbsp;<a href="magick.html">Prev</a> | <a href=
@@ -62,8 +62,6 @@
62
62
 
63
63
  <li><a href="#spaceship">&lt;=&gt;</a></li>
64
64
 
65
- <li><a href="#affinity">affinity</a></li>
66
-
67
65
  <li><a href="#animate">animate</a></li>
68
66
 
69
67
  <li><a href="#append">append</a></li>
@@ -77,13 +75,13 @@
77
75
  <li><a href="#composite_layers">composite_layers</a></li>
78
76
 
79
77
  <li><a href="#copy">copy</a></li>
78
+
79
+ <li><a href="#cur_image">cur_image</a></li>
80
80
  </ul>
81
81
  </div>
82
82
 
83
83
  <div class="toccol">
84
84
  <ul>
85
- <li><a href="#cur_image">cur_image</a></li>
86
-
87
85
  <li><a href="#deconstruct">deconstruct</a></li>
88
86
 
89
87
  <li><a href="#dup">dup</a></li>
@@ -101,13 +99,13 @@
101
99
  <li><a href="#map">map</a></li>
102
100
 
103
101
  <li><a href="#montage">montage</a></li>
102
+
103
+ <li><a href="#morph">morph</a></li>
104
104
  </ul>
105
105
  </div>
106
106
 
107
107
  <div class="toccol">
108
108
  <ul>
109
- <li><a href="#morph">morph</a></li>
110
-
111
109
  <li><a href="#mosaic">mosaic</a></li>
112
110
 
113
111
  <li><a href="#new_image">new_image</a></li>
@@ -120,6 +118,8 @@
120
118
 
121
119
  <li><a href="#read">read</a></li>
122
120
 
121
+ <li><a href="#remap">remap</a></li>
122
+
123
123
  <li><a href="#to_a">to_a</a></li>
124
124
 
125
125
  <li><a href="#to_blob">to_blob</a></li>
@@ -440,59 +440,6 @@ example &lt;&lt; model.add_noise Magick::LaplacisanNoise
440
440
  <a href="image3.html#signature">signature</a></p>
441
441
  </div>
442
442
 
443
- <div class="sig">
444
- <h3 id="affinity">affinity</h3>
445
-
446
- <p><span class="arg">ilist</span>.affinity(<span class=
447
- "arg">affinity_image</span>=nil, <span class=
448
- "arg">dither</span>=RiemersmaDitherMethod) -&gt;
449
- <em>self</em></p>
450
- </div>
451
-
452
- <div class="desc">
453
- <h4>Description</h4>
454
-
455
- <p>Reduce the colors used in the imagelist to the set of colors
456
- in <span id="arg">affinity_image</span>.</p>
457
-
458
- <h4>Arguments</h4>
459
-
460
- <dl>
461
- <dt>affinity_image</dt>
462
-
463
- <dd>The reference image</dd>
464
-
465
- <dt>dither</dt>
466
-
467
- <dd>A <a href="constants.html#DitherMethod">DitherMethod</a>
468
- value. RiemersmaDitherMethod is the default. To disable
469
- dithering specify NoDitherMethod.</dd>
470
- </dl>
471
-
472
- <h4>Returns</h4>
473
-
474
- <p>self</p>
475
-
476
- <h4>Example</h4>
477
-
478
- <p>This example shows the effect of reducing the colors used in
479
- the apple, beach scene, and leaf images to the set of colors
480
- used in the yellow rose image.</p>
481
-
482
- <p><a href=
483
- "javascript:popup('affinity_images.rb.html')"><img alt=
484
- "affinity_images example" src="ex/affinity_images.jpg" title=
485
- "Click to see the example script" /></a></p>
486
-
487
- <h4>See also</h4>
488
-
489
- <p><a href="image1.html#affinity">Image#affinity</a></p>
490
-
491
- <h4>Magick API</h4>
492
-
493
- <p>AffinityImages (available in ImageMagick 6.4.3-6)</p>
494
- </div>
495
-
496
443
  <div class="sig">
497
444
  <h3 id="animate">animate</h3>
498
445
 
@@ -1132,7 +1079,7 @@ scene=1
1132
1079
  <h4>Notes</h4>
1133
1080
 
1134
1081
  <p>This method is deprecated when using ImageMagick 6.4.3-6 and
1135
- later. Use <a href="#affinity">affinity</a> instead.</p>
1082
+ later. Use <a href="#remap">remap</a> instead.</p>
1136
1083
 
1137
1084
  <h4>See also</h4>
1138
1085
 
@@ -1660,6 +1607,17 @@ ilist.new_image(100, 100) { self.background_color = "red" }
1660
1607
  partial intermediary updates between the frames that are
1661
1608
  actually displayed to users. These frames are usually added
1662
1609
  for improved frame optimization in GIF animations.</dd>
1610
+
1611
+ <dt>TrimBoundsLayer</dt>
1612
+
1613
+ <dd class="imquote">Find the minimal bounds of all the images
1614
+ in the current image sequence, then adjust the offsets so all
1615
+ images are contained on a minimal positive canvas. None of
1616
+ the image data is modified, only the virtual canvas size and
1617
+ offset. Then all the images will have the same canvas size,
1618
+ and all will have a positive offset, at least one image will
1619
+ touch every edge of that canvas with actual pixel data,
1620
+ though that data may be transparent.</dd>
1663
1621
  </dl>
1664
1622
 
1665
1623
  <p>Some of these values are not supported by older versions of
@@ -1899,6 +1857,58 @@ number = '0'
1899
1857
  "imusage.html#builtin_formats">Built-in image formats</a>.</p>
1900
1858
  </div>
1901
1859
 
1860
+ <div class="sig">
1861
+ <h3 id="remap">remap</h3>
1862
+
1863
+ <p><span class="arg">ilist</span>.remap(<span class=
1864
+ "arg">remap_image</span>=nil, <span class=
1865
+ "arg">dither</span>=RiemersmaDitherMethod) -&gt;
1866
+ <em>self</em></p>
1867
+ </div>
1868
+
1869
+ <div class="desc">
1870
+ <h4>Description</h4>
1871
+
1872
+ <p>Reduce the colors used in the imagelist to the set of colors
1873
+ in <span id="arg">remap_image</span>.</p>
1874
+
1875
+ <h4>Arguments</h4>
1876
+
1877
+ <dl>
1878
+ <dt>remap_image</dt>
1879
+
1880
+ <dd>The reference image</dd>
1881
+
1882
+ <dt>dither</dt>
1883
+
1884
+ <dd>A <a href="constants.html#DitherMethod">DitherMethod</a>
1885
+ value. RiemersmaDitherMethod is the default. To disable
1886
+ dithering specify NoDitherMethod.</dd>
1887
+ </dl>
1888
+
1889
+ <h4>Returns</h4>
1890
+
1891
+ <p>self</p>
1892
+
1893
+ <h4>Example</h4>
1894
+
1895
+ <p>This example shows the effect of reducing the colors used in
1896
+ the apple, beach scene, and leaf images to the set of colors
1897
+ used in the yellow rose image.</p>
1898
+
1899
+ <p><a href="javascript:popup('remap_images.rb.html')"><img alt=
1900
+ "remap_images example" src="ex/remap_images.jpg" title=
1901
+ "Click to see the example script" /></a></p>
1902
+
1903
+ <h4>See also</h4>
1904
+
1905
+ <p><a href="image3.html#remap">Image#remap</a></p>
1906
+
1907
+ <h4>Magick API</h4>
1908
+
1909
+ <p>RemapImages (available in ImageMagick 6.4.3-6)</p>
1910
+ </div>
1911
+
1902
1912
  <div class="sig">
1903
1913
  <h3 id="to_blob">to_blob</h3>
1904
1914
 
data/doc/image1.html CHANGED
@@ -4,9 +4,9 @@
4
4
  <html xmlns="http://www.w3.org/1999/xhtml">
5
5
  <head>
6
6
  <meta name="generator" content=
7
- "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
7
+ "HTML Tidy for Linux/x86 (vers 6 November 2007), see www.w3.org" />
8
8
 
9
- <title>RMagick 2.6.0: class Image (class methods and instance
9
+ <title>RMagick 2.7.0: class Image (class methods and instance
10
10
  methods a-d)</title>
11
11
  <meta http-equiv="Content-Type" content=
12
12
  "text/html; charset=us-ascii" />
@@ -14,41 +14,41 @@
14
14
  <meta name="Copyright" content=
15
15
  "Copyright (C) 2006 by Timothy P. Hunter" />
16
16
  <link rel="stylesheet" type="text/css" href="css/doc.css" />
17
- <script type="text/javascript" src="scripts/doc.js">
17
+ <script type="text/javascript" src="scripts/doc.js">
18
18
  </script>
19
- <script type="text/javascript">
19
+ <script type="text/javascript">
20
20
  //<![CDATA[
21
- <!-- Pre-load this image so that the browser knows how big it is. -->
22
- flower_hat = new Image();
23
- flower_hat.src = "ex/images/Flower_Hat.jpg";
24
- function show_noise(type)
25
- {
26
- if (type == null)
27
- {
28
- document.getElementById("add_noise_example").src = "ex/images/Flower_Hat.jpg";
29
- }
30
- else
31
- {
32
- document.getElementById("add_noise_example").src = "ex/add_noise_" + type + ".jpg";
33
- }
34
- }
35
- //]]>
36
- </script>
37
- <style type="text/css">
21
+ <!-- Pre-load this image so that the browser knows how big it is. -->
22
+ flower_hat = new Image();
23
+ flower_hat.src = "ex/images/Flower_Hat.jpg";
24
+ function show_noise(type)
25
+ {
26
+ if (type == null)
27
+ {
28
+ document.getElementById("add_noise_example").src = "ex/images/Flower_Hat.jpg";
29
+ }
30
+ else
31
+ {
32
+ document.getElementById("add_noise_example").src = "ex/add_noise_" + type + ".jpg";
33
+ }
34
+ }
35
+ //]]>
36
+ </script>
37
+ <style type="text/css">
38
38
  /*<![CDATA[*/
39
- .noise_example_wrapper img {
40
- float: left;
41
- }
42
- .noise_example_wrapper p, .noise_example_wrapper ul {
43
- margin-left: 4px;
44
- float: left;
45
- }
46
- /*]]>*/
47
- </style>
39
+ .noise_example_wrapper img {
40
+ float: left;
41
+ }
42
+ .noise_example_wrapper p, .noise_example_wrapper ul {
43
+ margin-left: 4px;
44
+ float: left;
45
+ }
46
+ /*]]>*/
47
+ </style>
48
48
  </head>
49
49
 
50
50
  <body>
51
- <h6 id="header">RMagick 2.6.0 User's Guide and Reference</h6>
51
+ <h6 id="header">RMagick 2.7.0 User's Guide and Reference</h6>
52
52
 
53
53
  <div class="nav">
54
54
  &laquo;&nbsp;<a href="imageattrs.html">Prev</a> | <a href=
@@ -132,8 +132,6 @@ float: left;
132
132
 
133
133
  <li><a href="#affine_transform">affine_transform</a></li>
134
134
 
135
- <li><a href="#affinity">affinity</a></li>
136
-
137
135
  <li><a href="#alpha">alpha</a></li>
138
136
 
139
137
  <li><a href="#alpha_q">alpha?</a></li>
@@ -153,13 +151,13 @@ float: left;
153
151
  <li><a href="#blur_channel">blur_channel</a></li>
154
152
 
155
153
  <li><a href="#blur_image">blur_image</a></li>
154
+
155
+ <li><a href="#border">border</a></li>
156
156
  </ul>
157
157
  </div>
158
158
 
159
159
  <div class="toccol">
160
160
  <ul>
161
- <li><a href="#border">border</a></li>
162
-
163
161
  <li><a href="#border_bang">border!</a></li>
164
162
 
165
163
  <li><a href="#bounding_box">bounding_box</a></li>
@@ -1443,7 +1441,7 @@ img = Image.read_inline(content)
1443
1441
  onmouseout="this.src='ex/affine_transform.jpg'" src=
1444
1442
  "ex/affine_transform.jpg" alt="affine_transform example" title=
1445
1443
  "Click to see the example script" /></a> <img src=
1446
- "ex/images/spin.gif" alt="" class="spin" style="left: 202px;"
1444
+ "ex/images/spin.gif" alt="" class="spin" style="left: 235px;"
1447
1445
  title="Mouse over the example to see the original image" /></p>
1448
1446
 
1449
1447
  <h4>See also</h4>
@@ -1456,62 +1454,6 @@ img = Image.read_inline(content)
1456
1454
  <p>AffineTransformImage</p>
1457
1455
  </div>
1458
1456
 
1459
- <div class="sig">
1460
- <h3 id="affinity">affinity</h3>
1461
-
1462
- <p><span class="arg">img</span>.affinity(<span class=
1463
- "arg">affinity_image</span>, <span class=
1464
- "arg">dither</span>=RiemersmaDitherMethod) -&gt; <em>self</em></p>
1465
- </div>
1466
-
1467
- <div class="desc">
1468
- <h4>Description</h4>
1469
-
1470
- <p>Reduce the number of colors in <span class="arg">img</span>
1471
- to the colors used by <span class="arg">affinity_image</span>.
1472
- If a dither method is specified <span class="imquote">then the
1473
- given colors are dithered over the image as necessary,
1474
- otherwise the closest color (in RGB colorspace) is selected to
1475
- replace that pixel in the image.</span></p>
1476
-
1477
- <h4>Arguments</h4>
1478
-
1479
- <dl>
1480
- <dt>affinity_image</dt>
1481
-
1482
- <dd>The reference image</dd>
1483
-
1484
- <dt>dither</dt>
1485
-
1486
- <dd>A <a href="constants.html#DitherMethod">DitherMethod</a>
1487
- value. RiemersmaDitherMethod is the default. To disable
1488
- dithering specify NoDitherMethod.</dd>
1489
- </dl>
1490
-
1491
- <h4>Returns</h4>
1492
-
1493
- <p>self</p>
1494
-
1495
- <h4>Example</h4>
1496
-
1497
- <p class="rollover"><a href=
1498
- "javascript:popup('affinity.rb.html')"><img onmouseover=
1499
- "this.src='ex/images/Flower_Hat.jpg'" onmouseout=
1500
- "this.src='ex/affinity.jpg'" src="ex/affinity.jpg" alt=
1501
- "affinity example" title=
1502
- "Click to see the example script" /></a> <img src=
1503
- "ex/images/spin.gif" alt="" class="spin" style="left: 202px;"
1504
- title="Mouse over the example to see the original image" /></p>
1505
-
1506
- <h4>See also</h4>
1507
-
1508
- <p><a href="ilist.html#affinity">ImageList#affinity</a></p>
1509
-
1510
- <h4>Magick API</h4>
1511
-
1512
- <p>AffinityImage (available in ImageMagick 6.4.3-6)</p>
1513
- </div>
1514
-
1515
1457
  <div class="sig">
1516
1458
  <h3 id="alpha">alpha</h3>
1517
1459
 
@@ -1533,20 +1475,62 @@ img = Image.read_inline(content)
1533
1475
  <dl>
1534
1476
  <dt>ActivateAlphaChannel</dt>
1535
1477
 
1536
- <dd>Use alpha channel data.</dd>
1478
+ <dd class="imquote">Enable the images use of transparency. If
1479
+ transparency data did not exist, allocate the data and set to
1480
+ opaque. If the image previously had transparency data, the
1481
+ data is again enable as it was when turned off. The
1482
+ transparency data is not changed or modified in any way.</dd>
1483
+
1484
+ <dt>CopyAlphaChannel</dt>
1485
+
1486
+ <dd class="imquote">Turns on the alpha/matte channel, then
1487
+ copies the gray-scale intensity of the image, as an alpha
1488
+ mask, into the alpha channel, converting a gray-scale mask
1489
+ into a transparent shaped image ready to be colored
1490
+ appropriately. The color channels are not modified.</dd>
1537
1491
 
1538
1492
  <dt>DeactivateAlphaChannel</dt>
1539
1493
 
1540
- <dd>Do not use alpha channel data.</dd>
1494
+ <dd class="imquote">Disables the image's transparency
1495
+ channel. Does not delete or change the existing data, just
1496
+ turns of the use of that data. This is the same as assigning
1497
+ false to the old matte= attribute.</dd>
1498
+
1499
+ <dt>ExtractAlphaChannel</dt>
1500
+
1501
+ <dd>Creates a grayscale mask of the image's shape by copying
1502
+ the alpha channel values into all the color channels, and
1503
+ then turning off the image's transparency. The inverse of
1504
+ CopyAlphaChannel</dd>
1505
+
1506
+ <dt>OpaqueAlphaChannel</dt>
1507
+
1508
+ <dd class="imquote">Turns on the alpha/matte channel and
1509
+ forces it to be fully opaque.</dd>
1541
1510
 
1542
1511
  <dt>ResetAlphaChannel</dt>
1543
1512
 
1544
- <dd>Set the alpha channel to fully opaque.</dd>
1513
+ <dd>(Deprecated as of IM 6.4.3-7.) Set the alpha channel to
1514
+ fully opaque.</dd>
1545
1515
 
1546
1516
  <dt>SetAlphaChannel</dt>
1547
1517
 
1548
- <dd>Sets the alpha channel to the intensity of the
1549
- image.</dd>
1518
+ <dd class="imquote">Turns on the alpha/matte channel and if
1519
+ it was previously turned off resets the channel to opaque. If
1520
+ the image already had the alpha channel turned on, it will
1521
+ have no effect.</dd>
1522
+
1523
+ <dt>ShapeAlphaChannel</dt>
1524
+
1525
+ <dd class="imquote">As CopyAlphaChannel but also colors the
1526
+ resulting shape mask with the current background color.</dd>
1527
+
1528
+ <dt>TransparentAlphaChannel</dt>
1529
+
1530
+ <dd class="imquote">Turns on the alpha/matte channel and
1531
+ forces it to be fully transparent. This effectivally creates
1532
+ a transparent image the same size as the original, with all
1533
+ its meta-data still attached.</dd>
1550
1534
  </dl>
1551
1535
 
1552
1536
  <h4>Returns</h4>
@@ -4335,6 +4319,8 @@ pixels = f.dispatch(0, 0, f.columns, f.rows, "RGB")
4335
4319
 
4336
4320
  <li>BarrelDistortion</li>
4337
4321
 
4322
+ <li>BarrelInverseDistortion</li>
4323
+
4338
4324
  <li>BilinearDistortion</li>
4339
4325
 
4340
4326
  <li>PerspectiveDistortion</li>