rmagick 2.9.1 → 2.9.2

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 (60) hide show
  1. data/ChangeLog +13 -1
  2. data/README.html +8 -8
  3. data/doc/comtasks.html +2 -2
  4. data/doc/constants.html +2 -2
  5. data/doc/draw.html +4 -3
  6. data/doc/ilist.html +2 -2
  7. data/doc/image1.html +2 -2
  8. data/doc/image2.html +2 -2
  9. data/doc/image3.html +11 -8
  10. data/doc/imageattrs.html +17 -2
  11. data/doc/imusage.html +2 -2
  12. data/doc/index.html +6 -6
  13. data/doc/info.html +2 -2
  14. data/doc/magick.html +2 -2
  15. data/doc/optequiv.html +47 -9
  16. data/doc/rvg.html +2 -2
  17. data/doc/rvgclip.html +2 -2
  18. data/doc/rvggroup.html +2 -2
  19. data/doc/rvgimage.html +2 -2
  20. data/doc/rvgpattern.html +2 -2
  21. data/doc/rvgshape.html +2 -2
  22. data/doc/rvgstyle.html +2 -2
  23. data/doc/rvgtext.html +2 -2
  24. data/doc/rvgtspan.html +2 -2
  25. data/doc/rvgtut.html +2 -2
  26. data/doc/rvguse.html +2 -2
  27. data/doc/rvgxform.html +2 -2
  28. data/doc/struct.html +2 -2
  29. data/doc/usage.html +2 -2
  30. data/ext/RMagick/MANIFEST +1 -1
  31. data/ext/RMagick/extconf.rb +65 -21
  32. data/ext/RMagick/rmagick.c +2 -2
  33. data/ext/RMagick/rmagick.h +3 -2
  34. data/ext/RMagick/rmdraw.c +119 -4
  35. data/ext/RMagick/rmenum.c +12 -3
  36. data/ext/RMagick/rmfill.c +122 -42
  37. data/ext/RMagick/rmilist.c +2 -2
  38. data/ext/RMagick/rmimage.c +99 -14
  39. data/ext/RMagick/rminfo.c +3 -6
  40. data/ext/RMagick/rmmain.c +18 -4
  41. data/ext/RMagick/rmmontage.c +2 -2
  42. data/ext/RMagick/rmpixel.c +2 -2
  43. data/ext/RMagick/rmstruct.c +20 -12
  44. data/ext/RMagick/rmutil.c +2 -2
  45. data/lib/RMagick.rb +2 -2
  46. data/lib/rvg/clippath.rb +2 -2
  47. data/lib/rvg/container.rb +2 -2
  48. data/lib/rvg/describable.rb +2 -2
  49. data/lib/rvg/embellishable.rb +2 -2
  50. data/lib/rvg/misc.rb +2 -2
  51. data/lib/rvg/paint.rb +2 -2
  52. data/lib/rvg/pathdata.rb +2 -2
  53. data/lib/rvg/rvg.rb +2 -2
  54. data/lib/rvg/stretchable.rb +2 -2
  55. data/lib/rvg/stylable.rb +2 -2
  56. data/lib/rvg/text.rb +2 -2
  57. data/lib/rvg/transformable.rb +2 -2
  58. data/lib/rvg/units.rb +2 -2
  59. data/rmagick.gemspec +1 -1
  60. metadata +2 -2
@@ -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.9.1: RVG Reference: RVG Class</title>
9
+ <title>RMagick 2.9.2: RVG Reference: RVG Class</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -27,7 +27,7 @@
27
27
  </head>
28
28
 
29
29
  <body>
30
- <h6 id="header">RMagick 2.9.1 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 2.9.2 User's Guide and Reference</h6>
31
31
 
32
32
  <div class="nav">
33
33
  &laquo;&nbsp;<a href="rvgtut.html">Prev</a> | <a href=
@@ -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.9.1: RVG Reference: RVG::ClipPath Class</title>
9
+ <title>RMagick 2.9.2: RVG Reference: RVG::ClipPath Class</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -27,7 +27,7 @@
27
27
  </head>
28
28
 
29
29
  <body>
30
- <h6 id="header">RMagick 2.9.1 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 2.9.2 User's Guide and Reference</h6>
31
31
 
32
32
  <div class="nav">
33
33
  &laquo;&nbsp;<a href="rvgpattern.html">Prev</a> | <a href=
@@ -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.9.1: RVG Reference: RVG::Group Class</title>
9
+ <title>RMagick 2.9.2: RVG Reference: RVG::Group Class</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -27,7 +27,7 @@
27
27
  </head>
28
28
 
29
29
  <body>
30
- <h6 id="header">RMagick 2.9.1 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 2.9.2 User's Guide and Reference</h6>
31
31
 
32
32
  <div class="nav">
33
33
  &laquo;&nbsp;<a href="rvg.html">Prev</a> | <a href=
@@ -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.9.1: RVG Reference: RVG::Image Class</title>
9
+ <title>RMagick 2.9.2: RVG Reference: RVG::Image Class</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -27,7 +27,7 @@
27
27
  </head>
28
28
 
29
29
  <body>
30
- <h6 id="header">RMagick 2.9.1 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 2.9.2 User's Guide and Reference</h6>
31
31
 
32
32
  <div class="nav">
33
33
  &laquo;&nbsp;<a href="rvggroup.html">Prev</a> | <a href=
@@ -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.9.1: RVG Reference: RVG::Pattern Class</title>
9
+ <title>RMagick 2.9.2: RVG Reference: RVG::Pattern Class</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -27,7 +27,7 @@
27
27
  </head>
28
28
 
29
29
  <body>
30
- <h6 id="header">RMagick 2.9.1 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 2.9.2 User's Guide and Reference</h6>
31
31
 
32
32
  <div class="nav">
33
33
  &laquo;&nbsp;<a href="rvgimage.html">Prev</a> | <a href=
@@ -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.9.1: RVG Reference: Shapes</title>
9
+ <title>RMagick 2.9.2: RVG Reference: Shapes</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -28,7 +28,7 @@
28
28
  </head>
29
29
 
30
30
  <body>
31
- <h6 id="header">RMagick 2.9.1 User's Guide and Reference</h6>
31
+ <h6 id="header">RMagick 2.9.2 User's Guide and Reference</h6>
32
32
 
33
33
  <div class="nav">
34
34
  &laquo;&nbsp;<a href="rvgstyle.html">Prev</a> | <a href=
@@ -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.9.1: RVG Reference: Styles</title>
9
+ <title>RMagick 2.9.2: RVG Reference: Styles</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -27,7 +27,7 @@
27
27
  </head>
28
28
 
29
29
  <body>
30
- <h6 id="header">RMagick 2.9.1 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 2.9.2 User's Guide and Reference</h6>
31
31
 
32
32
  <div class="nav">
33
33
  &laquo;&nbsp;<a href="rvguse.html">Prev</a> | <a href=
@@ -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.9.1: RVG Reference: RVG::Text Class</title>
9
+ <title>RMagick 2.9.2: RVG Reference: RVG::Text Class</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -33,7 +33,7 @@
33
33
  </head>
34
34
 
35
35
  <body>
36
- <h6 id="header">RMagick 2.9.1 User's Guide and Reference</h6>
36
+ <h6 id="header">RMagick 2.9.2 User's Guide and Reference</h6>
37
37
 
38
38
  <div class="nav">
39
39
  &laquo;&nbsp;<a href="rvgclip.html">Prev</a> | <a href=
@@ -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.9.1: RVG Reference: RVG::Tspan Class</title>
9
+ <title>RMagick 2.9.2: RVG Reference: RVG::Tspan Class</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -27,7 +27,7 @@
27
27
  </head>
28
28
 
29
29
  <body>
30
- <h6 id="header">RMagick 2.9.1 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 2.9.2 User's Guide and Reference</h6>
31
31
 
32
32
  <div class="nav">
33
33
  &laquo;&nbsp;<a href="rvgtext.html">Prev</a> | <a href=
@@ -9,7 +9,7 @@
9
9
  <meta name="generator" content=
10
10
  "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
11
11
 
12
- <title>RMagick 2.9.1: RVG Tutorial</title>
12
+ <title>RMagick 2.9.2: RVG Tutorial</title>
13
13
  <meta name="GENERATOR" content="Quanta Plus" />
14
14
  <link rel="stylesheet" type="text/css" href="css/doc.css" />
15
15
  <style type="text/css">
@@ -23,7 +23,7 @@
23
23
  </head>
24
24
 
25
25
  <body>
26
- <h6 id="header">RMagick 2.9.1 User's Guide and Reference</h6>
26
+ <h6 id="header">RMagick 2.9.2 User's Guide and Reference</h6>
27
27
 
28
28
  <div class="nav">
29
29
  &laquo;&nbsp;<a href="constants.html">Prev</a> | <a href=
@@ -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.9.1: RVG Reference: RVG::Use Class</title>
9
+ <title>RMagick 2.9.2: RVG Reference: RVG::Use Class</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -27,7 +27,7 @@
27
27
  </head>
28
28
 
29
29
  <body>
30
- <h6 id="header">RMagick 2.9.1 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 2.9.2 User's Guide and Reference</h6>
31
31
 
32
32
  <div class="nav">
33
33
  &laquo;&nbsp;<a href="rvgtspan.html">Prev</a> | <a href=
@@ -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.9.1: RVG Reference: Transforms</title>
9
+ <title>RMagick 2.9.2: RVG Reference: Transforms</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -28,7 +28,7 @@
28
28
  </head>
29
29
 
30
30
  <body>
31
- <h6 id="header">RMagick 2.9.1 User's Guide and Reference</h6>
31
+ <h6 id="header">RMagick 2.9.2 User's Guide and Reference</h6>
32
32
 
33
33
  <div class="nav">
34
34
  &laquo;&nbsp;<a href="rvgshape.html">Prev</a> | <a href=
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 6 November 2007), see www.w3.org" />
8
8
 
9
- <title>RMagick 2.9.1: Miscellaneous classes</title>
9
+ <title>RMagick 2.9.2: Miscellaneous classes</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -27,7 +27,7 @@
27
27
  </head>
28
28
 
29
29
  <body>
30
- <h6 id="header">RMagick 2.9.1 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 2.9.2 User's Guide and Reference</h6>
31
31
 
32
32
  <div class="nav">
33
33
  &laquo;&nbsp;<a href="draw.html">Prev</a> | <a href=
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 6 November 2007), see www.w3.org" />
8
8
 
9
- <title>RMagick 2.9.1: How to use RMagick</title>
9
+ <title>RMagick 2.9.2: How to use RMagick</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -90,7 +90,7 @@
90
90
  </head>
91
91
 
92
92
  <body>
93
- <h6 id="header">RMagick 2.9.1 User's Guide and Reference</h6>
93
+ <h6 id="header">RMagick 2.9.2 User's Guide and Reference</h6>
94
94
 
95
95
  <div class="nav">
96
96
  &laquo;&nbsp;<a href="index.html">Prev</a> | <a href=
@@ -1,4 +1,4 @@
1
- MANIFEST for RMagick-2.9.1 - 10:01:46 02/01/09
1
+ MANIFEST for RMagick-2.9.2 - 17:37:45 05/14/09
2
2
 
3
3
  doc/ilist.html
4
4
  doc/scripts/stripeTables.js
@@ -1,7 +1,7 @@
1
1
  require "mkmf"
2
2
  require "date"
3
3
 
4
- RMAGICK_VERS = "2.9.1"
4
+ RMAGICK_VERS = "2.9.2"
5
5
  MIN_RUBY_VERS = "1.8.2"
6
6
  MIN_RUBY_VERS_NO = MIN_RUBY_VERS.tr(".","").to_i
7
7
  MIN_IM_VERS = "6.3.0"
@@ -98,6 +98,24 @@ end
98
98
  end
99
99
 
100
100
 
101
+ unless checking_for("Ruby version >= 1.8.5") do
102
+ version = RUBY_VERSION.tr(".","").to_i
103
+ version >= 185
104
+ end
105
+ msg = <<END_OLD_RUBY_WARNING
106
+
107
+ #{"=" * 70}
108
+ warning: The RMagick 2 prerequisites are changing.
109
+ This is the last release that will support Ruby #{RUBY_VERSION}
110
+ The next release will require Ruby 1.8.5 or later.
111
+ #{"=" * 70}
112
+
113
+ END_OLD_RUBY_WARNING
114
+
115
+ Logging::message msg
116
+ message msg
117
+ end
118
+
101
119
 
102
120
 
103
121
  # Magick-config is not available on Windows
@@ -124,6 +142,26 @@ if RUBY_PLATFORM !~ /mswin/
124
142
  exit_failure "Can't install RMagick #{RMAGICK_VERS}. You must have ImageMagick #{MIN_IM_VERS} or later.\n"
125
143
  end
126
144
 
145
+ unless checking_for("ImageMagick version >= 6.3.5") do
146
+ version = `Magick-config --version`.chomp.tr(".","").to_i
147
+ version >= 635
148
+ end
149
+ msg = <<END_OLD_IM_WARNING
150
+
151
+ #{"=" * 70}
152
+ warning: The RMagick 2 prerequisites are changing.
153
+ This is the last release that will support ImageMagick #{`Magick-config --version`.chomp}
154
+ The next release will require ImageMagick 6.3.5 or later.
155
+ #{"=" * 70}
156
+
157
+ END_OLD_IM_WARNING
158
+
159
+ Logging::message msg
160
+ message msg
161
+ end
162
+
163
+
164
+
127
165
  $magick_version = `Magick-config --version`.chomp
128
166
 
129
167
  # Ensure ImageMagick is not configured for HDRI
@@ -180,8 +218,6 @@ end
180
218
 
181
219
 
182
220
  have_func("snprintf", headers)
183
-
184
-
185
221
  ["AcquireQuantumMemory", # 6.3.5-9
186
222
  "AcquireImage", # 6.4.1
187
223
  "AffinityImage", # 6.4.3-6
@@ -197,6 +233,7 @@ have_func("snprintf", headers)
197
233
  "ExcerptImage", # 6.3.5-8
198
234
  "ExtentImage", # 6.3.1
199
235
  "FloodfillPaintImage", # 6.3.7
236
+ "GetAuthenticIndexQueue", # 6.4.5-6
200
237
  "GetAuthenticPixels", # 6.4.5-6
201
238
  "GetImageAlphaChannel", # 6.3.9-2
202
239
  "GetImageProperty", # 6.3.1
@@ -212,6 +249,7 @@ have_func("snprintf", headers)
212
249
  "MagickCoreGenesis", # 6.3.4
213
250
  "OpaquePaintImageChannel", # 6.3.7-10
214
251
  "PolaroidImage", # 6.3.1-6
252
+ "QueueAuthenticPixels", # 6.4.5-6
215
253
  "RecolorImage", # 6.3.1-3
216
254
  "RemapImage", # 6.4.4-0
217
255
  "RemoveImageArtifact", # 6.3.6
@@ -288,6 +326,8 @@ have_enum_values("CompressionType", ["DXT1Compression", # 6
288
326
  have_enum_values("DistortImageMethod", ["ArcDistortion", # 6.3.5-5
289
327
  "BarrelDistortion", # 6.4.2-5
290
328
  "BarrelInverseDistortion", # 6.4.3-8
329
+ "BilinearForwardDistortion", # 6.5.1-2
330
+ "BilinearReverseDistortion", # 6.5.1-2
291
331
  "DePolarDistortion", # 6.4.2-6
292
332
  "PerspectiveProjectionDistortion", # 6.3.5-9
293
333
  "PolarDistortion", # 6.4.2-6
@@ -320,24 +360,28 @@ have_enum_values("MagickEvaluateOperator", ["PowEvaluateOperator", # 6
320
360
  "SineEvaluateOperator", # 6.4.8-5
321
361
  "AddModulusEvaluateOperator"], # 6.4.8-5
322
362
  headers)
323
- have_enum_values("MagickLayerMethod", ["OptimizeTransLayer", # 6.3.3-4
324
- "RemoveDupsLayer", # 6.3.3-6
325
- "RemoveZeroLayer", # 6.3.3-6
326
- "CompositeLayer", # 6.3.3-6
327
- "OptimizeImageLayer"], headers) # 6.3.3-?
328
- have_enum_values("ImageLayerMethod", ["FlattenLayer", # 6.3.6-2
329
- "MergeLayer", # 6.3.6
330
- "MosaicLayer", # 6.3.6-2
331
- "TrimBoundsLayer" ], headers) # 6.4.3-8
332
- have_enum_value("MetricType", "MeanErrorPerPixelMetric", headers) # 6.3.4-?
333
- have_enum_value("NoiseType", "RandomNoise", headers) # 6.3.5-0
334
- have_enum_value("SpreadMethod", "ReflectSpread", headers) # 6.3.1
335
- have_enum_values("VirtualPixelMethod", ["MaskVirtualPixelMethod", # 6.3.3
336
- "BlackVirtualPixelMethod", # 6.3.5
337
- "GrayVirtualPixelMethod", # 6.3.5
338
- "HorizontalTileVirtualPixelMethod", # 6.4.2-6
339
- "VerticalTileVirtualPixelMethod", # 6.4.2-6
340
- "WhiteVirtualPixelMethod"], headers) # 6.3.5
363
+ have_enum_values("MagickLayerMethod", ["OptimizeTransLayer", # 6.3.3-4
364
+ "RemoveDupsLayer", # 6.3.3-6
365
+ "RemoveZeroLayer", # 6.3.3-6
366
+ "CompositeLayer", # 6.3.3-6
367
+ "OptimizeImageLayer"], headers) # 6.3.3-?
368
+ have_enum_values("ImageLayerMethod", ["FlattenLayer", # 6.3.6-2
369
+ "MergeLayer", # 6.3.6
370
+ "MosaicLayer", # 6.3.6-2
371
+ "TrimBoundsLayer" ], headers) # 6.4.3-8
372
+ have_enum_value("MetricType", "MeanErrorPerPixelMetric", headers) # 6.3.4-?
373
+ have_enum_value("NoiseType", "RandomNoise", headers) # 6.3.5-0
374
+ have_enum_value("SpreadMethod", "ReflectSpread", headers) # 6.3.1
375
+ have_enum_values("VirtualPixelMethod", ["MaskVirtualPixelMethod", # 6.3.3
376
+ "BlackVirtualPixelMethod", # 6.3.5
377
+ "GrayVirtualPixelMethod", # 6.3.5
378
+ "HorizontalTileVirtualPixelMethod", # 6.4.2-6
379
+ "VerticalTileVirtualPixelMethod", # 6.4.2-6
380
+ "WhiteVirtualPixelMethod", # 6.3.5
381
+ "HorizontalTileEdgeVirtualPixelMethod", # 6.5.0-1
382
+ "VerticalTileEdgeVirtualPixelMethod", # 6.5.0-1
383
+ "CheckerTileVirtualPixelMethod"], # 6.5.0-1
384
+ headers)
341
385
 
342
386
 
343
387
  # Now test Ruby 1.9.0 features.
@@ -1,6 +1,6 @@
1
- /* $Id: rmagick.c,v 1.2 2008/12/27 17:16:03 rmagick Exp $ */
1
+ /* $Id: rmagick.c,v 1.3 2009/02/28 23:50:35 rmagick Exp $ */
2
2
  /*============================================================================\
3
- | Copyright (C) 2008 by Timothy P. Hunter
3
+ | Copyright (C) 2009 by Timothy P. Hunter
4
4
  | Name: rmagick.c
5
5
  | Author: Tim Hunter
6
6
  | Purpose: Contains Magick module methods.
@@ -1,6 +1,6 @@
1
- /* $Id: rmagick.h,v 1.269 2009/02/01 14:57:39 rmagick Exp $ */
1
+ /* $Id: rmagick.h,v 1.271 2009/03/25 22:56:03 rmagick Exp $ */
2
2
  /*=============================================================================
3
- | Copyright (C) 2008 by Timothy P. Hunter
3
+ | Copyright (C) 2009 by Timothy P. Hunter
4
4
  | Name: rmagick.h
5
5
  | Purpose: RMagick declarations and definitions
6
6
  | Author: Tim Hunter
@@ -1181,6 +1181,7 @@ extern void Font_to_TypeInfo(TypeInfo *, VALUE);
1181
1181
  extern void Export_TypeMetric(TypeMetric *, VALUE);
1182
1182
  extern VALUE Import_TypeInfo(const TypeInfo *);
1183
1183
  extern VALUE TypeMetric_to_s(VALUE);
1184
+ extern void Export_TypeInfo(TypeInfo *, VALUE);
1184
1185
  extern VALUE Import_TypeMetric(TypeMetric *);
1185
1186
  extern const char *StorageType_name(StorageType);
1186
1187
  extern VALUE VirtualPixelMethod_new(VirtualPixelMethod);
@@ -1,6 +1,6 @@
1
- /* $Id: rmdraw.c,v 1.75 2008/12/31 00:46:45 rmagick Exp $ */
1
+ /* $Id: rmdraw.c,v 1.77 2009/02/28 23:50:35 rmagick Exp $ */
2
2
  /*============================================================================\
3
- | Copyright (C) 2008 by Timothy P. Hunter
3
+ | Copyright (C) 2009 by Timothy P. Hunter
4
4
  | Name: rmdraw.c
5
5
  | Author: Tim Hunter
6
6
  | Purpose: Contains Draw class methods.
@@ -882,36 +882,118 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
882
882
  case AtopCompositeOp:
883
883
  op = "Atop";
884
884
  break;
885
+ case BlendCompositeOp:
886
+ op = "Blend";
887
+ break;
885
888
  case BumpmapCompositeOp:
886
889
  op = "Bumpmap";
887
890
  break;
891
+
892
+ #if defined(HAVE_ENUM_CHANGEMASKCOMPOSITEOP)
893
+ case ChangeMaskCompositeOp:
894
+ op = "ChangeMask";
895
+ break;
896
+ #endif
888
897
  case ClearCompositeOp:
889
898
  op = "Clear";
890
899
  break;
900
+ case ColorBurnCompositeOp:
901
+ op = "ColorBurn";
902
+ break;
903
+ case ColorDodgeCompositeOp:
904
+ op = "ColorDodge";
905
+ break;
906
+ case ColorizeCompositeOp:
907
+ op = "Colorize";
908
+ break;
909
+ case CopyCompositeOp:
910
+ op = "Copy";
911
+ break;
912
+ case CopyBlackCompositeOp:
913
+ op = "CopyBlack";
914
+ break;
891
915
  case CopyBlueCompositeOp:
892
916
  op = "CopyBlue";
893
917
  break;
918
+ case CopyCyanCompositeOp:
919
+ op = "CopyCyan";
920
+ break;
894
921
  case CopyGreenCompositeOp:
895
922
  op = "CopyGreen";
896
923
  break;
924
+ case CopyMagentaCompositeOp:
925
+ op = "CopyMagenta";
926
+ break;
897
927
  case CopyOpacityCompositeOp:
898
928
  op = "CopyOpacity";
899
929
  break;
900
930
  case CopyRedCompositeOp:
901
931
  op = "CopyRed";
902
932
  break;
903
- case CopyCompositeOp:
904
- op = "Copy";
933
+ case CopyYellowCompositeOp:
934
+ op = "CopyYellow";
935
+ break;
936
+ case DarkenCompositeOp:
937
+ op = "Darken";
938
+ break;
939
+ #if defined(HAVE_ENUM_DIVIDECOMPOSITEOP)
940
+ case DivideCompositeOp:
941
+ op = "Divide";
942
+ break;
943
+ #endif
944
+ case DstCompositeOp:
945
+ op = "Dst";
946
+ break;
947
+ case DstAtopCompositeOp:
948
+ op = "DstAtop";
949
+ break;
950
+ case DstInCompositeOp:
951
+ op = "DstIn";
952
+ break;
953
+ case DstOutCompositeOp:
954
+ op = "DstOut";
955
+ break;
956
+ case DstOverCompositeOp:
957
+ op = "DstOver";
905
958
  break;
906
959
  case DifferenceCompositeOp:
907
960
  op = "Difference";
908
961
  break;
962
+ case DisplaceCompositeOp:
963
+ op = "Displace";
964
+ break;
965
+ case DissolveCompositeOp:
966
+ op = "Dissolve";
967
+ break;
968
+ case ExclusionCompositeOp:
969
+ op = "Exclusion";
970
+ break;
971
+ case HardLightCompositeOp:
972
+ op = "HardLight";
973
+ break;
974
+ case HueCompositeOp:
975
+ op = "Hue";
976
+ break;
909
977
  case InCompositeOp:
910
978
  op = "In";
911
979
  break;
980
+ case LightenCompositeOp:
981
+ op = "Lighten";
982
+ break;
983
+ #if defined(HAVE_ENUM_LINEARLIGHTCOMPOSITEOP)
984
+ case LinearLightCompositeOp:
985
+ op = "LinearLight";
986
+ break;
987
+ #endif
988
+ case LuminizeCompositeOp:
989
+ op = "Luminize";
990
+ break;
912
991
  case MinusCompositeOp:
913
992
  op = "Minus";
914
993
  break;
994
+ case ModulateCompositeOp:
995
+ op = "Modulate";
996
+ break;
915
997
  case MultiplyCompositeOp:
916
998
  op = "Multiply";
917
999
  break;
@@ -921,12 +1003,45 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
921
1003
  case OverCompositeOp:
922
1004
  op = "Over";
923
1005
  break;
1006
+ case OverlayCompositeOp:
1007
+ op = "Overlay";
1008
+ break;
924
1009
  case PlusCompositeOp:
925
1010
  op = "Plus";
926
1011
  break;
1012
+ case ReplaceCompositeOp:
1013
+ op = "Replace";
1014
+ break;
1015
+ case SaturateCompositeOp:
1016
+ op = "Saturate";
1017
+ break;
1018
+ case ScreenCompositeOp:
1019
+ op = "Screen";
1020
+ break;
1021
+ case SoftLightCompositeOp:
1022
+ op = "SoftLight";
1023
+ break;
1024
+ case SrcCompositeOp:
1025
+ op = "Src";
1026
+ break;
1027
+ case SrcAtopCompositeOp:
1028
+ op = "SrcAtop";
1029
+ break;
1030
+ case SrcInCompositeOp:
1031
+ op = "SrcIn";
1032
+ break;
1033
+ case SrcOutCompositeOp:
1034
+ op = "SrcOut";
1035
+ break;
1036
+ case SrcOverCompositeOp:
1037
+ op = "SrcOver";
1038
+ break;
927
1039
  case SubtractCompositeOp:
928
1040
  op = "Subtract";
929
1041
  break;
1042
+ case ThresholdCompositeOp:
1043
+ op = "Threshold";
1044
+ break;
930
1045
  case XorCompositeOp:
931
1046
  op = "Xor";
932
1047
  break;