rmagick 2.9.2 → 2.10.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 (41) hide show
  1. data/ChangeLog +10 -0
  2. data/README.html +98 -210
  3. data/doc/comtasks.html +2 -2
  4. data/doc/constants.html +25 -3
  5. data/doc/draw.html +2 -2
  6. data/doc/ilist.html +2 -2
  7. data/doc/image1.html +15 -6
  8. data/doc/image2.html +12 -6
  9. data/doc/image3.html +71 -6
  10. data/doc/imageattrs.html +2 -2
  11. data/doc/imusage.html +2 -2
  12. data/doc/index.html +3 -3
  13. data/doc/info.html +2 -2
  14. data/doc/magick.html +2 -2
  15. data/doc/optequiv.html +11 -2
  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 +5 -3
  30. data/ext/RMagick/MANIFEST +1 -1
  31. data/ext/RMagick/extconf.rb +18 -98
  32. data/ext/RMagick/rmagick.h +2 -9
  33. data/ext/RMagick/rmdraw.c +11 -16
  34. data/ext/RMagick/rmenum.c +7 -35
  35. data/ext/RMagick/rmilist.c +1 -26
  36. data/ext/RMagick/rmimage.c +52 -169
  37. data/ext/RMagick/rmmain.c +87 -54
  38. data/ext/RMagick/rmpixel.c +2 -14
  39. data/ext/RMagick/rmutil.c +1 -73
  40. data/rmagick.gemspec +1 -1
  41. metadata +7 -15
data/doc/rvgimage.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.9.2: RVG Reference: RVG::Image Class</title>
9
+ <title>RMagick 2.10.0: 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.2 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 2.10.0 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=
data/doc/rvgpattern.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.9.2: RVG Reference: RVG::Pattern Class</title>
9
+ <title>RMagick 2.10.0: 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.2 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 2.10.0 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=
data/doc/rvgshape.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.9.2: RVG Reference: Shapes</title>
9
+ <title>RMagick 2.10.0: 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.2 User's Guide and Reference</h6>
31
+ <h6 id="header">RMagick 2.10.0 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=
data/doc/rvgstyle.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.9.2: RVG Reference: Styles</title>
9
+ <title>RMagick 2.10.0: 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.2 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 2.10.0 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=
data/doc/rvgtext.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.9.2: RVG Reference: RVG::Text Class</title>
9
+ <title>RMagick 2.10.0: 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.2 User's Guide and Reference</h6>
36
+ <h6 id="header">RMagick 2.10.0 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=
data/doc/rvgtspan.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.9.2: RVG Reference: RVG::Tspan Class</title>
9
+ <title>RMagick 2.10.0: 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.2 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 2.10.0 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=
data/doc/rvgtut.html CHANGED
@@ -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.2: RVG Tutorial</title>
12
+ <title>RMagick 2.10.0: 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.2 User's Guide and Reference</h6>
26
+ <h6 id="header">RMagick 2.10.0 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=
data/doc/rvguse.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.9.2: RVG Reference: RVG::Use Class</title>
9
+ <title>RMagick 2.10.0: 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.2 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 2.10.0 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=
data/doc/rvgxform.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.9.2: RVG Reference: Transforms</title>
9
+ <title>RMagick 2.10.0: 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.2 User's Guide and Reference</h6>
31
+ <h6 id="header">RMagick 2.10.0 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=
data/doc/struct.html CHANGED
@@ -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.2: Miscellaneous classes</title>
9
+ <title>RMagick 2.10.0: 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.2 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 2.10.0 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=
data/doc/usage.html CHANGED
@@ -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.2: How to use RMagick</title>
9
+ <title>RMagick 2.10.0: 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.2 User's Guide and Reference</h6>
93
+ <h6 id="header">RMagick 2.10.0 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=
@@ -1113,7 +1113,9 @@ exit
1113
1113
  "image2.html#gaussian_blur_channel">gaussian_blur_channel</a>,
1114
1114
  <a href="image2.html#motion_blur">motion_blur</a>, <a href=
1115
1115
  "image3.html#radial_blur">radial_blur</a>, <a href=
1116
- "image3.html#radial_blur_channel">radial_blur_channel</a></dt>
1116
+ "image3.html#radial_blur_channel">radial_blur_channel</a>,
1117
+ <a href=
1118
+ "image3.html#selective_blur_channel">selective_blur_channel</a></dt>
1117
1119
 
1118
1120
  <dd>Blur the image</dd>
1119
1121
 
data/ext/RMagick/MANIFEST CHANGED
@@ -1,4 +1,4 @@
1
- MANIFEST for RMagick-2.9.2 - 17:37:45 05/14/09
1
+ MANIFEST for RMagick-2.10.0 - 18:58:22 06/19/09
2
2
 
3
3
  doc/ilist.html
4
4
  doc/scripts/stripeTables.js
data/ext/RMagick/extconf.rb CHANGED
@@ -1,10 +1,10 @@
1
1
  require "mkmf"
2
2
  require "date"
3
3
 
4
- RMAGICK_VERS = "2.9.2"
5
- MIN_RUBY_VERS = "1.8.2"
4
+ RMAGICK_VERS = "2.10.0"
5
+ MIN_RUBY_VERS = "1.8.5"
6
6
  MIN_RUBY_VERS_NO = MIN_RUBY_VERS.tr(".","").to_i
7
- MIN_IM_VERS = "6.3.0"
7
+ MIN_IM_VERS = "6.3.5"
8
8
  MIN_IM_VERS_NO = MIN_IM_VERS.tr(".","").to_i
9
9
 
10
10
 
@@ -98,24 +98,6 @@ 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
-
119
101
 
120
102
 
121
103
  # Magick-config is not available on Windows
@@ -142,23 +124,6 @@ if RUBY_PLATFORM !~ /mswin/
142
124
  exit_failure "Can't install RMagick #{RMAGICK_VERS}. You must have ImageMagick #{MIN_IM_VERS} or later.\n"
143
125
  end
144
126
 
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
127
 
163
128
 
164
129
 
@@ -200,16 +165,17 @@ headers << "stdint.h" if have_header("stdint.h") # defines uint64_t
200
165
  headers << "sys/types.h" if have_header("sys/types.h")
201
166
 
202
167
 
203
- unless have_header("magick/MagickCore.h")
204
- exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find MagickCore.h.\n"
168
+ if have_header("wand/MagickWand.h")
169
+ headers << "wand/MagickWand.h"
205
170
  else
206
- headers << "magick/MagickCore.h"
171
+ exit_failure "\nCan't install RMagick #{RMAGICK_VERS}. Can't find MagickWand.h."
207
172
  end
208
173
 
209
174
 
175
+
210
176
  if RUBY_PLATFORM !~ /mswin/
211
177
 
212
- unless have_library("Magick", "InitializeMagick", headers) || have_library("MagickCore", "InitializeMagick", headers) || have_library("Magick++", "InitializeMagick")
178
+ unless have_library("MagickCore", "InitializeMagick", headers) || have_library("Magick", "InitializeMagick", headers)
213
179
  exit_failure "Can't install RMagick #{RMAGICK_VERS}. " +
214
180
  "Can't find the ImageMagick library or one of the dependent libraries. " +
215
181
  "Check the mkmf.log file for more detailed information.\n"
@@ -218,50 +184,29 @@ end
218
184
 
219
185
 
220
186
  have_func("snprintf", headers)
221
- ["AcquireQuantumMemory", # 6.3.5-9
222
- "AcquireImage", # 6.4.1
187
+ ["AcquireImage", # 6.4.1
223
188
  "AffinityImage", # 6.4.3-6
224
189
  "AffinityImages", # 6.4.3-6
225
- "ClutImageChannel", # 6.3.5-8
226
- "CompositeLayers", # 6.3.3-?
227
- "ConvertHSLToRGB", # 6.3.5-9
228
- "ConvertRGBToHSL", # 6.3.5-9
229
190
  "DeskewImage", # 6.4.2-5
230
- "DistortImage", # 6.3.5
231
191
  "EncipherImage", # 6.3.8-6
232
192
  "EqualizeImageChannel", # 6.3.6-9
233
- "ExcerptImage", # 6.3.5-8
234
- "ExtentImage", # 6.3.1
235
193
  "FloodfillPaintImage", # 6.3.7
236
194
  "GetAuthenticIndexQueue", # 6.4.5-6
237
195
  "GetAuthenticPixels", # 6.4.5-6
238
196
  "GetImageAlphaChannel", # 6.3.9-2
239
- "GetImageProperty", # 6.3.1
240
- "GetNextImageProperty", # 6.3.1
241
- "GetStringInfoDatum", # 6.3.2
242
197
  "GetVirtualPixels", # 6.4.5-6
243
- "InterpretImageProperties", # 6.3.2
244
- "IsHistogramImage", # 6.3.5
245
198
  "LevelImageColors", # 6.4.2
246
199
  "LevelizeImageChannel", # 6.4.2
247
- "LinearStretchImage", # 6.3.1
248
200
  "LiquidRescaleImage", # 6.3.8-2
249
- "MagickCoreGenesis", # 6.3.4
250
201
  "OpaquePaintImageChannel", # 6.3.7-10
251
- "PolaroidImage", # 6.3.1-6
252
202
  "QueueAuthenticPixels", # 6.4.5-6
253
- "RecolorImage", # 6.3.1-3
254
203
  "RemapImage", # 6.4.4-0
255
204
  "RemoveImageArtifact", # 6.3.6
256
- "ResetImagePage", # 6.3.3
257
- "ResizeQuantumMemory", # 6.3.5-9
205
+ "SelectiveBlurImageChannel", # 6.5.0-3
258
206
  "SetImageAlphaChannel", # 6.3.6-9
259
207
  "SetImageArtifact", # 6.3.6
260
- "SetImageMask", # 6.3.1
261
- "SetImageProperty", # 6.3.1
262
- "SetImageRegistry", # 6.3.4
263
- "SparseColorImage", # 6.3.4-?
264
- "SyncImageProfiles", # 6.3.2
208
+ "SetMagickMemoryMethods", # 6.4.1
209
+ "SparseColorImage", # 6.3.6-?
265
210
  "SyncAuthenticPixels", # 6.4.5-6
266
211
  "TransparentPaintImage", # 6.3.7-10
267
212
  "TransparentPaintImageChroma" # 6.4.5-6
@@ -297,15 +242,11 @@ end
297
242
 
298
243
 
299
244
 
300
- have_struct_member("ImageInfo", "profile", headers) # 6.3.2
301
- have_struct_member("Image", "tile_offset", headers) # 6.3.4
302
245
  have_struct_member("Image", "type", headers) # ???
303
246
  have_struct_member("DrawInfo", "kerning", headers) # 6.4.7-8
304
247
  have_struct_member("DrawInfo", "interword_spacing", headers) # 6.4.8-0
305
- have_type("AlphaChannelType", headers) # 6.3.5
306
248
  have_type("DitherMethod", headers) # 6.4.2
307
249
  have_type("ImageLayerMethod", headers) # 6.3.6 replaces MagickLayerMethod
308
- have_type("SpreadMethod", headers) # 6.3.1
309
250
  have_type("long double", headers)
310
251
  #have_type("unsigned long long", headers)
311
252
  #have_type("uint64_t", headers)
@@ -315,21 +256,18 @@ have_type("long double", headers)
315
256
  #check_sizeof("Image *", headers)
316
257
 
317
258
 
318
- have_enum_value("AlphaChannelType", "CopyAlphaChannel", headers) # 6.4.3-7
319
- have_enum_value("ColorspaceType", "CMYColorspace", headers) # 6.3.5
320
- have_enum_values("CompositeOperator", ["ChangeMaskCompositeOp", # 6.3.3
321
- "LinearLightCompositeOp", # 6.3.5
322
- "DivideCompositeOp"], headers) # 6.3.5
259
+ have_enum_values("AlphaChannelType", ["CopyAlphaChannel", # 6.4.3-7
260
+ "BackgroundAlphaChannel"], headers) # 6.5.2-5
261
+ have_enum_values("CompositeOperator", ["BlurCompositeOp", # 6.5.3-7
262
+ "DistortCompositeOp"], headers) # 6.5.3-10
323
263
  have_enum_values("CompressionType", ["DXT1Compression", # 6.3.9-3
324
264
  "DXT3Compression", # 6.3.9-3
325
265
  "DXT5Compression"], headers) # 6.3.9-3
326
- have_enum_values("DistortImageMethod", ["ArcDistortion", # 6.3.5-5
327
- "BarrelDistortion", # 6.4.2-5
266
+ have_enum_values("DistortImageMethod", ["BarrelDistortion", # 6.4.2-5
328
267
  "BarrelInverseDistortion", # 6.4.3-8
329
268
  "BilinearForwardDistortion", # 6.5.1-2
330
269
  "BilinearReverseDistortion", # 6.5.1-2
331
270
  "DePolarDistortion", # 6.4.2-6
332
- "PerspectiveProjectionDistortion", # 6.3.5-9
333
271
  "PolarDistortion", # 6.4.2-6
334
272
  "PolynomialDistortion", # 6.4.2-4
335
273
  "ShepardsDistortion"], headers) # 6.4.2-4
@@ -341,10 +279,6 @@ have_enum_values("FilterTypes", ["KaiserFilter", # 6
341
279
  "BohmanFilter", # 6.3.7-2
342
280
  "BartlettFilter", # 6.3.7-2
343
281
  "SentinelFilter"], headers) # 6.3.7-2
344
- have_enum_value("InterpolatePixelMethod", "SplineInterpolatePixel", headers) # 6.3.5
345
- have_enum_values("InterlaceType", ["GIFInterlace", # 6.3.4
346
- "JPEGInterlace", # 6.3.4
347
- "PNGInterlace"], headers) # 6.3.4
348
282
  have_enum_values("MagickEvaluateOperator", ["PowEvaluateOperator", # 6.4.1-9
349
283
  "LogEvaluateOperator", # 6.4.2
350
284
  "ThresholdEvaluateOperator", # 6.4.3
@@ -360,24 +294,12 @@ have_enum_values("MagickEvaluateOperator", ["PowEvaluateOperator", # 6
360
294
  "SineEvaluateOperator", # 6.4.8-5
361
295
  "AddModulusEvaluateOperator"], # 6.4.8-5
362
296
  headers)
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
297
  have_enum_values("ImageLayerMethod", ["FlattenLayer", # 6.3.6-2
369
298
  "MergeLayer", # 6.3.6
370
299
  "MosaicLayer", # 6.3.6-2
371
300
  "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
301
+ have_enum_values("VirtualPixelMethod", ["HorizontalTileVirtualPixelMethod", # 6.4.2-6
379
302
  "VerticalTileVirtualPixelMethod", # 6.4.2-6
380
- "WhiteVirtualPixelMethod", # 6.3.5
381
303
  "HorizontalTileEdgeVirtualPixelMethod", # 6.5.0-1
382
304
  "VerticalTileEdgeVirtualPixelMethod", # 6.5.0-1
383
305
  "CheckerTileVirtualPixelMethod"], # 6.5.0-1
@@ -394,8 +316,6 @@ end
394
316
 
395
317
  have_func("rb_frame_this_func", headers)
396
318
 
397
-
398
-
399
319
  # Miscellaneous constants
400
320
  $defs.push("-DRUBY_VERSION_STRING=\"ruby #{RUBY_VERSION}\"")
401
321
  $defs.push("-DRMAGICK_VERSION_STRING=\"RMagick #{RMAGICK_VERS}\"")
data/ext/RMagick/rmagick.h CHANGED
@@ -1,4 +1,4 @@
1
- /* $Id: rmagick.h,v 1.271 2009/03/25 22:56:03 rmagick Exp $ */
1
+ /* $Id: rmagick.h,v 1.273 2009/06/04 23:18:57 rmagick Exp $ */
2
2
  /*=============================================================================
3
3
  | Copyright (C) 2009 by Timothy P. Hunter
4
4
  | Name: rmagick.h
@@ -140,12 +140,6 @@
140
140
  f = NULL;
141
141
 
142
142
 
143
- // These two functions are defined in IM starting with 6.3.2.
144
- #if !defined(HAVE_GETSTRINGINFODATUM)
145
- #define GetStringInfoDatum(p) (unsigned char *)((p)->datum)
146
- #define GetStringInfoLength(p) (size_t)((p)->length)
147
- #endif
148
-
149
143
  // IM 6.4.1 replaced AllocateImage with AcquireImage.
150
144
  // Both have the same signature.
151
145
  #if !defined(HAVE_ACQUIREIMAGE)
@@ -358,9 +352,7 @@ EXTERN VALUE Class_CompositeOperator;
358
352
  EXTERN VALUE Class_CompressionType;
359
353
  EXTERN VALUE Class_DecorationType;
360
354
  EXTERN VALUE Class_DisposeType;
361
- #if defined(HAVE_DISTORTIMAGE)
362
355
  EXTERN VALUE Class_DistortImageMethod;
363
- #endif
364
356
  #if defined(HAVE_TYPE_DITHERMETHOD)
365
357
  EXTERN VALUE Class_DitherMethod;
366
358
  #endif
@@ -1026,6 +1018,7 @@ extern VALUE Image_sample(int, VALUE *, VALUE);
1026
1018
  extern VALUE Image_sample_bang(int, VALUE *, VALUE);
1027
1019
  extern VALUE Image_scale(int, VALUE *, VALUE);
1028
1020
  extern VALUE Image_scale_bang(int, VALUE *, VALUE);
1021
+ extern VALUE Image_selective_blur_channel(int, VALUE *, VALUE);
1029
1022
  extern VALUE Image_segment(int, VALUE *, VALUE);
1030
1023
  extern VALUE Image_separate(int, VALUE *, VALUE);
1031
1024
  extern VALUE Image_sepiatone(int, VALUE *, VALUE);