rmagick 1.8.3 → 1.9.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 (72) hide show
  1. data/ChangeLog +5 -0
  2. data/README.html +8 -8
  3. data/README.txt +6 -6
  4. data/configure +12 -11
  5. data/configure.ac +2 -2
  6. data/doc/draw.html +10 -10
  7. data/doc/ex/InitialCoords.rb +1 -2
  8. data/doc/ex/NewCoordSys.rb +1 -2
  9. data/doc/ex/OrigCoordSys.rb +1 -2
  10. data/doc/ex/PreserveAspectRatio.rb +4 -5
  11. data/doc/ex/RotateScale.rb +1 -2
  12. data/doc/ex/Skew.rb +1 -2
  13. data/doc/ex/Use01.rb +3 -4
  14. data/doc/ex/Use02.rb +3 -4
  15. data/doc/ex/Use03.rb +3 -4
  16. data/doc/ex/ViewBox.rb +1 -2
  17. data/doc/ex/arcs01.rb +2 -3
  18. data/doc/ex/arcs02.rb +3 -4
  19. data/doc/ex/baseline_shift01.rb +1 -2
  20. data/doc/ex/circle01.rb +2 -3
  21. data/doc/ex/cubic01.rb +2 -3
  22. data/doc/ex/cubic02.rb +2 -3
  23. data/doc/ex/ellipse01.rb +2 -3
  24. data/doc/ex/evenodd.rb +3 -4
  25. data/doc/ex/font_styles.rb +1 -2
  26. data/doc/ex/group.rb +3 -4
  27. data/doc/ex/image.rb +1 -2
  28. data/doc/ex/line01.rb +2 -3
  29. data/doc/ex/nested_rvg.rb +2 -3
  30. data/doc/ex/nonzero.rb +3 -4
  31. data/doc/ex/polygon01.rb +2 -3
  32. data/doc/ex/polyline01.rb +2 -3
  33. data/doc/ex/quad01.rb +2 -3
  34. data/doc/ex/rect01.rb +2 -3
  35. data/doc/ex/rect02.rb +2 -3
  36. data/doc/ex/rvg_clippath.rb +3 -4
  37. data/doc/ex/rvg_linecap.rb +2 -3
  38. data/doc/ex/rvg_linejoin.rb +2 -3
  39. data/doc/ex/rvg_opacity.rb +1 -2
  40. data/doc/ex/rvg_pattern.rb +3 -4
  41. data/doc/ex/rvg_stroke_dasharray.rb +1 -2
  42. data/doc/ex/stegano.rb +23 -7
  43. data/doc/ex/stroke_fill.rb +1 -2
  44. data/doc/ex/text01.rb +2 -3
  45. data/doc/ex/text_styles.rb +1 -2
  46. data/doc/ex/tref01.rb +3 -4
  47. data/doc/ex/triangle01.rb +2 -3
  48. data/doc/ex/tspan01.rb +2 -3
  49. data/doc/ex/tspan02.rb +2 -3
  50. data/doc/ex/tspan03.rb +2 -3
  51. data/doc/ex/writing_mode01.rb +2 -3
  52. data/doc/ex/writing_mode02.rb +2 -3
  53. data/doc/imageattrs.html +92 -1
  54. data/doc/info.html +29 -0
  55. data/doc/magick.html +12 -6
  56. data/doc/rvgstyle.html +0 -2
  57. data/ext/RMagick/MANIFEST +1 -1
  58. data/ext/RMagick/rmagick.h +8 -2
  59. data/ext/RMagick/rmagick_config.h.in +2 -0
  60. data/ext/RMagick/rmdraw.c +9 -4
  61. data/ext/RMagick/rmimage.c +37 -1
  62. data/ext/RMagick/rminfo.c +34 -1
  63. data/ext/RMagick/rmmain.c +10 -3
  64. data/ext/RMagick/rmutil.c +33 -2
  65. data/lib/RMagick.rb +30 -9
  66. data/lib/rvg/embellishable.rb +9 -9
  67. data/lib/rvg/misc.rb +17 -17
  68. data/lib/rvg/paint.rb +2 -2
  69. data/lib/rvg/rvg.rb +13 -13
  70. data/lib/rvg/text.rb +6 -6
  71. data/rmagick.gemspec +1 -1
  72. metadata +2 -2
data/doc/ex/writing_mode01.rb CHANGED
@@ -1,7 +1,6 @@
1
1
  require 'rvg/rvg'
2
- include Magick
3
2
 
4
- RVG.dpi = 90
3
+ Magick::RVG.dpi = 90
5
4
 
6
5
  TEXT_STYLES = {:writing_mode=>'tb',
7
6
  :glyph_orientation_vertical=>0,
@@ -15,7 +14,7 @@ TEXT_STYLES2 = {:writing_mode=>'tb',
15
14
  :font_weight=>'bold',
16
15
  :font_size=>16}
17
16
 
18
- rvg = RVG.new(1.25.in, 7.in).viewbox(0,0,125,700) do |canvas|
17
+ rvg = Magick::RVG.new(1.25.in, 7.in).viewbox(0,0,125,700) do |canvas|
19
18
  canvas.background_fill = 'white'
20
19
 
21
20
  canvas.text(40, 15, ":glyph_orientation_vertical=0").styles(TEXT_STYLES)
data/doc/ex/writing_mode02.rb CHANGED
@@ -1,7 +1,6 @@
1
1
  require 'rvg/rvg'
2
- include Magick
3
2
 
4
- RVG.dpi = 90
3
+ Magick::RVG.dpi = 90
5
4
 
6
5
  TEXT_STYLES = {:writing_mode=>'lr',
7
6
  :glyph_orientation_horizontal=>0,
@@ -15,7 +14,7 @@ TEXT_STYLES2 = {:writing_mode=>'lr',
15
14
  :font_weight=>'bold',
16
15
  :font_size=>16}
17
16
 
18
- rvg = RVG.new(3.in, 1.in).viewbox(0,0,300,100) do |canvas|
17
+ rvg = Magick::RVG.new(3.in, 1.in).viewbox(0,0,300,100) do |canvas|
19
18
  canvas.background_fill = 'white'
20
19
 
21
20
  canvas.text(15, 40, ":glyph_orientation_horizontal=0").styles(TEXT_STYLES)
data/doc/imageattrs.html CHANGED
@@ -4,7 +4,7 @@
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 1st December 2004), see www.w3.org" />
7
+ "HTML Tidy for Linux/x86 (vers 1st March 2005), see www.w3.org" />
8
8
 
9
9
  <title>RMagick: class Image (attribute methods)</title>
10
10
  <meta http-equiv="Content-Type" content=
@@ -121,6 +121,8 @@
121
121
  "#mean_error_per_pixel">mean_error_per_pixel</a></li>
122
122
 
123
123
  <li><a href="#mime_type">mime_type</a></li>
124
+
125
+ <li><a href="#monitor">monitor</a></li>
124
126
  </ul>
125
127
  </div>
126
128
 
@@ -983,6 +985,95 @@
983
985
  media-type, returns "image/x-magick". Get-only.</p>
984
986
  </div>
985
987
 
988
+ <div class="sig">
989
+ <h3 id="monitor">monitor</h3>
990
+
991
+ <p><span class="arg">image.</span>monitor = <em>aProc</em></p>
992
+ </div>
993
+
994
+ <div class="desc">
995
+ <h4>Description</h4>
996
+
997
+ <p>Establish a progress monitor. Most <code>Image</code> and
998
+ <code>ImageList</code> methods will periodically call the
999
+ monitor with arguments indicating the progress of the method.
1000
+ The argument is a Proc object that accepts the three arguments
1001
+ listed here:</p>
1002
+
1003
+ <dl>
1004
+ <dt>method_name</dt>
1005
+
1006
+ <dd>The name of the monitored method.</dd>
1007
+
1008
+ <dt>quantum</dt>
1009
+
1010
+ <dd>A number between 0 and <span class="arg">span</span> that
1011
+ identifies how much of the operation has been completed (or,
1012
+ in some cases, remains to be completed).</dd>
1013
+
1014
+ <dt>span</dt>
1015
+
1016
+ <dd>The number of quanta needed to complete the
1017
+ operation.</dd>
1018
+ </dl>
1019
+
1020
+ <p>If the monitor proc returns <code>nil</code> or
1021
+ <code>false</code> the operation will be immediately
1022
+ terminated. To stop monitoring, set <code>monitor</code> to
1023
+ <code>nil</code>. Available in ImageMagick 6.1.0 and later,
1024
+ this attribute supercedes <a href=
1025
+ "magick.html#set_monitor">Magick.set_monitor</a>. Set-only.</p>
1026
+
1027
+ <h4>Argument</h4>
1028
+
1029
+ <p>Any object that can respond to</p>
1030
+ <pre>
1031
+ obj.call(method_name, quantum, span)
1032
+ </pre>
1033
+
1034
+ <p>With very large images it is possible, though not very
1035
+ likely, for the <span class="arg">quantum</span> and
1036
+ <span class="arg">span</span> arguments to be
1037
+ <code>Bignum</code> objects.</p>
1038
+
1039
+ <h4>Example</h4>
1040
+ <pre>
1041
+ img.monitor = Proc.new do |method, offset, span|
1042
+ printf("%s is %3.0f%% complete.\n", method, (offset.to_f/span)*100)
1043
+ true
1044
+ end
1045
+
1046
+ img.blur_image(0,20)
1047
+ </pre>
1048
+
1049
+ <p><em>produces:</em></p>
1050
+ <pre>
1051
+ blur_image is 0% complete.
1052
+ blur_image is 0% complete.
1053
+ blur_image is 0% complete.
1054
+ blur_image is 1% complete.
1055
+ blur_image is 2% complete.
1056
+ blur_image is 4% complete.
1057
+ blur_image is 7% complete.
1058
+ blur_image is 14% complete.
1059
+ blur_image is 28% complete.
1060
+ blur_image is 56% complete.
1061
+ blur_image is 56% complete.
1062
+ blur_image is 56% complete.
1063
+ blur_image is 56% complete.
1064
+ blur_image is 57% complete.
1065
+ blur_image is 59% complete.
1066
+ blur_image is 63% complete.
1067
+ blur_image is 70% complete.
1068
+ blur_image is 84% complete.
1069
+ blur_image is 100% complete.
1070
+ </pre>
1071
+
1072
+ <h4>See also</h4>
1073
+
1074
+ <p><a href="info.html#monitor">Image::Info#monitor=</a></p>
1075
+ </div>
1076
+
986
1077
  <div class="sig">
987
1078
  <h3 id="montage">montage</h3>
988
1079
 
data/doc/info.html CHANGED
@@ -123,6 +123,8 @@
123
123
 
124
124
  <li><a href="#matte_color">matte_color</a></li>
125
125
 
126
+ <li><a href="#monitor">monitor</a></li>
127
+
126
128
  <li><a href="#monochrome">monochrome</a></li>
127
129
 
128
130
  <li><a href="#number_scenes">number_scenes</a></li>
@@ -999,6 +1001,33 @@ self.undefine("tiff", "bits-per-sample")
999
1001
  <a href="struct.html#Pixel">aPixel</a>.</p>
1000
1002
  </div>
1001
1003
 
1004
+ <div class="sig">
1005
+ <h3 id="monitor">monitor</h3>
1006
+
1007
+ <p><span class="arg">self.</span>monitor= <span class=
1008
+ "arg">aProc</span></p>
1009
+ </div>
1010
+
1011
+ <div class="desc">
1012
+ <h4>Description</h4>
1013
+
1014
+ <p>Set a <code>Proc</code> object as a progress monitor. This
1015
+ proc can be used to monitor the progress of methods that accept
1016
+ optional arguments such as <code>read</code> and
1017
+ <code>write</code>. To stop monitoring, set the monitor to
1018
+ <code>nil</code>. See <a href=
1019
+ "imageattrs.html#monitor">Image#monitor</a> for more informat
1020
+ about the proc. This attribute is set-only.</p>
1021
+
1022
+ <p>If you assign a monitor to an image with
1023
+ <code>self.monitor=</code> when the image is created, the image
1024
+ object inherits the monitor. Any methods applied to the new
1025
+ image will be monitored as well.</p>
1026
+
1027
+ <p>Available in ImageMagick 6.1.0 and later. This method
1028
+ supercedes the <code>Magick.set_monitor</code> method.</p>
1029
+ </div>
1030
+
1002
1031
  <div class="sig">
1003
1032
  <h3 id="monochrome">monochrome</h3>
1004
1033
 
data/doc/magick.html CHANGED
@@ -4,22 +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 1st July 2003), see www.w3.org" />
7
+ "HTML Tidy for Linux/x86 (vers 1st March 2005), see www.w3.org" />
8
8
 
9
9
  <title>RMagick: 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" />
13
- <meta name="Copyright" content="Copyright (C) 2005 by Timothy P. Hunter" />
13
+ <meta name="Copyright" content=
14
+ "Copyright (C) 2005 by Timothy P. Hunter" />
14
15
  <link rel="stylesheet" type="text/css" href="css/doc.css" />
15
- <script type="text/javascript" src="scripts/doc.js">
16
- </script>
17
- <style type="text/css">
16
+ <script type="text/javascript" src="scripts/doc.js">
17
+ </script>
18
+ <style type="text/css">
18
19
  /*<![CDATA[*/
19
20
 
20
21
  /* Styles local to this page. */
21
22
  /*]]>*/
22
- </style>
23
+ </style>
23
24
  </head>
24
25
 
25
26
  <body>
@@ -355,6 +356,11 @@ Magick.set_cache_threshold(10)
355
356
  <div class="desc">
356
357
  <h4>Description</h4>
357
358
 
359
+ <p><strong>Note:</strong> <em>This method is deprecated with
360
+ ImageMagick 6.1.0 and later versions. Use <a href=
361
+ "imageattrs.html#monitor">Image#monitor=</a> and <a href=
362
+ "info.html#monitor">Image::Info#monitor=</a> instead.</em></p>
363
+
358
364
  <p>Establish a monitor exit block. Some (see <a href=
359
365
  "#monitor_notes">below</a>) RMagick methods will call the
360
366
  monitor event block, passing parameters that describe how much
data/doc/rvgstyle.html CHANGED
@@ -43,8 +43,6 @@
43
43
  <h3>instance methods</h3>
44
44
 
45
45
  <div>
46
- class methods
47
-
48
46
  <ul>
49
47
  <li><a href="#styles">styles</a></li>
50
48
  </ul>
data/ext/RMagick/MANIFEST CHANGED
@@ -1,4 +1,4 @@
1
- MANIFEST for RMagick-1.8.3 - 17:30:19 06/17/05
1
+ MANIFEST for RMagick-1.9.0 - 18:03:12 07/15/05
2
2
 
3
3
  configure
4
4
  README.html
data/ext/RMagick/rmagick.h CHANGED
@@ -1,4 +1,4 @@
1
- /* $Id: rmagick.h,v 1.88 2005/06/14 22:41:02 rmagick Exp $ */
1
+ /* $Id: rmagick.h,v 1.89 2005/06/19 20:26:34 rmagick Exp $ */
2
2
  /*=============================================================================
3
3
  | Copyright (C) 2005 by Timothy P. Hunter
4
4
  | Name: rmagick.h
@@ -283,8 +283,8 @@ EXTERN VALUE Class_OrientationType;
283
283
  * Commonly-used IDs
284
284
  */
285
285
  EXTERN ID ID__dummy_img_; // "_dummy_img_"
286
- EXTERN ID ID_changed; // "changed"
287
286
  EXTERN ID ID_call; // "call"
287
+ EXTERN ID ID_changed; // "changed"
288
288
  EXTERN ID ID_cur_image; // "cur_image"
289
289
  EXTERN ID ID_dup; // "dup"
290
290
  EXTERN ID ID_enumerators; // "enumerators"
@@ -605,6 +605,7 @@ ATTR_ACCESSOR(Info, image_type)
605
605
  ATTR_ACCESSOR(Info, interlace)
606
606
  ATTR_ACCESSOR(Info, label)
607
607
  ATTR_ACCESSOR(Info, matte_color)
608
+ ATTR_WRITER(Info, monitor)
608
609
  ATTR_ACCESSOR(Info, monochrome)
609
610
  ATTR_ACCESSOR(Info, number_scenes)
610
611
  ATTR_ACCESSOR(Info, orientation)
@@ -676,6 +677,7 @@ ATTR_ACCESSOR(Image, matte)
676
677
  ATTR_ACCESSOR(Image, matte_color)
677
678
  ATTR_READER(Image, mean_error_per_pixel)
678
679
  ATTR_READER(Image, mime_type)
680
+ ATTR_WRITER(Image, monitor)
679
681
  ATTR_ACCESSOR(Image, montage)
680
682
  ATTR_READER(Image, normalized_mean_error)
681
683
  ATTR_READER(Image, normalized_maximum_error)
@@ -992,5 +994,9 @@ extern void rm_attr_write(VALUE, VALUE);
992
994
  extern void rm_get_geometry(VALUE, long *, long *, unsigned long *, unsigned long *, int *);
993
995
  extern void rm_split(Image *);
994
996
 
997
+ #if defined(HAVE_SETIMAGEPROGRESSMONITOR)
998
+ extern MagickBooleanType rm_progress_monitor(const char *, const MagickOffsetType, const MagickSizeType, void *);
999
+ #endif
1000
+
995
1001
  #endif
996
1002
 
data/ext/RMagick/rmagick_config.h.in CHANGED
@@ -150,6 +150,8 @@
150
150
  /* Introduced in IM 6.0.0, GM 1.1 */
151
151
  #undef HAVE_SETIMAGECHANNELDEPTH
152
152
  #undef HAVE_SETIMAGEOPTION
153
+ /* Introduced in IM 6.1.0 */
154
+ #undef HAVE_SETIMAGEPROGRESSMONITOR
153
155
  #undef HAVE_SETLOGFORMAT
154
156
  /* Introduced in IM 6.1.7 */
155
157
  #undef HAVE_SHADOWIMAGE
data/ext/RMagick/rmdraw.c CHANGED
@@ -1,4 +1,4 @@
1
- /* $Id: rmdraw.c,v 1.22 2005/03/05 16:18:39 rmagick Exp $ */
1
+ /* $Id: rmdraw.c,v 1.23 2005/06/24 22:31:33 rmagick Exp $ */
2
2
  /*============================================================================\
3
3
  | Copyright (C) 2005 by Timothy P. Hunter
4
4
  | Name: rmdraw.c
@@ -1287,13 +1287,18 @@ get_type_metrics(
1287
1287
  break;
1288
1288
  case 2:
1289
1289
  Data_Get_Struct(ImageList_cur_image(argv[0]), Image, image);
1290
- text = STRING_PTR(argv[1]);
1290
+ text = STRING_PTR_LEN(argv[1], text_l);
1291
1291
  break; // okay
1292
1292
  default:
1293
1293
  rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 or 2)", argc);
1294
1294
  break;
1295
1295
  }
1296
1296
 
1297
+ if (text_l == 0)
1298
+ {
1299
+ rb_raise(rb_eArgError, "no text to measure");
1300
+ }
1301
+
1297
1302
  Data_Get_Struct(self, Draw, draw);
1298
1303
  magick_clone_string(&draw->info->text, text);
1299
1304
 
@@ -1301,8 +1306,8 @@ get_type_metrics(
1301
1306
 
1302
1307
  if (!okay)
1303
1308
  {
1304
- rb_warning("RMagick: get_type_metrics failed");
1305
- return Qnil;
1309
+ rb_raise(rb_eRuntimeError, "Can't measure text. Are the fonts installed? "
1310
+ "Check the ImageMagick/GraphicsMagick 'type.xml' configuration file.");
1306
1311
  }
1307
1312
  return TypeMetric_from_TypeMetric(&metrics);
1308
1313
  }
data/ext/RMagick/rmimage.c CHANGED
@@ -1,4 +1,4 @@
1
- /* $Id: rmimage.c,v 1.98 2005/05/06 00:28:41 rmagick Exp $ */
1
+ /* $Id: rmimage.c,v 1.99 2005/06/19 20:26:34 rmagick Exp $ */
2
2
  /*============================================================================\
3
3
  | Copyright (C) 2005 by Timothy P. Hunter
4
4
  | Name: rmimage.c
@@ -4554,6 +4554,42 @@ Image_modulate(int argc, VALUE *argv, VALUE self)
4554
4554
  return rm_image_new(new_image);
4555
4555
  }
4556
4556
 
4557
+ /*
4558
+ Method: Image#monitor= proc
4559
+ Purpose: Establish a progress monitor
4560
+ Notes: A progress monitor is a callable object. Save the monitor proc
4561
+ as the client_data and establish `progress_monitor' as the
4562
+ monitor exit. When `progress_monitor' is called, retrieve
4563
+ the proc and call it.
4564
+ */
4565
+ VALUE
4566
+ Image_monitor_eq(VALUE self, VALUE monitor)
4567
+ {
4568
+ #if defined(HAVE_SETIMAGEPROGRESSMONITOR)
4569
+ Image *image;
4570
+
4571
+ Data_Get_Struct(self, Image, image);
4572
+
4573
+ if (NIL_P(monitor))
4574
+ {
4575
+ image->progress_monitor = NULL;
4576
+ }
4577
+ else
4578
+ {
4579
+ (void) SetImageProgressMonitor(image, rm_progress_monitor, (void *)monitor);
4580
+ }
4581
+
4582
+
4583
+ return self;
4584
+ #else
4585
+ rm_not_implemented();
4586
+ return (VALUE)0;
4587
+ #endif
4588
+ }
4589
+
4590
+
4591
+
4592
+
4557
4593
  /*
4558
4594
  Method: Image#monochrome?
4559
4595
  Purpose: return true if all the pixels in the image have the same red,
data/ext/RMagick/rminfo.c CHANGED
@@ -1,4 +1,4 @@
1
- /* $Id: rminfo.c,v 1.32 2005/06/12 21:07:56 rmagick Exp $ */
1
+ /* $Id: rminfo.c,v 1.33 2005/06/19 20:26:34 rmagick Exp $ */
2
2
  /*============================================================================\
3
3
  | Copyright (C) 2005 by Timothy P. Hunter
4
4
  | Name: rminfo.c
@@ -1163,6 +1163,39 @@ Info_matte_color_eq(VALUE self, VALUE matte_arg)
1163
1163
  return self;
1164
1164
  }
1165
1165
 
1166
+ /*
1167
+ Method: Info#monitor=
1168
+ Purpose: Establish a progress monitor
1169
+ Notes: See Image_monitor_eq
1170
+ */
1171
+ VALUE
1172
+ Info_monitor_eq(VALUE self, VALUE monitor)
1173
+ {
1174
+ #if defined(HAVE_SETIMAGEPROGRESSMONITOR)
1175
+ Info *info;
1176
+
1177
+ Data_Get_Struct(self, Info, info);
1178
+
1179
+ if (NIL_P(monitor))
1180
+ {
1181
+ info->progress_monitor = NULL;
1182
+ }
1183
+ else
1184
+ {
1185
+ (void) SetImageInfoProgressMonitor(info, rm_progress_monitor, (void *)monitor);
1186
+ }
1187
+
1188
+
1189
+ return self;
1190
+ #else
1191
+ rm_not_implemented();
1192
+ return (VALUE)0;
1193
+ #endif
1194
+ }
1195
+
1196
+
1197
+
1198
+
1166
1199
  DEF_ATTR_ACCESSOR(Info, monochrome, bool)
1167
1200
 
1168
1201
  #ifdef HAVE_IMAGEINFO_NUMBER_SCENES
data/ext/RMagick/rmmain.c CHANGED
@@ -1,4 +1,4 @@
1
- /* $Id: rmmain.c,v 1.89 2005/06/12 21:07:56 rmagick Exp $ */
1
+ /* $Id: rmmain.c,v 1.90 2005/06/19 20:26:34 rmagick Exp $ */
2
2
  /*============================================================================\
3
3
  | Copyright (C) 2005 by Timothy P. Hunter
4
4
  | Name: rmmain.c
@@ -386,7 +386,11 @@ Magick_set_monitor(VALUE class, VALUE monitor)
386
386
  {
387
387
  Magick_Monitor = rb_intern(MAGICK_MONITOR_CVAR);
388
388
  rb_define_class_variable(Module_Magick, MAGICK_MONITOR_CVAR, monitor);
389
- ID_call = rb_intern("call");
389
+
390
+ #if defined(HAVE_SETIMAGEPROGRESSMONITOR)
391
+ rb_warning("Magick.set_monitor is deprecated; use Image#monitor= or Image::Info#monitor= instead.");
392
+ #endif
393
+
390
394
  }
391
395
 
392
396
  // If nil, turn off monitoring.
@@ -498,6 +502,7 @@ Init_RMagick(void)
498
502
  /*-----------------------------------------------------------------------*/
499
503
 
500
504
  ID__dummy_img_ = rb_intern("_dummy_img_");
505
+ ID_call = rb_intern("call");
501
506
  ID_changed = rb_intern("changed");
502
507
  ID_cur_image = rb_intern("cur_image");
503
508
  ID_dup = rb_intern("dup");
@@ -594,6 +599,7 @@ Init_RMagick(void)
594
599
  DCL_ATTR_ACCESSOR(Image, matte_color)
595
600
  DCL_ATTR_READER(Image, mean_error_per_pixel)
596
601
  DCL_ATTR_READER(Image, mime_type)
602
+ DCL_ATTR_WRITER(Image, monitor)
597
603
  DCL_ATTR_ACCESSOR(Image, montage)
598
604
  DCL_ATTR_READER(Image, normalized_mean_error)
599
605
  DCL_ATTR_READER(Image, normalized_maximum_error)
@@ -955,6 +961,7 @@ Init_RMagick(void)
955
961
  DCL_ATTR_ACCESSOR(Info, interlace)
956
962
  DCL_ATTR_ACCESSOR(Info, label) // new in 6.0.0
957
963
  DCL_ATTR_ACCESSOR(Info, matte_color)
964
+ DCL_ATTR_WRITER(Info, monitor)
958
965
  DCL_ATTR_ACCESSOR(Info, monochrome)
959
966
  DCL_ATTR_ACCESSOR(Info, number_scenes) // new in 5.5.6, replaces subrange
960
967
  DCL_ATTR_ACCESSOR(Info, orientation) // new in 6.0.0
@@ -1531,7 +1538,7 @@ static void version_constants(void)
1531
1538
 
1532
1539
  rb_define_const(Module_Magick, "Version", rb_str_new2(PACKAGE_STRING));
1533
1540
  sprintf(long_version,
1534
- "This is %s ($Date: 2005/06/12 21:07:56 $) Copyright (C) 2005 by Timothy P. Hunter\n"
1541
+ "This is %s ($Date: 2005/06/19 20:26:34 $) Copyright (C) 2005 by Timothy P. Hunter\n"
1535
1542
  "Built with %s\n"
1536
1543
  "Built for %s\n"
1537
1544
  "Web page: http://rmagick.rubyforge.org\n"