rmagick 2.2.2 → 2.3.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


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

Files changed (55) hide show
  1. data/ChangeLog +17 -0
  2. data/README.html +21 -46
  3. data/README.txt +18 -40
  4. data/build_tarball.rake +11 -2
  5. data/doc/comtasks.html +5 -5
  6. data/doc/constants.html +272 -241
  7. data/doc/draw.html +5 -5
  8. data/doc/ex/mask.rb +2 -2
  9. data/doc/ilist.html +9 -9
  10. data/doc/image1.html +164 -16
  11. data/doc/image2.html +105 -8
  12. data/doc/image3.html +8 -8
  13. data/doc/imageattrs.html +4 -137
  14. data/doc/imusage.html +3 -3
  15. data/doc/index.html +9 -9
  16. data/doc/info.html +5 -5
  17. data/doc/magick.html +30 -70
  18. data/doc/optequiv.html +19 -39
  19. data/doc/rvg.html +5 -5
  20. data/doc/rvgclip.html +2 -2
  21. data/doc/rvggroup.html +2 -2
  22. data/doc/rvgimage.html +3 -3
  23. data/doc/rvgpattern.html +3 -3
  24. data/doc/rvgshape.html +2 -2
  25. data/doc/rvgstyle.html +2 -2
  26. data/doc/rvgtext.html +6 -6
  27. data/doc/rvgtspan.html +4 -4
  28. data/doc/rvgtut.html +9 -9
  29. data/doc/rvguse.html +3 -3
  30. data/doc/rvgxform.html +2 -2
  31. data/doc/struct.html +54 -19
  32. data/doc/usage.html +11 -3
  33. data/ext/RMagick/MANIFEST +1 -1
  34. data/ext/RMagick/extconf.rb +8 -23
  35. data/ext/RMagick/rmagick.h +10 -5
  36. data/ext/RMagick/rmdraw.c +7 -8
  37. data/ext/RMagick/rmimage.c +186 -20
  38. data/ext/RMagick/rmmain.c +32 -12
  39. data/ext/RMagick/rmutil.c +171 -28
  40. data/lib/RMagick.rb +7 -7
  41. data/lib/rvg/clippath.rb +2 -2
  42. data/lib/rvg/container.rb +2 -2
  43. data/lib/rvg/describable.rb +2 -2
  44. data/lib/rvg/embellishable.rb +2 -2
  45. data/lib/rvg/misc.rb +2 -2
  46. data/lib/rvg/paint.rb +7 -2
  47. data/lib/rvg/pathdata.rb +2 -2
  48. data/lib/rvg/rvg.rb +3 -3
  49. data/lib/rvg/stretchable.rb +15 -3
  50. data/lib/rvg/stylable.rb +2 -2
  51. data/lib/rvg/text.rb +2 -2
  52. data/lib/rvg/transformable.rb +2 -2
  53. data/lib/rvg/units.rb +2 -2
  54. data/rmagick.gemspec +1 -1
  55. metadata +3 -3
data/doc/image3.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.2.2: class Image (instance methods p-w)</title>
9
+ <title>RMagick 2.3.0: class Image (instance methods p-w)</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -51,7 +51,7 @@
51
51
  </head>
52
52
 
53
53
  <body>
54
- <h6 id="header">RMagick 2.2.2 User's Guide and Reference</h6>
54
+ <h6 id="header">RMagick 2.3.0 User's Guide and Reference</h6>
55
55
 
56
56
  <div class="nav">
57
57
  &laquo;&nbsp;<a href="image2.html">Prev</a> | <a href=
@@ -314,7 +314,7 @@
314
314
  <dt>fuzz</dt>
315
315
 
316
316
  <dd>By default the pixel must match exactly, but you can
317
- specify a tolerence level by passing a positive value.</dd>
317
+ specify a tolerance level by passing a positive value.</dd>
318
318
  </dl>
319
319
 
320
320
  <h4>Returns</h4>
@@ -515,7 +515,7 @@ end
515
515
  <h3 id="preview">preview</h3>
516
516
 
517
517
  <p><span class="arg">img</span>.preview(<span class=
518
- "arg">aPreviewType</span>) -&gt; <em>image</em></p>
518
+ "arg">preview</span>) -&gt; <em>image</em></p>
519
519
  </div>
520
520
 
521
521
  <div class="desc">
@@ -1372,7 +1372,7 @@ random_threshold_channel(geom, RedChannel)
1372
1372
  "padding-left:62px; padding-right: 62px; padding-top: 87px;padding-bottom:87px;"
1373
1373
  id="after_resize_to_fill" onmouseover=
1374
1374
  "this.style.display='none'; before_resize_to_fill.style.display='';"
1375
- alt="resize_to_fill example" />
1375
+ alt="resize_to_fill example" />
1376
1376
  <!-- This img tag displays the before image when moused over -->
1377
1377
  <img src="ex/images/Flower_Hat.jpg" style="display: none" id=
1378
1378
  "before_resize_to_fill" onmouseout=
@@ -1467,7 +1467,7 @@ random_threshold_channel(geom, RedChannel)
1467
1467
  <img id="rtfless" style="display: none" onmouseout=
1468
1468
  "this.style.display='none';rtf.style.display='';" src=
1469
1469
  "ex/images/Flower_Hat.jpg" alt="resize_to_fit example" title=
1470
- "Click to see the example script" />
1470
+ "Click to see the example script" />
1471
1471
  <!-- This img tag displays the framed image when the mouse is not over-->
1472
1472
  <img style=
1473
1473
  "padding-left:69px; padding-right: 69px; padding-top: 87px;padding-bottom:87px;"
@@ -3227,7 +3227,7 @@ img.to_color(pixel)
3227
3227
  <p>Changes the opacity value of all the pixels that match
3228
3228
  <span class="arg">color</span> to the value specified by
3229
3229
  <span class="arg">opacity</span>. By default the pixel must
3230
- match exactly, but you can specify a tolerence level by setting
3230
+ match exactly, but you can specify a tolerance level by setting
3231
3231
  the <a href="imageattrs.html#fuzz">fuzz</a> attribute on the
3232
3232
  image.</p>
3233
3233
 
@@ -4025,7 +4025,7 @@ end
4025
4025
  <h3 id="wet_floor">wet_floor</h3>
4026
4026
 
4027
4027
  <p><span class="arg">img</span>.wet_floor(<span class=
4028
- "arg">intial=0.5</span>, <span class="arg">rate=1.0</span>)
4028
+ "arg">initial=0.5</span>, <span class="arg">rate=1.0</span>)
4029
4029
  -&gt; <em>image</em></p>
4030
4030
  </div>
4031
4031
 
data/doc/imageattrs.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.2.2: class Image (attribute methods)</title>
9
+ <title>RMagick 2.3.0: class Image (attribute methods)</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.2.2 User's Guide and Reference</h6>
28
+ <h6 id="header">RMagick 2.3.0 User's Guide and Reference</h6>
29
29
 
30
30
  <div class="nav">
31
31
  &laquo;&nbsp;<a href="ilist.html">Prev</a> | <a href=
@@ -45,8 +45,6 @@
45
45
  <div>
46
46
  <div class="toccol">
47
47
  <ul>
48
- <li><a href="#alpha">alpha</a></li>
49
-
50
48
  <li><a href="#background_color">background_color</a></li>
51
49
 
52
50
  <li><a href="#base_columns">base_columns</a></li>
@@ -64,8 +62,6 @@
64
62
 
65
63
  <li><a href="#border_color">border_color</a></li>
66
64
 
67
- <li><a href="#bounding_box">bounding_box</a></li>
68
-
69
65
  <li><a href="#chromaticity">chromaticity</a></li>
70
66
 
71
67
  <li><a href="#class_type">class_type</a></li>
@@ -122,8 +118,6 @@
122
118
 
123
119
  <li><a href="#iptc_profile">iptc_profile</a></li>
124
120
 
125
- <li><a href="#mask">mask</a></li>
126
-
127
121
  <li><a href="#matte">matte</a></li>
128
122
 
129
123
  <li><a href=
@@ -189,50 +183,6 @@
189
183
 
190
184
  <h2 class="methods">attribute methods</h2>
191
185
 
192
- <div class="sig">
193
- <h3 id="alpha">alpha</h3>
194
-
195
- <p><span class="arg">img</span>.alpha = <span class=
196
- "arg">type</span></p>
197
- </div>
198
-
199
- <div class="desc">
200
- <h4>Description</h4>
201
-
202
- <p>Set a flag to indicate whether or not to use alpha channel
203
- data. Set-only.</p>
204
-
205
- <h4>Arguments</h4>
206
-
207
- <p>One of the following values of the AlphaChannelType
208
- enumeration:</p>
209
-
210
- <dl>
211
- <dt>ActivateAlphaChannel</dt>
212
-
213
- <dd>Use alpha channel data. Equivalent to <code>img.matte =
214
- true</code>.</dd>
215
-
216
- <dt>DeactivateAlphaChannel</dt>
217
-
218
- <dd>Do not use alpha channel data. Equivalent to
219
- <code>img.matte = false</code>.</dd>
220
-
221
- <dt>ResetAlphaChannel</dt>
222
-
223
- <dd>Set the alpha channel to fully opaque.</dd>
224
-
225
- <dt>SetAlphaChannel</dt>
226
-
227
- <dd>Sets the alpha channel to the intensity of the
228
- image.</dd>
229
- </dl>
230
-
231
- <h4>See also</h4>
232
-
233
- <p><a href="#matte">matte</a></p>
234
- </div>
235
-
236
186
  <div class="sig">
237
187
  <h3 id="background_color">background_color</h3>
238
188
 
@@ -378,34 +328,6 @@
378
328
  <p>A color name.</p>
379
329
  </div>
380
330
 
381
- <div class="sig">
382
- <h3 id="bounding_box">bounding_box</h3>
383
-
384
- <p><span class="arg">img</span>.bounding_box -&gt;
385
- <em>rectangle</em></p>
386
- </div>
387
-
388
- <div class="desc">
389
- <h4>Description</h4>
390
-
391
- <p>The image's <em>bounding box</em>. The bounding box is the
392
- rectangle that encloses all the pixels not in the border color.
393
- Uses the current <a href="#fuzz">fuzz</a> value. Get-only.</p>
394
-
395
- <h4>Returns</h4>A <a href="struct.html#Rectangle">Rectangle</a>
396
- object.
397
-
398
- <h4>Example</h4>
399
-
400
- <p>In this example, the bounding box is the gray square
401
- enclosing the blue circle. (The coordinates and red circles
402
- were added after the bounding box was computed.)</p>
403
-
404
- <p><a href="javascript:popup('bounding_box.rb.html')"><img src=
405
- "ex/bounding_box.gif" alt="ex/bounding_box.rb" title=
406
- "Click to see the example script" /></a></p>
407
- </div>
408
-
409
331
  <div class="sig">
410
332
  <h3 id="chromaticity">chromaticity</h3>
411
333
 
@@ -1043,61 +965,6 @@
1043
965
  "image3.html#profile_bang">profile!</a></p>
1044
966
  </div>
1045
967
 
1046
- <div class="sig">
1047
- <h3 id="mask">mask</h3>
1048
-
1049
- <p><span class="arg">img</span>.mask -&gt; <em>image</em> or
1050
- <code>nil</code><br />
1051
- <span class="arg">img.</span>mask = <em>image</em> or
1052
- <em>imagelist</em> or <code>nil</code></p>
1053
- </div>
1054
-
1055
- <div class="desc">
1056
- <h4>Description</h4>
1057
-
1058
- <p>The <code>mask=</code> attribute writer sets an image clip
1059
- mask created from the specified mask image. <span class=
1060
- "imquote">The mask image must have the same dimensions as the
1061
- image being masked.</span> If not, the mask image is resized to
1062
- match. <span class="imquote">If the mask image has an alpha
1063
- channel the opacity of each pixel is used to define the mask.
1064
- Otherwise, the intensity (gray level) of each pixel is
1065
- used.</span></p>
1066
-
1067
- <p>In general, if the mask image does not have an alpha
1068
- channel, a white pixel in the mask prevents changes to the
1069
- corresponding pixel in the image being masked, while a black
1070
- pixel allows changes. A pixel that is neither black nor white
1071
- will allow partial changes depending on its intensity.</p>
1072
-
1073
- <p>Use <a href="#matte">matte=</a> to specify whether or not
1074
- the mask image has an alpha channel.</p>
1075
-
1076
- <p>The <code>mask</code> attribute reader returns a copy of the
1077
- clip mask. This is <em>not</em> a copy of the mask image that
1078
- was used to create the clip mask, nor is it the clip mask image
1079
- itself. Therefore, modifying the image returned by
1080
- <code>mask</code> does not change the clip mask itself. To
1081
- change the clip mask you must assign a new image to the
1082
- <code>mask=</code> attribute writer.</p>
1083
-
1084
- <h4>Arguments</h4>
1085
-
1086
- <p>If the value is an imagelist, uses the current image as the
1087
- mask image. Assign <code>nil</code> to remove the clip
1088
- mask.</p>
1089
-
1090
- <h4>Example</h4>
1091
-
1092
- <p class="rollover"><a href=
1093
- "javascript:popup('mask.rb.html')"><img src="ex/mask.jpg" alt=
1094
- "mask example" title="Click to see the example script"
1095
- onmouseover="this.src='ex/images/Flower_Hat.jpg'" onmouseout=
1096
- "this.src='ex/mask.jpg'" /></a> <img src="ex/images/spin.gif"
1097
- alt="" class="spin" title=
1098
- "Mouse over the example to see the original image" /></p>
1099
- </div>
1100
-
1101
968
  <div class="sig">
1102
969
  <h3 id="matte">matte</h3>
1103
970
 
@@ -1114,7 +981,7 @@
1114
981
  pixels. See <a href="struct.html#Pixel">Pixel</a>.</p>
1115
982
 
1116
983
  <p>This attribute is deprecated in ImageMagick 6.3.5 and later.
1117
- Use <a href="#alpha">alpha</a> instead.</p>
984
+ Use <a href="image1.html#alpha">alpha</a> instead.</p>
1118
985
  </div>
1119
986
 
1120
987
  <div class="sig">
@@ -1542,7 +1409,7 @@ blur_image is 100% complete.
1542
1409
 
1543
1410
  <p><span class="arg">img.</span>ticks_per_second -&gt;
1544
1411
  <em>integer</em><br />
1545
- <span class="arg">iamge.</span>ticks_per_second = <span class=
1412
+ <span class="arg">image.</span>ticks_per_second = <span class=
1546
1413
  "arg">integer</span></p>
1547
1414
  </div>
1548
1415
 
data/doc/imusage.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.2.2: ImageMagick Conventions</title>
9
+ <title>RMagick 2.3.0: ImageMagick Conventions</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -69,7 +69,7 @@
69
69
  </head>
70
70
 
71
71
  <body>
72
- <h6 id="header">RMagick 2.2.2 User's Guide and Reference</h6>
72
+ <h6 id="header">RMagick 2.3.0 User's Guide and Reference</h6>
73
73
 
74
74
  <div class="nav">
75
75
  &laquo;&nbsp;<a href="usage.html">Prev</a> | <a href=
@@ -342,7 +342,7 @@
342
342
  it is resized to 480x480.</p>
343
343
  </div>
344
344
 
345
- <p>The x and y offsets, if present, can be preceeded with either
345
+ <p>The x and y offsets, if present, can be preceded with either
346
346
  a + or - sign. The + causes x and y to be measured from the left
347
347
  or top edges, respectively. Conversely, - measures from the right
348
348
  or bottom edges. Offsets are always measured in pixels.</p>
data/doc/index.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.2.2 User's Guide and Reference</title>
9
+ <title>RMagick 2.3.0 User's Guide and Reference</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -105,7 +105,7 @@
105
105
  </div>
106
106
 
107
107
  <p id="magick">Ruby+ImageMagick<span class="tm">TM</span><br />
108
- Version 2.2.2</p>
108
+ Version 2.3.0</p>
109
109
 
110
110
  <h1>User's Guide and Reference</h1>
111
111
 
@@ -286,14 +286,14 @@
286
286
 
287
287
  <p>RMagick is a complete interface to ImageMagick. Version 1.0.0
288
288
  was released in February, 2003. Within its four major classes and
289
- 30 minor classes RMagick defines over 600 methods and 225
289
+ 18 minor classes RMagick defines over 650 methods and 350
290
290
  constants. RMagick exploits Ruby idioms such as blocks and
291
291
  iterators, Struct classes, symbols, ?- and !-suffixed methods,
292
292
  and exceptions.</p>
293
293
 
294
294
  <h3>About this document</h3>
295
295
 
296
- <p>This document describes Version 2.2.2 of RMagick. It is
296
+ <p>This document describes Version 2.3.0 of RMagick. It is
297
297
  divided into 4 parts. The first is this page. The second part is
298
298
  a user's guide covering both RMagick and ImageMagick usage and
299
299
  conventions. The third part is a reference guide to the
@@ -335,8 +335,8 @@
335
335
 
336
336
  <p><b>Example programs and images&nbsp;&nbsp;</b> All of the
337
337
  example images on these pages were created by RMagick. Click the
338
- image to see the progam code. (You may need to configure your
339
- browser to allow JavaScript and popup windows.) All example
338
+ image to see the program code. (You may need to configure your
339
+ browser to allow JavaScript and pop-up windows.) All example
340
340
  images show the result of applying the method. Many example
341
341
  images show the "before" image as well. When the image is
342
342
  accompanied by this symbol <img style="display:inline" src=
@@ -367,7 +367,7 @@
367
367
  command:</p>
368
368
  <pre class="example" id="version">
369
369
  $ ruby -rRMagick -e "puts Magick::Long_version"
370
- This is RMagick 2.0.0 ($Date: 2008/01/07 00:04:00 $) Copyright (C) 2007 by Timothy P. Hunter
370
+ This is RMagick 2.0.0 ($Date: 2008/03/08 00:28:45 $) Copyright (C) 2007 by Timothy P. Hunter
371
371
  Built with ImageMagick 6.3.7 12/20/07 Q16 http://www.imagemagick.org
372
372
  Built for ruby 1.8.6
373
373
  Web page: http://rmagick.rubyforge.org
@@ -399,9 +399,9 @@ Email: rmagick@rubyforge.org
399
399
  Notices</a></h3>
400
400
 
401
401
  <ul>
402
- <li>RMagick &copy; 2002-2007 Timothy P. Hunter.</li>
402
+ <li>RMagick &copy; 2002-2008 Timothy P. Hunter.</li>
403
403
 
404
- <li>ImageMagick &copy; 1999-2007 ImageMagick Studio.</li>
404
+ <li>ImageMagick &copy; 1999-2008 ImageMagick Studio.</li>
405
405
 
406
406
  <li>Ruby is copyrighted free software by Yukihiro
407
407
  Matsumoto.</li>
data/doc/info.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.2.2: class Image::Info - Optional method
9
+ <title>RMagick 2.3.0: class Image::Info - Optional method
10
10
  arguments</title>
11
11
  <meta http-equiv="Content-Type" content=
12
12
  "text/html; charset=us-ascii" />
@@ -44,7 +44,7 @@
44
44
  </head>
45
45
 
46
46
  <body>
47
- <h6 id="header">RMagick 2.2.2 User's Guide and Reference</h6>
47
+ <h6 id="header">RMagick 2.3.0 User's Guide and Reference</h6>
48
48
 
49
49
  <div class="nav">
50
50
  &laquo;&nbsp;<a href="struct.html">Prev</a> | <a href=
@@ -752,7 +752,7 @@ p img.first['caption'] &raquo; "a new caption"
752
752
  when writing JBIG, PCL, PS, PS2, and PS3 format images.</p>
753
753
 
754
754
  <p>This attribute can also be used to specify the width and
755
- height of HISTOGRRAM format images. For HISTOGRAM, the default
755
+ height of HISTOGRAM format images. For HISTOGRAM, the default
756
756
  is 256x200.</p>
757
757
 
758
758
  <h4>Arguments</h4>
@@ -1083,7 +1083,7 @@ p img.first['caption'] &raquo; "a new caption"
1083
1083
  optional arguments such as <code>read</code> and
1084
1084
  <code>write</code>. To stop monitoring, set the monitor to
1085
1085
  <code>nil</code>. See <a href=
1086
- "imageattrs.html#monitor">Image#monitor</a> for more informat
1086
+ "imageattrs.html#monitor">Image#monitor</a> for more information
1087
1087
  about the proc. This attribute is set-only.</p>
1088
1088
 
1089
1089
  <p>If you assign a monitor to an image with
@@ -1256,7 +1256,7 @@ p img.first['caption'] &raquo; "a new caption"
1256
1256
  <p>Use <code>size</code> to specify the width and height of
1257
1257
  images in the CMYK, DIB, EMF, GRAY, RGB, RGBA, UYVY, YUV, or XC
1258
1258
  formats, the width and height of some <a href=
1259
- "imusage.html#builtin_formats">builtin formats</a>, or the
1259
+ "imusage.html#builtin_formats">built in formats</a>, or the
1260
1260
  subimage size of PTIF-format images.</p>
1261
1261
 
1262
1262
  <h4>Arguments</h4>
data/doc/magick.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.2.2: module Magick</title>
9
+ <title>RMagick 2.3.0: module Magick</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -24,7 +24,7 @@
24
24
  </head>
25
25
 
26
26
  <body>
27
- <h6 id="header">RMagick 2.2.2 User's Guide and Reference</h6>
27
+ <h6 id="header">RMagick 2.3.0 User's Guide and Reference</h6>
28
28
 
29
29
  <div class="nav">
30
30
  &laquo;&nbsp;<a href="comtasks.html">Prev</a> | <a href=
@@ -48,9 +48,6 @@
48
48
 
49
49
  <li><a href="#limit_resource">limit_resource</a></li>
50
50
 
51
- <li><a href=
52
- "#set_cache_threshold">set_cache_threshold</a></li>
53
-
54
51
  <li><a href="#set_log_event_mask">set_log_event_mask</a></li>
55
52
 
56
53
  <li><a href="#set_log_format">set_log_format</a></li>
@@ -144,7 +141,7 @@
144
141
  <div class="desc">
145
142
  <h4>Description</h4>
146
143
 
147
- <p>Lists the fonts that &times;Magick knows about. If the
144
+ <p>Lists the fonts that ImageMagick knows about. If the
148
145
  optional block is present, calls the block once for each font,
149
146
  passing a Magick::Font object. Otherwise, returns an array of
150
147
  Magick::Font objects, one for each font.</p>
@@ -252,11 +249,11 @@
252
249
  <div class="desc">
253
250
  <h4>Description</h4>
254
251
 
255
- <p>Describes the image formats supported by &times;Magick. If
256
- the optional block is present, calls the block once for each
257
- image format. The first argument, <em>f</em>, is the format
258
- name. The second argument, <em>v</em>, is the properties string
259
- described below.</p>
252
+ <p>Describes the image formats supported by ImageMagick. If the
253
+ optional block is present, calls the block once for each image
254
+ format. The first argument, <em>f</em>, is the format name. The
255
+ second argument, <em>v</em>, is the properties string described
256
+ below.</p>
260
257
 
261
258
  <h4>Returns</h4>A hash of image formats and their properties.
262
259
  Each key in the returned hash is the name of a supported image
@@ -284,14 +281,14 @@
284
281
  <tr>
285
282
  <td>R</td>
286
283
 
287
- <td>is "r" if &times;Magick can read the format, and "-"
284
+ <td>is "r" if ImageMagick can read the format, and "-"
288
285
  otherwise.</td>
289
286
  </tr>
290
287
 
291
288
  <tr>
292
289
  <td>W</td>
293
290
 
294
- <td>is "w" if &times;Magick can write the format, and "-"
291
+ <td>is "w" if ImageMagick can write the format, and "-"
295
292
  otherwise.</td>
296
293
  </tr>
297
294
 
@@ -322,10 +319,10 @@ p Magick.formats &raquo;
322
319
 
323
320
  <h4>Note</h4>
324
321
 
325
- <p>&times;Magick depends on external programs for some formats.
326
- Depending on how &times;Magick was installed on your system,
327
- some formats may not be available. If you have questions, ask
328
- your system administrator.</p>
322
+ <p>ImageMagick depends on external programs for some formats.
323
+ Depending on how ImageMagick was installed on your system, some
324
+ formats may not be available. If you have questions, ask your
325
+ system administrator.</p>
329
326
  </div>
330
327
 
331
328
  <div class="sig">
@@ -341,9 +338,9 @@ p Magick.formats &raquo;
341
338
 
342
339
  <p>Sets a limit to the amount of a resource, or gets the
343
340
  current limit for the resource. <span class="imquote">When the
344
- limit is reached, &times;Magick will fail in some fashion or
345
- take compensating actions if possible.</span> The default
346
- limits vary according to the platform. See the &times;Magick
341
+ limit is reached, ImageMagick will fail in some fashion or take
342
+ compensating actions if possible.</span> The default limits
343
+ vary according to the platform. See the ImageMagick
347
344
  documentation for the <em>-limit</em> option for more
348
345
  information.</p>
349
346
 
@@ -354,20 +351,23 @@ p Magick.formats &raquo;
354
351
  <dl>
355
352
  <dt>resource_type</dt>
356
353
 
357
- <dd>One of the symbols <code>:disk</code>,
358
- <code>:file</code>, <code>:map</code>, or
354
+ <dd>One of the symbols <code>:area</code>,
355
+ <code>:disk</code>, <code>:file</code>, <code>:map</code>, or
359
356
  <code>:memory</code>. You may use a string instead of a
360
357
  symbol.</dd>
361
358
 
362
359
  <dt>limit</dt>
363
360
 
364
361
  <dd>If present, the limit for the resource. This argument is
365
- always an integer number. If the resource_type is
366
- <code>:file</code>, the limit is the number of open files. If
367
- <code>:memory</code> or <code>:map</code>, the limit is
368
- measured megabytes. If <code>:disk</code>, the limit is
369
- measured in gigabytes. If this argument is omitted the limit
370
- is not changed.</dd>
362
+ always an integer number. If the <span class=
363
+ "arg">resource_type</span> is <code>:file</code>, the limit
364
+ is the number of open files. If <code>:memory</code> or
365
+ <code>:map</code>, the limit is measured megabytes. If
366
+ <code>:disk</code>, the limit is measured in gigabytes. If
367
+ the <span class="arg">resource_type</span> is
368
+ <code>:area</code> the limit is the maximum width * height of
369
+ an image in pixels that can reside in pixel cache memory. If
370
+ this argument is omitted the limit is not changed.</dd>
371
371
  </dl>
372
372
 
373
373
  <h4>Returns</h4>
@@ -377,47 +377,7 @@ p Magick.formats &raquo;
377
377
 
378
378
  <h4>Notes</h4>
379
379
 
380
- <p>This method supercedes <a href=
381
- "#set_cache_threshold">set_cache_threshold</a>.</p>
382
- </div>
383
-
384
- <div class="sig">
385
- <h3 id="set_cache_threshold">set_cache_threshold</h3>
386
-
387
- <p>Magick.set_cache_threshold(<span class="arg">n</span>)</p>
388
- </div>
389
-
390
- <div class="desc">
391
- <h4>Description</h4>
392
-
393
- <p>Sets the amount of free memory allocated for the pixel
394
- cache. <span class="imquote">Once this threshold is exceeded,
395
- all subsequent pixels cache operations are to/from
396
- disk.</span></p>
397
-
398
- <h4>Arguments</h4>
399
-
400
- <p>An integer number of megabytes.</p>
401
-
402
- <h4>Example</h4>
403
- <pre>
404
- # set the cache threshold to 10Mb
405
- Magick.set_cache_threshold(10)
406
- </pre>
407
-
408
- <h4>Notes</h4>
409
-
410
- <p>This method is obsolete. Use <a href=
411
- "#limit_resource">limit_resource</a> instead. The code:</p>
412
- <pre>
413
- Magick.limit_resource(:memory, n)
414
- Magick.imit_resource(:map, 2*n)
415
- </pre>
416
-
417
- <p>is equivalent to</p>
418
- <pre>
419
- Magick.set_cache_threshold(n)
420
- </pre>
380
+ <p>This method supercedes <code>set_cache_threshold</code>.</p>
421
381
  </div>
422
382
 
423
383
  <div class="sig">
@@ -460,7 +420,7 @@ Magick.set_log_event_mask("Module,Coder")
460
420
  <p>Magick logging is configured with the log.xml file in
461
421
  Magick's config directory. See <a href=
462
422
  "http://redux.imagemagick.org/script/resources.php">Resources</a>
463
- in the ImageMagick documenation for more information.</p>
423
+ in the ImageMagick documentation for more information.</p>
464
424
 
465
425
  <p>Use this command to find out about the current log
466
426
  configuration.</p>