rmagick 1.8.1 → 1.8.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.
- data/ChangeLog +5 -1
- data/README-Mac-OSX.txt +11 -13
- data/README.html +12 -8
- data/README.txt +9 -6
- data/configure +10 -10
- data/configure.ac +1 -1
- data/doc/info.html +67 -4
- data/doc/rvg.html +2 -2
- data/doc/rvgtut.html +2 -2
- data/ext/RMagick/MANIFEST +1 -1
- data/ext/RMagick/rmagick.h +5 -2
- data/ext/RMagick/rminfo.c +134 -1
- data/ext/RMagick/rmmain.c +7 -3
- data/rmagick.gemspec +1 -1
- metadata +2 -2
data/ChangeLog
CHANGED
@@ -1,9 +1,13 @@
|
|
1
|
+
RMagick 1.8.2
|
2
|
+
o Fix bug #1983, potential buffer overflow in version_constants
|
3
|
+
o Added feature #2015, support the pointsize, authenticate,
|
4
|
+
and sampling_factor attributes in Image::Info
|
5
|
+
|
1
6
|
RMagick 1.8.1
|
2
7
|
o Fix bugs #1876, #1888, #1919
|
3
8
|
o Added feature #1941, RVG's polyline, polygon accept array arguments
|
4
9
|
o Numerous fixes to the RVG documentation
|
5
10
|
|
6
|
-
|
7
11
|
RMagick 1.8.0
|
8
12
|
o Added Image#shadow (ImageMagick 6.1.7)
|
9
13
|
o Added Image::Info#undefine, #[], #[]=
|
data/README-Mac-OSX.txt
CHANGED
@@ -5,10 +5,10 @@ GraphicsMagick, and the delegate libraries used by ImageMagick and
|
|
5
5
|
GraphicsMagick. You only need to install one of ImageMagick or GraphicsMagick.
|
6
6
|
The procedure is the same for either library. Throughout the remainder of this
|
7
7
|
document I will use the word "xMagick" to refer to either of these two
|
8
|
-
libraries. I developed this procedure using a Powerbook G4 and Mac OS X
|
9
|
-
If you are using a different version of
|
10
|
-
|
11
|
-
shell.
|
8
|
+
libraries. I developed this procedure using a Powerbook G4 and Mac OS X
|
9
|
+
10.3.8, and I've tested it with Tiger. If you are using a different version of
|
10
|
+
Mac OS X some of the details may be different. In particular these
|
11
|
+
instructions assume you are using bash as your shell.
|
12
12
|
|
13
13
|
You will need to have your Mac OS X installation disks, a connection to
|
14
14
|
the Internet, and at least an hour of free time (assuming you have a
|
@@ -16,16 +16,14 @@ broadband connection).
|
|
16
16
|
|
17
17
|
Step 1. Install X11, the Xcode Tools, and the X11SDK.
|
18
18
|
|
19
|
-
xMagick needs a X server to display images, so you'll need to
|
20
|
-
|
21
|
-
your install disks do not include this package, you can download it from
|
22
|
-
http://www.apple.com/macosx/features/x11/download/.
|
19
|
+
xMagick needs the X11 fonts and a X server to display images, so you'll need to
|
20
|
+
install X11. You also need the Xcode tools and the X11SDK.
|
23
21
|
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
22
|
+
Apple says that both the Panther and Tiger install disks include these
|
23
|
+
packages as an optional install (although I couldn't find X11 on my 10.3.8
|
24
|
+
disks. Let's hope you can. Tiger definitely includes them). See
|
25
|
+
http://developer.apple.com/darwin/runningX11.html for more information. Install
|
26
|
+
X11, the Xcode Tools and the X11SDK.
|
29
27
|
|
30
28
|
Step 2. Install DarwinPorts
|
31
29
|
|
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.8.
|
4
|
+
<title>RMagick 1.8.2 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.8.
|
9
|
+
<h1>RMagick 1.8.2 README</h1>
|
10
10
|
|
11
|
-
<h2>
|
11
|
+
<h2>06/10/05</h2>
|
12
12
|
|
13
13
|
<h2>Table Of Contents</h2>
|
14
14
|
|
@@ -42,7 +42,7 @@ ImageMagick and GraphicsMagick image processing libraries.</p>
|
|
42
42
|
|
43
43
|
<p><strong>Author:</strong> Tim Hunter</p>
|
44
44
|
|
45
|
-
<p><strong>Email:</strong> <a href="
|
45
|
+
<p><strong>Email:</strong> <a href="mailto:rmagick@rubyforge.org">rmagick@rubyforge.org</a></p>
|
46
46
|
|
47
47
|
<p><strong>RubyForge:</strong> <a href="http://rubyforge.org/projects/rmagick/">http://rubyforge.org/projects/rmagick/</a></p>
|
48
48
|
|
@@ -218,7 +218,7 @@ addition to the regular options, there are a few RMagick-specific options:</p>
|
|
218
218
|
|
219
219
|
<h4 id="scripts">Running the <code>configure</code> and <code>make</code> scripts</h4>
|
220
220
|
|
221
|
-
<p>De-compress the RMagick-1.8.
|
221
|
+
<p>De-compress the RMagick-1.8.2.tar.gz archive and enter the top
|
222
222
|
directory. Then type:</p>
|
223
223
|
|
224
224
|
<pre><code>$ ./configure <configuration options>
|
@@ -231,13 +231,17 @@ $ make clean
|
|
231
231
|
|
232
232
|
<h2 id="uhoh">Things that can go wrong</h2>
|
233
233
|
|
234
|
+
<h4>Can't install RMagick. Can't find libMagick or one of the dependent libraries. Check the config.log file for more detailed information.</h4>
|
235
|
+
|
236
|
+
<p>The message can also refer to "libGraphicsMagick". Typically this message means that one or more of the libraries that Imagemagick/GraphicsMagick depends on hasn't been installed. Examine the config.log file in the installation directory for any error messages. These messages typically contain enough additional information for you to be able to diagnose the problem.</p>
|
237
|
+
|
234
238
|
<h4>Cannot open shared object file</h4>
|
235
239
|
|
236
240
|
<p>When make is running the examples, if you get a message like this:</p>
|
237
241
|
|
238
|
-
<pre><code>/home/you/RMagick-1.8.
|
242
|
+
<pre><code>/home/you/RMagick-1.8.2/lib/RMagick.rb:11:in `require': libMagick.so.0:
|
239
243
|
cannot open shared object file: No such file or directory -
|
240
|
-
/home/you/RMagick-1.8.
|
244
|
+
/home/you/RMagick-1.8.2/ext/RMagick/RMagick.so (LoadError)
|
241
245
|
</code></pre>
|
242
246
|
|
243
247
|
<p>you probably do not have the directory in which the ImageMagick or GraphicsMagick
|
@@ -257,7 +261,7 @@ systems, see the documentation for the dynamic loading facility.</p>
|
|
257
261
|
|
258
262
|
<p>When make is running the examples, if you get a message like this:</p>
|
259
263
|
|
260
|
-
<pre><code>hook /home/me/src/RMagick-1.8.
|
264
|
+
<pre><code>hook /home/me/src/RMagick-1.8.2/./post-setup.rb failed:
|
261
265
|
No such file or directory - "/tmp/rmagick6872.6"
|
262
266
|
</code></pre>
|
263
267
|
|
data/README.txt
CHANGED
@@ -1,6 +1,6 @@
|
|
1
|
-
RMagick 1.8.
|
1
|
+
RMagick 1.8.2 README
|
2
2
|
================================
|
3
|
-
|
3
|
+
06/10/05
|
4
4
|
--------
|
5
5
|
|
6
6
|
Table Of Contents
|
@@ -188,7 +188,7 @@ addition to the regular options, there are a few RMagick-specific options:
|
|
188
188
|
|
189
189
|
<h4 id="scripts">Running the <code>configure</code> and <code>make</code> scripts</h4>
|
190
190
|
|
191
|
-
De-compress the RMagick-1.8.
|
191
|
+
De-compress the RMagick-1.8.2.tar.gz archive and enter the top
|
192
192
|
directory. Then type:
|
193
193
|
|
194
194
|
$ ./configure <configuration options>
|
@@ -200,12 +200,15 @@ directory. Then type:
|
|
200
200
|
|
201
201
|
<h2 id="uhoh">Things that can go wrong</h2>
|
202
202
|
|
203
|
+
#### Can't install RMagick. Can't find libMagick or one of the dependent libraries. Check the config.log file for more detailed information.
|
204
|
+
The message can also refer to "libGraphicsMagick". Typically this message means that one or more of the libraries that Imagemagick/GraphicsMagick depends on hasn't been installed. Examine the config.log file in the installation directory for any error messages. These messages typically contain enough additional information for you to be able to diagnose the problem.
|
205
|
+
|
203
206
|
#### Cannot open shared object file
|
204
207
|
When make is running the examples, if you get a message like this:
|
205
208
|
|
206
|
-
/home/you/RMagick-1.8.
|
209
|
+
/home/you/RMagick-1.8.2/lib/RMagick.rb:11:in `require': libMagick.so.0:
|
207
210
|
cannot open shared object file: No such file or directory -
|
208
|
-
/home/you/RMagick-1.8.
|
211
|
+
/home/you/RMagick-1.8.2/ext/RMagick/RMagick.so (LoadError)
|
209
212
|
|
210
213
|
you probably do not have the directory in which the ImageMagick or GraphicsMagick
|
211
214
|
library is installed in your load path. An easy way to fix this is to define the
|
@@ -222,7 +225,7 @@ systems, see the documentation for the dynamic loading facility.
|
|
222
225
|
#### No such file or directory - "/tmp/rmagick6872.6"
|
223
226
|
When make is running the examples, if you get a message like this:
|
224
227
|
|
225
|
-
hook /home/me/src/RMagick-1.8.
|
228
|
+
hook /home/me/src/RMagick-1.8.2/./post-setup.rb failed:
|
226
229
|
No such file or directory - "/tmp/rmagick6872.6"
|
227
230
|
|
228
231
|
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.59 for RMagick 1.8.
|
3
|
+
# Generated by GNU Autoconf 2.59 for RMagick 1.8.2.
|
4
4
|
#
|
5
5
|
# Report bugs to <rmagick@rubyforge.org>.
|
6
6
|
#
|
@@ -268,9 +268,9 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
|
268
268
|
|
269
269
|
# Identity of this package.
|
270
270
|
PACKAGE_NAME='RMagick'
|
271
|
-
PACKAGE_TARNAME='RMagick-1.8.
|
272
|
-
PACKAGE_VERSION='1.8.
|
273
|
-
PACKAGE_STRING='RMagick 1.8.
|
271
|
+
PACKAGE_TARNAME='RMagick-1.8.2.tar.gz'
|
272
|
+
PACKAGE_VERSION='1.8.2'
|
273
|
+
PACKAGE_STRING='RMagick 1.8.2'
|
274
274
|
PACKAGE_BUGREPORT='rmagick@rubyforge.org'
|
275
275
|
|
276
276
|
# Factoring default headers for most tests.
|
@@ -779,7 +779,7 @@ if test "$ac_init_help" = "long"; then
|
|
779
779
|
# Omit some internal or obsolete options to make the list less imposing.
|
780
780
|
# This message is too long to be a string in the A/UX 3.1 sh.
|
781
781
|
cat <<_ACEOF
|
782
|
-
\`configure' configures RMagick 1.8.
|
782
|
+
\`configure' configures RMagick 1.8.2 to adapt to many kinds of systems.
|
783
783
|
|
784
784
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
785
785
|
|
@@ -836,7 +836,7 @@ fi
|
|
836
836
|
|
837
837
|
if test -n "$ac_init_help"; then
|
838
838
|
case $ac_init_help in
|
839
|
-
short | recursive ) echo "Configuration of RMagick 1.8.
|
839
|
+
short | recursive ) echo "Configuration of RMagick 1.8.2:";;
|
840
840
|
esac
|
841
841
|
cat <<\_ACEOF
|
842
842
|
|
@@ -981,7 +981,7 @@ fi
|
|
981
981
|
test -n "$ac_init_help" && exit 0
|
982
982
|
if $ac_init_version; then
|
983
983
|
cat <<\_ACEOF
|
984
|
-
RMagick configure 1.8.
|
984
|
+
RMagick configure 1.8.2
|
985
985
|
generated by GNU Autoconf 2.59
|
986
986
|
|
987
987
|
Copyright (C) 2003 Free Software Foundation, Inc.
|
@@ -995,7 +995,7 @@ cat >&5 <<_ACEOF
|
|
995
995
|
This file contains any messages produced by compilers while
|
996
996
|
running configure, to aid debugging if configure makes a mistake.
|
997
997
|
|
998
|
-
It was created by RMagick $as_me 1.8.
|
998
|
+
It was created by RMagick $as_me 1.8.2, which was
|
999
999
|
generated by GNU Autoconf 2.59. Invocation command line was
|
1000
1000
|
|
1001
1001
|
$ $0 $@
|
@@ -8388,7 +8388,7 @@ _ASBOX
|
|
8388
8388
|
} >&5
|
8389
8389
|
cat >&5 <<_CSEOF
|
8390
8390
|
|
8391
|
-
This file was extended by RMagick $as_me 1.8.
|
8391
|
+
This file was extended by RMagick $as_me 1.8.2, which was
|
8392
8392
|
generated by GNU Autoconf 2.59. Invocation command line was
|
8393
8393
|
|
8394
8394
|
CONFIG_FILES = $CONFIG_FILES
|
@@ -8448,7 +8448,7 @@ _ACEOF
|
|
8448
8448
|
|
8449
8449
|
cat >>$CONFIG_STATUS <<_ACEOF
|
8450
8450
|
ac_cs_version="\\
|
8451
|
-
RMagick config.status 1.8.
|
8451
|
+
RMagick config.status 1.8.2
|
8452
8452
|
configured by $0, generated by GNU Autoconf 2.59,
|
8453
8453
|
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
8454
8454
|
|
data/configure.ac
CHANGED
data/doc/info.html
CHANGED
@@ -75,6 +75,8 @@
|
|
75
75
|
<ul>
|
76
76
|
<li><a href="#antialias">antialias</a></li>
|
77
77
|
|
78
|
+
<li><a href="#authenticate">authenticate</a></li>
|
79
|
+
|
78
80
|
<li><a href="#background_color">background_color</a></li>
|
79
81
|
|
80
82
|
<li><a href="#border_color">border_color</a></li>
|
@@ -90,13 +92,13 @@
|
|
90
92
|
<li><a href="#dither">dither</a></li>
|
91
93
|
|
92
94
|
<li><a href="#extract">extract</a></li>
|
95
|
+
|
96
|
+
<li><a href="#filename">filename</a></li>
|
93
97
|
</ul>
|
94
98
|
</div>
|
95
99
|
|
96
100
|
<div class="toccol">
|
97
101
|
<ul>
|
98
|
-
<li><a href="#filename">filename</a></li>
|
99
|
-
|
100
102
|
<li><a href="#font">font</a></li>
|
101
103
|
|
102
104
|
<li><a href="#format">format</a></li>
|
@@ -112,15 +114,19 @@
|
|
112
114
|
<li><a href="#monochrome">monochrome</a></li>
|
113
115
|
|
114
116
|
<li><a href="#number_scenes">number_scenes</a></li>
|
117
|
+
|
118
|
+
<li><a href="#page">page</a></li>
|
119
|
+
|
120
|
+
<li><a href="#pointsize">pointsize</a></li>
|
115
121
|
</ul>
|
116
122
|
</div>
|
117
123
|
|
118
124
|
<div class="toccol">
|
119
125
|
<ul>
|
120
|
-
<li><a href="#page">page</a></li>
|
121
|
-
|
122
126
|
<li><a href="#quality">quality</a></li>
|
123
127
|
|
128
|
+
<li><a href="#sampling_factor">sampling_factor</a></li>
|
129
|
+
|
124
130
|
<li><a href="#scene">scene</a></li>
|
125
131
|
|
126
132
|
<li><a href="#server_name">server_name</a></li>
|
@@ -374,6 +380,23 @@ self.undefine("tiff", "bits-per-sample")
|
|
374
380
|
is <code>true</code>.</p>
|
375
381
|
</div>
|
376
382
|
|
383
|
+
<div class="sig">
|
384
|
+
<h3 id="authenticate">authenticate</h3>
|
385
|
+
|
386
|
+
<p><span class="arg">self.</span>authenticate= <span class=
|
387
|
+
"arg">aString</span></p>
|
388
|
+
</div>
|
389
|
+
|
390
|
+
<div class="desc">
|
391
|
+
<h4>Description</h4>
|
392
|
+
|
393
|
+
<p class="imquote">Decrypt an image with this password.</p>
|
394
|
+
|
395
|
+
<p>This attribute can be used to specify the password to be
|
396
|
+
used when reading an image or image sequence that is in an
|
397
|
+
encrypted format, such as PDF.</p>
|
398
|
+
</div>
|
399
|
+
|
377
400
|
<div class="sig">
|
378
401
|
<h3 id="background_color">background_color</h3>
|
379
402
|
|
@@ -894,6 +917,20 @@ self.undefine("tiff", "bits-per-sample")
|
|
894
917
|
<a href="struct.html#Geometry">Geometry</a> object.</p>
|
895
918
|
</div>
|
896
919
|
|
920
|
+
<div class="sig">
|
921
|
+
<h3 id="pointsize">pointsize</h3>
|
922
|
+
|
923
|
+
<p><span class="arg">self.</span>pointsize= <span class=
|
924
|
+
"arg">aNumeric</span></p>
|
925
|
+
</div>
|
926
|
+
|
927
|
+
<div class="desc">
|
928
|
+
<h4>Description</h4>
|
929
|
+
|
930
|
+
<p>Set the font size in points. Useful when creating "caption:"
|
931
|
+
format images, for example.</p>
|
932
|
+
</div>
|
933
|
+
|
897
934
|
<div class="sig">
|
898
935
|
<h3 id="quality">quality</h3>
|
899
936
|
|
@@ -912,6 +949,32 @@ self.undefine("tiff", "bits-per-sample")
|
|
912
949
|
files</a></em>.</p>
|
913
950
|
</div>
|
914
951
|
|
952
|
+
<div class="sig">
|
953
|
+
<h3 id="sampling_factor">sampling_factor</h3>
|
954
|
+
|
955
|
+
<p><span class="arg">self.</span>sampling_factor= <span class=
|
956
|
+
"arg">aString</span></p>
|
957
|
+
</div>
|
958
|
+
|
959
|
+
<div class="desc">
|
960
|
+
<h4>Description</h4>
|
961
|
+
|
962
|
+
<p class="imquote">sampling factors used by JPEG or MPEG-2
|
963
|
+
encoder and YUV decoder/encoder.</p>
|
964
|
+
|
965
|
+
<p class="imquote">This attribute specifies the sampling
|
966
|
+
factors to be used by the JPEG encoder for chroma downsampling.
|
967
|
+
If this attribute is omitted, the JPEG library will use its own
|
968
|
+
default values. When reading or writing the YUV format and when
|
969
|
+
writing the M2V (MPEG-2) format, use sampling-factor="2x1" to
|
970
|
+
specify the 4:2:2 downsampling method.</p>
|
971
|
+
|
972
|
+
<h4>Argument</h4>
|
973
|
+
|
974
|
+
<p>A string in the form
|
975
|
+
"<em>horizontal-factor</em><strong>x</strong><em>vertical-factor</em>"</p>
|
976
|
+
</div>
|
977
|
+
|
915
978
|
<div class="sig">
|
916
979
|
<h3 id="scene">scene</h3>
|
917
980
|
|
data/doc/rvg.html
CHANGED
@@ -171,7 +171,7 @@
|
|
171
171
|
to use units such as inches and millimeters instead of
|
172
172
|
pixels.</p>
|
173
173
|
|
174
|
-
<p>Otherwise,
|
174
|
+
<p>Otherwise, <span class="arg">width</span> and <span class=
|
175
175
|
"arg">height</span> specify the area of the viewbox. If the RVG
|
176
176
|
object will be used as an argument to the <a href=
|
177
177
|
"rvguse.html#use">use</a> method, then <span class=
|
@@ -795,7 +795,7 @@ canvas.background_position = :scaled
|
|
795
795
|
<h4>Description</h4>
|
796
796
|
|
797
797
|
<p>Calls <a href="rvguse.html#new">RVG::Use.new</a> to
|
798
|
-
|
798
|
+
construct a <code>use</code> object and adds it to the RVG
|
799
799
|
object.</p>
|
800
800
|
|
801
801
|
<p>When the referenced argument is another RVG object,
|
data/doc/rvgtut.html
CHANGED
@@ -3,7 +3,7 @@
|
|
3
3
|
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
4
4
|
|
5
5
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
6
|
-
<!-- $Id: rvgtut.html,v 1.
|
6
|
+
<!-- $Id: rvgtut.html,v 1.6 2005/06/03 23:18:53 rmagick Exp $ -->
|
7
7
|
|
8
8
|
<head>
|
9
9
|
<meta name="generator" content=
|
@@ -299,7 +299,7 @@
|
|
299
299
|
parameters. The first two, the radius on the x-axis and the
|
300
300
|
radius on the y-axis, are required. The last two are the (x,y)
|
301
301
|
coordinate of the center. When these are omitted, as here, they
|
302
|
-
default to (0,0). I add the
|
302
|
+
default to (0,0). I add the rectangle with the <code>rect</code>
|
303
303
|
method, which also has four parameters. The first two are the
|
304
304
|
width and height of the rectangle. The last two are the (x,y)
|
305
305
|
coordinate of the upper-left corner. Both of these methods return
|
data/ext/RMagick/MANIFEST
CHANGED
data/ext/RMagick/rmagick.h
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
/* $Id: rmagick.h,v 1.
|
1
|
+
/* $Id: rmagick.h,v 1.85 2005/06/10 22:41:19 rmagick Exp $ */
|
2
2
|
/*=============================================================================
|
3
3
|
| Copyright (C) 2005 by Timothy P. Hunter
|
4
4
|
| Name: rmagick.h
|
@@ -551,6 +551,7 @@ extern void rm_imagelist_push(VALUE, VALUE);
|
|
551
551
|
|
552
552
|
// rminfo.c
|
553
553
|
ATTR_ACCESSOR(Info, antialias)
|
554
|
+
ATTR_ACCESSOR(Info, authenticate)
|
554
555
|
ATTR_ACCESSOR(Info, background_color)
|
555
556
|
ATTR_ACCESSOR(Info, border_color)
|
556
557
|
ATTR_ACCESSOR(Info, colorspace)
|
@@ -569,11 +570,13 @@ ATTR_ACCESSOR(Info, interlace)
|
|
569
570
|
ATTR_ACCESSOR(Info, matte_color)
|
570
571
|
ATTR_ACCESSOR(Info, monochrome)
|
571
572
|
ATTR_ACCESSOR(Info, number_scenes)
|
573
|
+
ATTR_ACCESSOR(Info, orientation)
|
572
574
|
ATTR_ACCESSOR(Info, page)
|
573
575
|
ATTR_ACCESSOR(Info, pen)
|
574
576
|
// ATTR_ACCESSOR(Info, ping) obsolete
|
575
|
-
|
577
|
+
ATTR_ACCESSOR(Info, pointsize)
|
576
578
|
ATTR_ACCESSOR(Info, quality)
|
579
|
+
ATTR_ACCESSOR(Info, sampling_factor)
|
577
580
|
ATTR_ACCESSOR(Info, scene)
|
578
581
|
ATTR_ACCESSOR(Info, server_name)
|
579
582
|
ATTR_ACCESSOR(Info, subimage)
|
data/ext/RMagick/rminfo.c
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
/* $Id: rminfo.c,v 1.
|
1
|
+
/* $Id: rminfo.c,v 1.30 2005/06/10 22:41:19 rmagick Exp $ */
|
2
2
|
/*============================================================================\
|
3
3
|
| Copyright (C) 2005 by Timothy P. Hunter
|
4
4
|
| Name: rminfo.c
|
@@ -152,6 +152,51 @@ Info_aset(VALUE self, VALUE format, VALUE key, VALUE value)
|
|
152
152
|
}
|
153
153
|
|
154
154
|
|
155
|
+
VALUE
|
156
|
+
Info_authenticate(VALUE self)
|
157
|
+
{
|
158
|
+
Info *info;
|
159
|
+
|
160
|
+
Data_Get_Struct(self, Info, info);
|
161
|
+
if (info->authenticate)
|
162
|
+
{
|
163
|
+
return rb_str_new2(info->authenticate);
|
164
|
+
}
|
165
|
+
else
|
166
|
+
{
|
167
|
+
return Qnil;
|
168
|
+
}
|
169
|
+
}
|
170
|
+
|
171
|
+
|
172
|
+
VALUE
|
173
|
+
Info_authenticate_eq(VALUE self, VALUE passwd)
|
174
|
+
{
|
175
|
+
Info *info;
|
176
|
+
char *passwd_p;
|
177
|
+
long passwd_len = 0;
|
178
|
+
|
179
|
+
Data_Get_Struct(self, Info, info);
|
180
|
+
|
181
|
+
if (!NIL_P(passwd))
|
182
|
+
{
|
183
|
+
passwd_p = STRING_PTR_LEN(passwd, passwd_len);
|
184
|
+
}
|
185
|
+
|
186
|
+
if (info->authenticate)
|
187
|
+
{
|
188
|
+
magick_free(info->authenticate);
|
189
|
+
info->authenticate = NULL;
|
190
|
+
}
|
191
|
+
if (passwd_len > 0)
|
192
|
+
{
|
193
|
+
magick_clone_string(&info->authenticate, passwd_p);
|
194
|
+
}
|
195
|
+
|
196
|
+
return self;
|
197
|
+
}
|
198
|
+
|
199
|
+
|
155
200
|
/*
|
156
201
|
Method: Info#background_color
|
157
202
|
Purpose: return the name of the background color as a String
|
@@ -811,6 +856,45 @@ Info_number_scenes_eq(VALUE self, VALUE nscenes)
|
|
811
856
|
}
|
812
857
|
#endif
|
813
858
|
|
859
|
+
/*
|
860
|
+
Method: Info#orientation
|
861
|
+
Purpose: Return the orientation attribute as an OrientationType enum value.
|
862
|
+
*/
|
863
|
+
VALUE
|
864
|
+
Info_orientation(VALUE self)
|
865
|
+
{
|
866
|
+
#if defined(HAVE_IMAGE_ORIENTATION)
|
867
|
+
Info *info;
|
868
|
+
|
869
|
+
Data_Get_Struct(self, Info, info);
|
870
|
+
return OrientationType_new(info->orientation);
|
871
|
+
#else
|
872
|
+
rm_not_implemented();
|
873
|
+
return (VALUE)0;
|
874
|
+
#endif
|
875
|
+
}
|
876
|
+
|
877
|
+
|
878
|
+
/*
|
879
|
+
Method: Info#Orientation=
|
880
|
+
Purpose: Set the Orientation type
|
881
|
+
Raises: ArgumentError
|
882
|
+
*/
|
883
|
+
VALUE
|
884
|
+
Info_orientation_eq(VALUE self, VALUE inter)
|
885
|
+
{
|
886
|
+
#if defined(HAVE_IMAGE_ORIENTATION)
|
887
|
+
Info *info;
|
888
|
+
|
889
|
+
Data_Get_Struct(self, Info, info);
|
890
|
+
VALUE_TO_ENUM(inter, info->orientation, OrientationType);
|
891
|
+
return self;
|
892
|
+
#else
|
893
|
+
rm_not_implemented();
|
894
|
+
return (VALUE)0;
|
895
|
+
#endif
|
896
|
+
}
|
897
|
+
|
814
898
|
DEF_ATTR_READER(Info, page, str)
|
815
899
|
|
816
900
|
/*
|
@@ -844,8 +928,57 @@ Info_page_eq(VALUE self, VALUE page_arg)
|
|
844
928
|
return self;
|
845
929
|
}
|
846
930
|
|
931
|
+
DEF_ATTR_ACCESSOR(Info, pointsize, dbl)
|
847
932
|
DEF_ATTR_ACCESSOR(Info, quality, long)
|
848
933
|
|
934
|
+
/*
|
935
|
+
Method: Info#sampling_factor, #sampling_factor=
|
936
|
+
Purpose: get/set sampling factors used by JPEG or MPEG-2 encoder
|
937
|
+
and YUV decoder/encoder
|
938
|
+
*/
|
939
|
+
VALUE
|
940
|
+
Info_sampling_factor(VALUE self)
|
941
|
+
{
|
942
|
+
Info *info;
|
943
|
+
|
944
|
+
Data_Get_Struct(self, Info, info);
|
945
|
+
if (info->sampling_factor)
|
946
|
+
{
|
947
|
+
return rb_str_new2(info->sampling_factor);
|
948
|
+
}
|
949
|
+
else
|
950
|
+
{
|
951
|
+
return Qnil;
|
952
|
+
}
|
953
|
+
}
|
954
|
+
|
955
|
+
VALUE
|
956
|
+
Info_sampling_factor_eq(VALUE self, VALUE sampling_factor)
|
957
|
+
{
|
958
|
+
Info *info;
|
959
|
+
char *sampling_factor_p;
|
960
|
+
long sampling_factor_len = 0;
|
961
|
+
|
962
|
+
Data_Get_Struct(self, Info, info);
|
963
|
+
|
964
|
+
if (!NIL_P(sampling_factor))
|
965
|
+
{
|
966
|
+
sampling_factor_p = STRING_PTR_LEN(sampling_factor, sampling_factor_len);
|
967
|
+
}
|
968
|
+
|
969
|
+
if (info->sampling_factor)
|
970
|
+
{
|
971
|
+
magick_free(info->sampling_factor);
|
972
|
+
info->sampling_factor = NULL;
|
973
|
+
}
|
974
|
+
if (sampling_factor_len > 0)
|
975
|
+
{
|
976
|
+
magick_clone_string(&info->sampling_factor, sampling_factor_p);
|
977
|
+
}
|
978
|
+
|
979
|
+
return self;
|
980
|
+
}
|
981
|
+
|
849
982
|
#ifdef HAVE_IMAGEINFO_NUMBER_SCENES
|
850
983
|
|
851
984
|
// Info#scene, scene= is the IM >= 5.5.6 version of the now-deprecated
|
data/ext/RMagick/rmmain.c
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
/* $Id: rmmain.c,v 1.
|
1
|
+
/* $Id: rmmain.c,v 1.87 2005/06/10 22:41:19 rmagick Exp $ */
|
2
2
|
/*============================================================================\
|
3
3
|
| Copyright (C) 2005 by Timothy P. Hunter
|
4
4
|
| Name: rmmain.c
|
@@ -933,6 +933,7 @@ Init_RMagick(void)
|
|
933
933
|
rb_define_method(Class_Info, "undefine", Info_undefine, 2);
|
934
934
|
|
935
935
|
DCL_ATTR_ACCESSOR(Info, antialias)
|
936
|
+
DCL_ATTR_ACCESSOR(Info, authenticate)
|
936
937
|
DCL_ATTR_ACCESSOR(Info, background_color)
|
937
938
|
DCL_ATTR_ACCESSOR(Info, border_color)
|
938
939
|
DCL_ATTR_ACCESSOR(Info, colorspace)
|
@@ -950,8 +951,11 @@ Init_RMagick(void)
|
|
950
951
|
DCL_ATTR_ACCESSOR(Info, matte_color)
|
951
952
|
DCL_ATTR_ACCESSOR(Info, monochrome)
|
952
953
|
DCL_ATTR_ACCESSOR(Info, number_scenes) // new in 5.5.6, replaces subrange
|
954
|
+
DCL_ATTR_ACCESSOR(Info, orientation) // new in 6.0.0
|
953
955
|
DCL_ATTR_ACCESSOR(Info, page)
|
956
|
+
DCL_ATTR_ACCESSOR(Info, pointsize)
|
954
957
|
DCL_ATTR_ACCESSOR(Info, quality)
|
958
|
+
DCL_ATTR_ACCESSOR(Info, sampling_factor)
|
955
959
|
DCL_ATTR_ACCESSOR(Info, scene) // new in 5.5.6, replaces subimage
|
956
960
|
DCL_ATTR_ACCESSOR(Info, server_name)
|
957
961
|
DCL_ATTR_ACCESSOR(Info, size)
|
@@ -1507,14 +1511,14 @@ Init_RMagick(void)
|
|
1507
1511
|
static void version_constants(void)
|
1508
1512
|
{
|
1509
1513
|
const char *mgk_version;
|
1510
|
-
char long_version[
|
1514
|
+
char long_version[1000];
|
1511
1515
|
|
1512
1516
|
mgk_version = GetMagickVersion(NULL);
|
1513
1517
|
rb_define_const(Module_Magick, "Magick_version", rb_str_new2(mgk_version));
|
1514
1518
|
|
1515
1519
|
rb_define_const(Module_Magick, "Version", rb_str_new2(PACKAGE_STRING));
|
1516
1520
|
sprintf(long_version,
|
1517
|
-
"This is %s ($Date: 2005/
|
1521
|
+
"This is %s ($Date: 2005/06/10 22:41:19 $) Copyright (C) 2005 by Timothy P. Hunter\n"
|
1518
1522
|
"Built with %s\n"
|
1519
1523
|
"Built for %s\n"
|
1520
1524
|
"Web page: http://rmagick.rubyforge.org\n"
|
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.8.
|
4
|
+
s.version = "1.8.2"
|
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.8.3
|
|
3
3
|
specification_version: 1
|
4
4
|
name: rmagick
|
5
5
|
version: !ruby/object:Gem::Version
|
6
|
-
version: 1.8.
|
7
|
-
date: 2005-
|
6
|
+
version: 1.8.2
|
7
|
+
date: 2005-06-10
|
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
|