rmagick 1.15.10 → 1.15.11

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 (42) hide show
  1. data/ChangeLog +7 -1
  2. data/README.html +8 -8
  3. data/README.txt +6 -6
  4. data/configure +11 -11
  5. data/configure.ac +1 -1
  6. data/doc/comtasks.html +2 -2
  7. data/doc/constants.html +2 -2
  8. data/doc/draw.html +2 -2
  9. data/doc/ex/get_multiline_type_metrics.rb +1 -1
  10. data/doc/ex/get_type_metrics.rb +6 -6
  11. data/doc/ilist.html +2 -2
  12. data/doc/image1.html +2 -2
  13. data/doc/image2.html +2 -2
  14. data/doc/image3.html +2 -2
  15. data/doc/imageattrs.html +2 -2
  16. data/doc/imusage.html +2 -2
  17. data/doc/index.html +3 -3
  18. data/doc/info.html +2 -2
  19. data/doc/magick.html +2 -2
  20. data/doc/optequiv.html +2 -2
  21. data/doc/rvg.html +2 -2
  22. data/doc/rvgclip.html +2 -2
  23. data/doc/rvggroup.html +2 -2
  24. data/doc/rvgimage.html +2 -2
  25. data/doc/rvgpattern.html +2 -2
  26. data/doc/rvgshape.html +2 -2
  27. data/doc/rvgstyle.html +2 -2
  28. data/doc/rvgtext.html +2 -2
  29. data/doc/rvgtspan.html +2 -2
  30. data/doc/rvgtut.html +2 -2
  31. data/doc/rvguse.html +2 -2
  32. data/doc/rvgxform.html +2 -2
  33. data/doc/struct.html +2 -2
  34. data/doc/usage.html +2 -2
  35. data/examples/demo.rb +1 -1
  36. data/ext/RMagick/MANIFEST +1 -1
  37. data/ext/RMagick/rmdraw.c +4 -1
  38. data/ext/RMagick/rmimage.c +39 -4
  39. data/ext/RMagick/rminfo.c +2 -2
  40. data/ext/RMagick/rmutil.c +19 -5
  41. data/rmagick.gemspec +1 -1
  42. metadata +2 -2
data/ChangeLog CHANGED
@@ -1,5 +1,11 @@
1
+ RMagick 1.15.11
2
+ o Fix bug #15887, the x_ and y_resolution attributes don't respect the units
3
+ attribute (bug report from Ben Greenburg)
4
+ o Fix bug #15889, memory leak in Draw#composite method (bug report from Till
5
+ Vollmer)
6
+
1
7
  RMagick 1.15.10
2
- o Update Magick::Pixel.from_HSL, #to_HSL to work with new APIs in
8
+ o Update Magick::Pixel.from_HSL, #to_HSL to work with new APIs in
3
9
  ImageMagick 6.3.5-9.
4
10
 
5
11
  RMagick 1.15.9
data/README.html CHANGED
@@ -1,14 +1,14 @@
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 1.15.10 README</title>
4
+ <title>RMagick 1.15.11 README</title>
5
5
  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
6
6
  <meta name="GENERATOR" content="BlueCloth">
7
7
  </head>
8
8
  <body>
9
- <h1>RMagick 1.15.10 README</h1>
9
+ <h1>RMagick 1.15.11 README</h1>
10
10
 
11
- <h2>09/16/07</h2>
11
+ <h2>11/25/07</h2>
12
12
 
13
13
  <h2>Table Of Contents</h2>
14
14
 
@@ -41,7 +41,7 @@ ImageMagick and GraphicsMagick image processing libraries.</p>
41
41
 
42
42
  <p><strong>Author:</strong> Tim Hunter</p>
43
43
 
44
- <p><strong>Email:</strong> <a href="&#109;&#097;&#x69;&#108;&#x74;&#x6F;:&#x72;&#109;&#097;&#103;&#105;&#x63;&#x6B;&#x40;&#114;&#117;&#098;&#x79;&#x66;o&#x72;&#103;&#101;&#046;&#x6F;&#114;g">&#x72;&#109;&#097;&#103;&#105;&#x63;&#x6B;&#x40;&#114;&#117;&#098;&#x79;&#x66;o&#x72;&#103;&#101;&#046;&#x6F;&#114;g</a></p>
44
+ <p><strong>Email:</strong> <a href="&#x6D;&#x61;&#105;&#108;&#116;&#111;:&#114;&#109;&#097;&#x67;&#105;&#099;&#107;&#x40;&#114;&#x75;&#x62;&#x79;f&#111;&#x72;&#103;&#x65;.&#111;&#x72;&#103;">&#114;&#109;&#097;&#x67;&#105;&#099;&#107;&#x40;&#114;&#x75;&#x62;&#x79;f&#111;&#x72;&#103;&#x65;.&#111;&#x72;&#103;</a></p>
45
45
 
46
46
  <p><strong>RubyForge:</strong> <a href="http://rubyforge.org/projects/rmagick/">http://rubyforge.org/projects/rmagick/</a></p>
47
47
 
@@ -228,7 +228,7 @@ addition to the regular options, there are a few RMagick-specific options:</p>
228
228
 
229
229
  <h4 id="scripts">Running the <code>configure</code> and <code>make</code> scripts</h4>
230
230
 
231
- <p>De-compress the RMagick-1.15.10.tar.gz archive and enter the top
231
+ <p>De-compress the RMagick-1.15.11.tar.gz archive and enter the top
232
232
  directory. Then type:</p>
233
233
 
234
234
  <pre><code>$ ./configure &lt;configuration options&gt;
@@ -249,9 +249,9 @@ $ make clean
249
249
 
250
250
  <p>When make is running the examples, if you get a message like this:</p>
251
251
 
252
- <pre><code>/home/you/RMagick-1.15.10/lib/RMagick.rb:11:in `require': libMagick.so.0:
252
+ <pre><code>/home/you/RMagick-1.15.11/lib/RMagick.rb:11:in `require': libMagick.so.0:
253
253
  cannot open shared object file: No such file or directory -
254
- /home/you/RMagick-1.15.10/ext/RMagick/RMagick.so (LoadError)
254
+ /home/you/RMagick-1.15.11/ext/RMagick/RMagick.so (LoadError)
255
255
  </code></pre>
256
256
 
257
257
  <p>you probably do not have the directory in which the ImageMagick or GraphicsMagick
@@ -271,7 +271,7 @@ systems, see the documentation for the dynamic loading facility.</p>
271
271
 
272
272
  <p>When make is running the examples, if you get a message like this:</p>
273
273
 
274
- <pre><code>hook /home/me/src/RMagick-1.15.10/./post-setup.rb failed:
274
+ <pre><code>hook /home/me/src/RMagick-1.15.11/./post-setup.rb failed:
275
275
  No such file or directory - "/tmp/rmagick6872.6"
276
276
  </code></pre>
277
277
 
data/README.txt CHANGED
@@ -1,6 +1,6 @@
1
- RMagick 1.15.10 README
1
+ RMagick 1.15.11 README
2
2
  ================================
3
- 09/16/07
3
+ 11/25/07
4
4
  --------
5
5
 
6
6
  Table Of Contents
@@ -196,7 +196,7 @@ addition to the regular options, there are a few RMagick-specific options:
196
196
 
197
197
  <h4 id="scripts">Running the <code>configure</code> and <code>make</code> scripts</h4>
198
198
 
199
- De-compress the RMagick-1.15.10.tar.gz archive and enter the top
199
+ De-compress the RMagick-1.15.11.tar.gz archive and enter the top
200
200
  directory. Then type:
201
201
 
202
202
  $ ./configure <configuration options>
@@ -214,9 +214,9 @@ The message can also refer to "libGraphicsMagick". Typically this message means
214
214
  #### Cannot open shared object file
215
215
  When make is running the examples, if you get a message like this:
216
216
 
217
- /home/you/RMagick-1.15.10/lib/RMagick.rb:11:in `require': libMagick.so.0:
217
+ /home/you/RMagick-1.15.11/lib/RMagick.rb:11:in `require': libMagick.so.0:
218
218
  cannot open shared object file: No such file or directory -
219
- /home/you/RMagick-1.15.10/ext/RMagick/RMagick.so (LoadError)
219
+ /home/you/RMagick-1.15.11/ext/RMagick/RMagick.so (LoadError)
220
220
 
221
221
  you probably do not have the directory in which the ImageMagick or GraphicsMagick
222
222
  library is installed in your load path. An easy way to fix this is to define the
@@ -233,7 +233,7 @@ systems, see the documentation for the dynamic loading facility.
233
233
  #### No such file or directory - "/tmp/rmagick6872.6"
234
234
  When make is running the examples, if you get a message like this:
235
235
 
236
- hook /home/me/src/RMagick-1.15.10/./post-setup.rb failed:
236
+ hook /home/me/src/RMagick-1.15.11/./post-setup.rb failed:
237
237
  No such file or directory - "/tmp/rmagick6872.6"
238
238
 
239
239
  you probably do not have a temporary directory environment variable set. Set
data/configure CHANGED
@@ -1,6 +1,6 @@
1
1
  #! /bin/sh
2
2
  # Guess values for system-dependent variables and create Makefiles.
3
- # Generated by GNU Autoconf 2.61 for RMagick 1.15.10.
3
+ # Generated by GNU Autoconf 2.61 for RMagick 1.15.11.
4
4
  #
5
5
  # Report bugs to <rmagick@rubyforge.org>.
6
6
  #
@@ -573,9 +573,9 @@ SHELL=${CONFIG_SHELL-/bin/sh}
573
573
 
574
574
  # Identity of this package.
575
575
  PACKAGE_NAME='RMagick'
576
- PACKAGE_TARNAME='RMagick-1.15.10.tar.gz'
577
- PACKAGE_VERSION='1.15.10'
578
- PACKAGE_STRING='RMagick 1.15.10'
576
+ PACKAGE_TARNAME='RMagick-1.15.11.tar.gz'
577
+ PACKAGE_VERSION='1.15.11'
578
+ PACKAGE_STRING='RMagick 1.15.11'
579
579
  PACKAGE_BUGREPORT='rmagick@rubyforge.org'
580
580
 
581
581
  # Factoring default headers for most tests.
@@ -1181,7 +1181,7 @@ if test "$ac_init_help" = "long"; then
1181
1181
  # Omit some internal or obsolete options to make the list less imposing.
1182
1182
  # This message is too long to be a string in the A/UX 3.1 sh.
1183
1183
  cat <<_ACEOF
1184
- \`configure' configures RMagick 1.15.10 to adapt to many kinds of systems.
1184
+ \`configure' configures RMagick 1.15.11 to adapt to many kinds of systems.
1185
1185
 
1186
1186
  Usage: $0 [OPTION]... [VAR=VALUE]...
1187
1187
 
@@ -1229,7 +1229,7 @@ Fine tuning of the installation directories:
1229
1229
  --infodir=DIR info documentation [DATAROOTDIR/info]
1230
1230
  --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
1231
1231
  --mandir=DIR man documentation [DATAROOTDIR/man]
1232
- --docdir=DIR documentation root [DATAROOTDIR/doc/RMagick-1.15.10.tar.gz]
1232
+ --docdir=DIR documentation root [DATAROOTDIR/doc/RMagick-1.15.11.tar.gz]
1233
1233
  --htmldir=DIR html documentation [DOCDIR]
1234
1234
  --dvidir=DIR dvi documentation [DOCDIR]
1235
1235
  --pdfdir=DIR pdf documentation [DOCDIR]
@@ -1242,7 +1242,7 @@ fi
1242
1242
 
1243
1243
  if test -n "$ac_init_help"; then
1244
1244
  case $ac_init_help in
1245
- short | recursive ) echo "Configuration of RMagick 1.15.10:";;
1245
+ short | recursive ) echo "Configuration of RMagick 1.15.11:";;
1246
1246
  esac
1247
1247
  cat <<\_ACEOF
1248
1248
 
@@ -1355,7 +1355,7 @@ fi
1355
1355
  test -n "$ac_init_help" && exit $ac_status
1356
1356
  if $ac_init_version; then
1357
1357
  cat <<\_ACEOF
1358
- RMagick configure 1.15.10
1358
+ RMagick configure 1.15.11
1359
1359
  generated by GNU Autoconf 2.61
1360
1360
 
1361
1361
  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1369,7 +1369,7 @@ cat >config.log <<_ACEOF
1369
1369
  This file contains any messages produced by compilers while
1370
1370
  running configure, to aid debugging if configure makes a mistake.
1371
1371
 
1372
- It was created by RMagick $as_me 1.15.10, which was
1372
+ It was created by RMagick $as_me 1.15.11, which was
1373
1373
  generated by GNU Autoconf 2.61. Invocation command line was
1374
1374
 
1375
1375
  $ $0 $@
@@ -11212,7 +11212,7 @@ exec 6>&1
11212
11212
  # report actual input values of CONFIG_FILES etc. instead of their
11213
11213
  # values after options handling.
11214
11214
  ac_log="
11215
- This file was extended by RMagick $as_me 1.15.10, which was
11215
+ This file was extended by RMagick $as_me 1.15.11, which was
11216
11216
  generated by GNU Autoconf 2.61. Invocation command line was
11217
11217
 
11218
11218
  CONFIG_FILES = $CONFIG_FILES
@@ -11261,7 +11261,7 @@ Report bugs to <bug-autoconf@gnu.org>."
11261
11261
  _ACEOF
11262
11262
  cat >>$CONFIG_STATUS <<_ACEOF
11263
11263
  ac_cs_version="\\
11264
- RMagick config.status 1.15.10
11264
+ RMagick config.status 1.15.11
11265
11265
  configured by $0, generated by GNU Autoconf 2.61,
11266
11266
  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
11267
11267
 
data/configure.ac CHANGED
@@ -1,7 +1,7 @@
1
1
 
2
2
  # RMagick configure.ac
3
3
 
4
- AC_INIT(RMagick, 1.15.10, rmagick@rubyforge.org, RMagick-1.15.10.tar.gz)
4
+ AC_INIT(RMagick, 1.15.11, rmagick@rubyforge.org, RMagick-1.15.11.tar.gz)
5
5
  echo "Configuring ${PACKAGE_STRING}"
6
6
 
7
7
  AC_CONFIG_HEADER([ext/RMagick/rmagick_config.h])
data/doc/comtasks.html CHANGED
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: Common Tasks</title>
9
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
34
+ <h6 id="header">RMagick 1.15.11 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
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: Constants</title>
9
+ <title>RMagick 1.15.11: 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" />
@@ -61,7 +61,7 @@
61
61
  </head>
62
62
 
63
63
  <body>
64
- <h6 id="header">RMagick 1.15.10 User's Guide and Reference</h6>
64
+ <h6 id="header">RMagick 1.15.11 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=
data/doc/draw.html CHANGED
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: class Draw</title>
9
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
28
+ <h6 id="header">RMagick 1.15.11 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/get_multiline_type_metrics.rb CHANGED
@@ -9,7 +9,7 @@ background = Image.new(200, 200)
9
9
  gc = Draw.new
10
10
 
11
11
  # Draw the text centered on the background
12
- gc.annotate(background, 0, 0, 0, 0, TEXT) do |gc|
12
+ gc.annotate(background, 0, 0, 0, 0, TEXT) do
13
13
  gc.font_family = 'Verdana'
14
14
  gc.pointsize = 36
15
15
  gc.gravity = CenterGravity
data/doc/ex/get_type_metrics.rb CHANGED
@@ -36,12 +36,12 @@ canvas = Image.new(410,320,HatchFill.new('white', 'lightcyan2'))
36
36
  # Draw a big lowercase 'g' on the canvas. Leave room on all sides for
37
37
  # the labels. Use 'undercolor' to set off the glyph.
38
38
  glyph = Draw.new
39
- glyph.annotate(canvas, 0, 0, Origin_x, Origin_y, Glyph) do |opts|
40
- opts.pointsize = 124
41
- opts.stroke = 'none'
42
- opts.fill = 'black'
43
- opts.font_family = Face
44
- opts.undercolor = '#ffff00c0'
39
+ glyph.annotate(canvas, 0, 0, Origin_x, Origin_y, Glyph) do
40
+ glyph.pointsize = 124
41
+ glyph.stroke = 'none'
42
+ glyph.fill = 'black'
43
+ glyph.font_family = Face
44
+ glyph.undercolor = '#ffff00c0'
45
45
  end
46
46
 
47
47
  # Call get_type_metrics. This is what this example's all about.
data/doc/ilist.html CHANGED
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: class ImageList</title>
9
+ <title>RMagick 1.15.11: 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" />
@@ -20,7 +20,7 @@
20
20
  </head>
21
21
 
22
22
  <body>
23
- <h6 id="header">RMagick 1.15.10 User's Guide and Reference</h6>
23
+ <h6 id="header">RMagick 1.15.11 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=
data/doc/image1.html CHANGED
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: class Image (class and instance methods,
9
+ <title>RMagick 1.15.11: class Image (class and instance methods,
10
10
  part 1)</title>
11
11
  <meta http-equiv="Content-Type" content=
12
12
  "text/html; charset=us-ascii" />
@@ -48,7 +48,7 @@ float: left;
48
48
  </head>
49
49
 
50
50
  <body>
51
- <h6 id="header">RMagick 1.15.10 User's Guide and Reference</h6>
51
+ <h6 id="header">RMagick 1.15.11 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=
data/doc/image2.html CHANGED
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: class Image (instance methods, part 2)</title>
9
+ <title>RMagick 1.15.11: class Image (instance methods, part 2)</title>
10
10
  <meta http-equiv="Content-Type" content=
11
11
  "text/html; charset=us-ascii" />
12
12
  <meta name="GENERATOR" content="Quanta Plus" />
@@ -47,7 +47,7 @@ td.ds {
47
47
  </head>
48
48
 
49
49
  <body>
50
- <h6 id="header">RMagick 1.15.10 User's Guide and Reference</h6>
50
+ <h6 id="header">RMagick 1.15.11 User's Guide and Reference</h6>
51
51
 
52
52
  <div class="nav">
53
53
  &laquo;&nbsp;<a href="image1.html">Prev</a> | <a href=
data/doc/image3.html CHANGED
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: class Image (instance methods, part
9
+ <title>RMagick 1.15.11: class Image (instance methods, part
10
10
  3)</title>
11
11
  <meta http-equiv="Content-Type" content=
12
12
  "text/html; charset=us-ascii" />
@@ -52,7 +52,7 @@
52
52
  </head>
53
53
 
54
54
  <body>
55
- <h6 id="header">RMagick 1.15.10 User's Guide and Reference</h6>
55
+ <h6 id="header">RMagick 1.15.11 User's Guide and Reference</h6>
56
56
 
57
57
  <div class="nav">
58
58
  &laquo;&nbsp;<a href="image2.html">Prev</a> | <a href=
data/doc/imageattrs.html CHANGED
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: class Image (attribute methods)</title>
9
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
28
+ <h6 id="header">RMagick 1.15.11 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=
data/doc/imusage.html CHANGED
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: ImageMagick/GraphicsMagick Conventions</title>
9
+ <title>RMagick 1.15.11: ImageMagick/GraphicsMagick 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 1.15.10 User's Guide and Reference</h6>
72
+ <h6 id="header">RMagick 1.15.11 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=
data/doc/index.html CHANGED
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10 User's Guide and
9
+ <title>RMagick 1.15.11 User's Guide and
10
10
  Reference</title>
11
11
  <meta http-equiv="Content-Type" content=
12
12
  "text/html; charset=us-ascii" />
@@ -107,7 +107,7 @@
107
107
 
108
108
  <p id="magick">Ruby+ImageMagick<span class="tm">TM</span><br />
109
109
  Ruby+GraphicsMagick<br />
110
- Version 1.15.10</p>
110
+ Version 1.15.11</p>
111
111
 
112
112
  <h1>User's Guide and Reference</h1>
113
113
 
@@ -316,7 +316,7 @@
316
316
 
317
317
  <h3>About this document</h3>
318
318
 
319
- <p>This document describes Version 1.15.10 of RMagick.
319
+ <p>This document describes Version 1.15.11 of RMagick.
320
320
  It is divided into 4 parts. The first is this page. The second
321
321
  part is a user's guide covering both RMagick and
322
322
  ImageMagick/GraphicsMagick usage and conventions. The third part
data/doc/info.html CHANGED
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: class Image::Info - Optional method
9
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
47
+ <h6 id="header">RMagick 1.15.11 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=
data/doc/magick.html CHANGED
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: module Magick</title>
9
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
27
+ <h6 id="header">RMagick 1.15.11 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=
data/doc/optequiv.html CHANGED
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: Magick Command Options and Their Equivalent
9
+ <title>RMagick 1.15.11: Magick Command Options and Their Equivalent
10
10
  Methods</title>
11
11
  <meta http-equiv="Content-Type" content=
12
12
  "text/html; charset=us-ascii" />
@@ -70,7 +70,7 @@ td {
70
70
  </head>
71
71
 
72
72
  <body>
73
- <h6 id="header">RMagick 1.15.10 User's Guide and Reference</h6>
73
+ <h6 id="header">RMagick 1.15.11 User's Guide and Reference</h6>
74
74
 
75
75
  <div class="nav">
76
76
  &laquo; <a href="index.html">Prev</a> | <a href=
data/doc/rvg.html CHANGED
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: RVG Reference: RVG Class</title>
9
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 1.15.11 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=
data/doc/rvgclip.html CHANGED
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1st March 2005), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: RVG Reference: RVG::ClipPath Class</title>
9
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 1.15.11 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=
data/doc/rvggroup.html CHANGED
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1st March 2005), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: RVG Reference: RVG::Group Class</title>
9
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 1.15.11 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=
data/doc/rvgimage.html CHANGED
@@ -6,7 +6,7 @@
6
6
  <meta name="generator" content=
7
7
  "HTML Tidy for Linux/x86 (vers 1st March 2005), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: RVG Reference: RVG::Image Class</title>
9
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 1.15.11 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 1st March 2005), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: RVG Reference: RVG::Pattern Class</title>
9
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 1.15.11 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 1st March 2005), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: RVG Reference: Shapes</title>
9
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
31
+ <h6 id="header">RMagick 1.15.11 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 1st March 2005), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: RVG Reference: Styles</title>
9
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 1.15.11 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 1st March 2005), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: RVG Reference: RVG::Text Class</title>
9
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
36
+ <h6 id="header">RMagick 1.15.11 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 1st March 2005), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: RVG Reference: RVG::Tspan Class</title>
9
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 1.15.11 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 1st March 2005), see www.w3.org" />
11
11
 
12
- <title>RMagick 1.15.10: RVG Tutorial</title>
12
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
26
+ <h6 id="header">RMagick 1.15.11 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 1st March 2005), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: RVG Reference: RVG::Use Class</title>
9
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 1.15.11 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 1st December 2004), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: RVG Reference: Transforms</title>
9
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
31
+ <h6 id="header">RMagick 1.15.11 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 1st March 2005), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: Miscellaneous classes</title>
9
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
30
+ <h6 id="header">RMagick 1.15.11 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 1st December 2004), see www.w3.org" />
8
8
 
9
- <title>RMagick 1.15.10: How to use RMagick</title>
9
+ <title>RMagick 1.15.11: 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 1.15.10 User's Guide and Reference</h6>
93
+ <h6 id="header">RMagick 1.15.11 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=
data/examples/demo.rb CHANGED
@@ -308,7 +308,7 @@ begin
308
308
  montage_image << montage.composite(logo, 245, 0, OverCompositeOp)
309
309
 
310
310
  # Write the result to a file
311
- montage_image.compression = RunlengthEncodedCompression
311
+ montage_image.compression = RLECompression
312
312
  montage_image.matte = false
313
313
  puts "Writing image ./rm_demo_out.miff"
314
314
  montage_image.write "rm_demo_out.miff"
data/ext/RMagick/MANIFEST CHANGED
@@ -1,4 +1,4 @@
1
- MANIFEST for RMagick-1.15.10 - 18:41:08 09/16/07
1
+ MANIFEST for RMagick-1.15.11 - 14:46:59 11/25/07
2
2
 
3
3
  doc/ilist.html
4
4
  doc/scripts/stripeTables.js
data/ext/RMagick/rmdraw.c CHANGED
@@ -1,4 +1,4 @@
1
- /* $Id: rmdraw.c,v 1.43.2.2 2007/04/13 00:13:56 rmagick Exp $ */
1
+ /* $Id: rmdraw.c,v 1.43.2.2.2.1 2007/11/25 19:42:42 rmagick Exp $ */
2
2
  /*============================================================================\
3
3
  | Copyright (C) 2007 by Timothy P. Hunter
4
4
  | Name: rmdraw.c
@@ -855,6 +855,7 @@ destroy_Draw(void *drawptr)
855
855
  if (draw->info)
856
856
  {
857
857
  (void) DestroyDrawInfo(draw->info);
858
+ draw->info = NULL;
858
859
  }
859
860
 
860
861
  // Erase any temporary image files.
@@ -1186,10 +1187,12 @@ destroy_Montage(void *obj)
1186
1187
  if (montage->info && montage->info->texture != NULL)
1187
1188
  {
1188
1189
  rm_delete_temp_image(montage->info->texture);
1190
+ montage->info->texture = NULL;
1189
1191
  }
1190
1192
  if (montage->info)
1191
1193
  {
1192
1194
  (void) DestroyMontageInfo(montage->info);
1195
+ montage->info = NULL;
1193
1196
  }
1194
1197
  xfree(montage);
1195
1198
  }
data/ext/RMagick/rmimage.c CHANGED
@@ -1,4 +1,4 @@
1
- /* $Id: rmimage.c,v 1.192.2.5 2007/07/31 12:25:23 rmagick Exp $ */
1
+ /* $Id: rmimage.c,v 1.192.2.5.2.2 2007/11/25 19:44:18 rmagick Exp $ */
2
2
  /*============================================================================\
3
3
  | Copyright (C) 2007 by Timothy P. Hunter
4
4
  | Name: rmimage.c
@@ -3061,7 +3061,7 @@ Image_constitute(VALUE class, VALUE width_arg, VALUE height_arg
3061
3061
  npixels = (long)(width * height * map_l);
3062
3062
  if (RARRAY(pixels_arg)->len != npixels)
3063
3063
  {
3064
- rb_raise(rb_eArgError, "wrong number of array elements (%d for %d)"
3064
+ rb_raise(rb_eArgError, "wrong number of array elements (%ld for %ld)"
3065
3065
  , RARRAY(pixels_arg)->len, npixels);
3066
3066
  }
3067
3067
 
@@ -3093,7 +3093,7 @@ Image_constitute(VALUE class, VALUE width_arg, VALUE height_arg
3093
3093
  pixel = rb_ary_entry(pixels_arg, x);
3094
3094
  if (TYPE(pixel) != type)
3095
3095
  {
3096
- rb_raise(rb_eTypeError, "element %d in pixel array is %s, expected %s"
3096
+ rb_raise(rb_eTypeError, "element %ld in pixel array is %s, expected %s"
3097
3097
  , x, rb_class2name(CLASS_OF(pixel)),rb_class2name(CLASS_OF(pixel0)));
3098
3098
  }
3099
3099
  if (type == T_FLOAT)
@@ -3101,7 +3101,7 @@ Image_constitute(VALUE class, VALUE width_arg, VALUE height_arg
3101
3101
  pixels.f[x] = (float) NUM2DBL(pixel);
3102
3102
  if (pixels.f[x] < 0.0 || pixels.f[x] > 1.0)
3103
3103
  {
3104
- rb_raise(rb_eArgError, "element %d is out of range [0..1]: %f", x, pixels.f[x]);
3104
+ rb_raise(rb_eArgError, "element %ld is out of range [0..1]: %f", x, pixels.f[x]);
3105
3105
  }
3106
3106
  }
3107
3107
  else
@@ -3289,6 +3289,7 @@ Image_convolve(
3289
3289
 
3290
3290
  order = NUM2UINT(order_arg);
3291
3291
 
3292
+ kernel_arg = rb_Array(kernel_arg);
3292
3293
  rm_check_ary_len(kernel_arg, (long)(order*order));
3293
3294
 
3294
3295
  // Convert the kernel array argument to an array of doubles
@@ -10176,13 +10177,47 @@ Image_units_eq(
10176
10177
  VALUE restype)
10177
10178
  {
10178
10179
  Image *image;
10180
+ ResolutionType units;
10179
10181
 
10180
10182
  rm_check_frozen(self);
10181
10183
  Data_Get_Struct(self, Image, image);
10184
+
10182
10185
  VALUE_TO_ENUM(restype, image->units, ResolutionType);
10186
+
10187
+ if (image->units != units)
10188
+ {
10189
+ switch (image->units)
10190
+ {
10191
+ case PixelsPerInchResolution:
10192
+ if (units == PixelsPerCentimeterResolution)
10193
+ {
10194
+ image->x_resolution /= 2.54;
10195
+ image->y_resolution /= 2.54;
10196
+ }
10197
+ break;
10198
+
10199
+ case PixelsPerCentimeterResolution:
10200
+ if (units == PixelsPerInchResolution)
10201
+ {
10202
+ image->x_resolution *= 2.54;
10203
+ image->y_resolution *= 2.54;
10204
+ }
10205
+ break;
10206
+
10207
+ default:
10208
+ // UndefinedResolution
10209
+ image->x_resolution = 0.0;
10210
+ image->y_resolution = 0.0;
10211
+ break;
10212
+ }
10213
+
10214
+ image->units = units;
10215
+ }
10216
+
10183
10217
  return self;
10184
10218
  }
10185
10219
 
10220
+
10186
10221
  /*
10187
10222
  Method: Image#unsharp_mask(radius=0.0, sigma=1.0, amount=1.0, threshold=0.05)
10188
10223
  Purpose: sharpens an image. "amount" is the percentage of the difference
data/ext/RMagick/rminfo.c CHANGED
@@ -1,4 +1,4 @@
1
- /* $Id: rminfo.c,v 1.45.2.2 2007/03/04 00:05:36 rmagick Exp $ */
1
+ /* $Id: rminfo.c,v 1.45.2.2.2.1 2007/09/30 22:10:22 rmagick Exp $ */
2
2
  /*============================================================================\
3
3
  | Copyright (C) 2007 by Timothy P. Hunter
4
4
  | Name: rminfo.c
@@ -606,7 +606,7 @@ Info_depth_eq(VALUE self, VALUE depth)
606
606
  #endif
607
607
  break;
608
608
  default:
609
- rb_raise(rb_eArgError, "invalid depth (%d)", d);
609
+ rb_raise(rb_eArgError, "invalid depth (%lu)", d);
610
610
  break;
611
611
  }
612
612
 
data/ext/RMagick/rmutil.c CHANGED
@@ -1,4 +1,4 @@
1
- /* $Id: rmutil.c,v 1.90.2.3.2.1 2007/09/16 21:38:42 rmagick Exp $ */
1
+ /* $Id: rmutil.c,v 1.90.2.3.2.3 2007/11/25 19:45:31 rmagick Exp $ */
2
2
  /*============================================================================\
3
3
  | Copyright (C) 2007 by Timothy P. Hunter
4
4
  | Name: rmutil.c
@@ -192,7 +192,7 @@ rm_check_ary_len(VALUE ary, long len)
192
192
  {
193
193
  if (RARRAY(ary)->len < len)
194
194
  {
195
- rb_raise(rb_eIndexError, "not enough elements in array - expecting %d, got %d",
195
+ rb_raise(rb_eIndexError, "not enough elements in array - expecting %ld, got %ld",
196
196
  len, RARRAY(ary)->len);
197
197
  }
198
198
  }
@@ -244,7 +244,7 @@ arg_is_number(VALUE arg)
244
244
  static VALUE
245
245
  rescue_not_str(VALUE arg)
246
246
  {
247
- rb_raise(rb_eTypeError, "argument must be a number or a string in the form 'NN%' (%s given)",
247
+ rb_raise(rb_eTypeError, "argument must be a number or a string in the form 'NN%%' (%s given)",
248
248
  rb_class2name(CLASS_OF(arg)));
249
249
  }
250
250
 
@@ -404,7 +404,7 @@ rm_fuzz_to_dbl(VALUE fuzz_arg)
404
404
  {
405
405
  if (fuzz < 0.0)
406
406
  {
407
- rb_raise(rb_eArgError, "percentages may not be negative (got `%s')", fuzz_arg);
407
+ rb_raise(rb_eArgError, "percentages may not be negative (got `%s')", fuzz_str);
408
408
  }
409
409
  fuzz = (fuzz * MaxRGB) / 100.0;
410
410
  }
@@ -418,7 +418,7 @@ rm_fuzz_to_dbl(VALUE fuzz_arg)
418
418
  fuzz = NUM2DBL(fuzz_arg);
419
419
  if (fuzz < 0.0)
420
420
  {
421
- rb_raise(rb_eArgError, "fuzz may not be negative (got `%g')", fuzz_arg);
421
+ rb_raise(rb_eArgError, "fuzz may not be negative (got `%g')", fuzz);
422
422
  }
423
423
  }
424
424
 
@@ -2980,6 +2980,10 @@ rm_write_temp_image(Image *image, char *tmpnam)
2980
2980
 
2981
2981
  long registry_id;
2982
2982
 
2983
+ rb_warn("`%s' can cause memory leaks when RMagick was built with " Q(MAGICKNAME) " " MagickLibVersionText
2984
+ ".\nUpgrade to ImageMagick 6.3.4 or later to prevent this behavior."
2985
+ , rb_id2name(rb_frame_last_func()));
2986
+
2983
2987
  registry_id = SetMagickRegistry(ImageRegistryType, image, sizeof(Image), &image->exception);
2984
2988
  rm_check_image_exception(image, RetainOnError);
2985
2989
  if (registry_id < 0)
@@ -3000,6 +3004,14 @@ rm_write_temp_image(Image *image, char *tmpnam)
3000
3004
  void
3001
3005
  rm_delete_temp_image(char *tmpnam)
3002
3006
  {
3007
+ #if defined(HAVE_SETIMAGEREGISTRY)
3008
+ MagickBooleanType okay = DeleteImageRegistry(tmpnam+5);
3009
+
3010
+ if (!okay)
3011
+ {
3012
+ rb_warn("DeleteImageRegistry failed for `%s'", tmpnam);
3013
+ }
3014
+ #else
3003
3015
  long registry_id = -1;
3004
3016
 
3005
3017
  sscanf(tmpnam, "mpri:%ld", &registry_id);
@@ -3007,6 +3019,8 @@ rm_delete_temp_image(char *tmpnam)
3007
3019
  {
3008
3020
  (void) DeleteMagickRegistry(registry_id);
3009
3021
  }
3022
+ #endif
3023
+
3010
3024
  }
3011
3025
 
3012
3026
  /*
data/rmagick.gemspec CHANGED
@@ -1,7 +1,7 @@
1
1
  require 'date'
2
2
  Gem::Specification.new do |s|
3
3
  s.name = %q{rmagick}
4
- s.version = "1.15.10"
4
+ s.version = "1.15.11"
5
5
  s.date = Date.today.to_s
6
6
  s.summary = %q{RMagick is an interface between the Ruby programming language and the ImageMagick and GraphicsMagick image processing libraries.}
7
7
  s.description =<<DESCRIPTION
metadata CHANGED
@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
3
3
  specification_version: 1
4
4
  name: rmagick
5
5
  version: !ruby/object:Gem::Version
6
- version: 1.15.10
7
- date: 2007-09-16 00:00:00 -04:00
6
+ version: 1.15.11
7
+ date: 2007-11-25 00:00:00 -05:00
8
8
  summary: RMagick is an interface between the Ruby programming language and the ImageMagick and GraphicsMagick image processing libraries.
9
9
  require_paths:
10
10
  - lib