rmagick 1.15.11 → 1.15.12
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 +7 -0
- data/README.html +8 -8
- data/README.txt +6 -6
- data/configure +55 -31
- data/configure.ac +28 -15
- data/doc/comtasks.html +2 -2
- data/doc/constants.html +2 -2
- data/doc/draw.html +6 -6
- data/doc/ex/watermark.rb +6 -11
- data/doc/ilist.html +8 -8
- data/doc/image1.html +8 -10
- data/doc/image2.html +11 -11
- data/doc/image3.html +32 -32
- data/doc/imageattrs.html +9 -9
- data/doc/imusage.html +3 -3
- data/doc/index.html +3 -3
- data/doc/info.html +4 -4
- data/doc/magick.html +2 -2
- data/doc/optequiv.html +8 -8
- data/doc/rvg.html +3 -3
- data/doc/rvgclip.html +3 -3
- data/doc/rvggroup.html +3 -3
- data/doc/rvgimage.html +3 -3
- data/doc/rvgpattern.html +4 -4
- data/doc/rvgshape.html +2 -2
- data/doc/rvgstyle.html +2 -2
- data/doc/rvgtext.html +2 -2
- data/doc/rvgtspan.html +2 -2
- data/doc/rvgtut.html +2 -2
- data/doc/rvguse.html +2 -2
- data/doc/rvgxform.html +2 -2
- data/doc/struct.html +4 -4
- data/doc/usage.html +6 -6
- data/ext/RMagick/MANIFEST +1 -1
- data/ext/RMagick/rmagick.h +6 -1
- data/ext/RMagick/rmagick_config.h.in +4 -0
- data/ext/RMagick/rmimage.c +39 -10
- data/ext/RMagick/rmutil.c +240 -1
- data/rmagick.gemspec +1 -1
- metadata +2 -2
data/ChangeLog
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
RMagick 1.15.12
|
|
2
|
+
o Fix bug #16221, starting with ImageMagick 6.3.2, get_exif_by_entry/number
|
|
3
|
+
returns empty array/hash when no arguments are specified, even though the
|
|
4
|
+
image has EXIF data (bug report from Paul Clegg)
|
|
5
|
+
o Fix bug #16449, Image#store_pixels removes opacity channel (bug report
|
|
6
|
+
from Hans de Graaff)
|
|
7
|
+
|
|
1
8
|
RMagick 1.15.11
|
|
2
9
|
o Fix bug #15887, the x_ and y_resolution attributes don't respect the units
|
|
3
10
|
attribute (bug report from Ben Greenburg)
|
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.
|
|
4
|
+
<title>RMagick 1.15.12 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.
|
|
9
|
+
<h1>RMagick 1.15.12 README</h1>
|
|
10
10
|
|
|
11
|
-
<h2>
|
|
11
|
+
<h2>12/26/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="&#
|
|
44
|
+
<p><strong>Email:</strong> <a href="mailto:rmagick@rubyforge.org">rmagick@rubyforge.org</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.
|
|
231
|
+
<p>De-compress the RMagick-1.15.12.tar.gz archive and enter the top
|
|
232
232
|
directory. Then type:</p>
|
|
233
233
|
|
|
234
234
|
<pre><code>$ ./configure <configuration options>
|
|
@@ -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.
|
|
252
|
+
<pre><code>/home/you/RMagick-1.15.12/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.
|
|
254
|
+
/home/you/RMagick-1.15.12/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.
|
|
274
|
+
<pre><code>hook /home/me/src/RMagick-1.15.12/./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.
|
|
1
|
+
RMagick 1.15.12 README
|
|
2
2
|
================================
|
|
3
|
-
|
|
3
|
+
12/26/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.
|
|
199
|
+
De-compress the RMagick-1.15.12.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.
|
|
217
|
+
/home/you/RMagick-1.15.12/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.
|
|
219
|
+
/home/you/RMagick-1.15.12/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.
|
|
236
|
+
hook /home/me/src/RMagick-1.15.12/./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.
|
|
3
|
+
# Generated by GNU Autoconf 2.61 for RMagick 1.15.12.
|
|
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.
|
|
577
|
-
PACKAGE_VERSION='1.15.
|
|
578
|
-
PACKAGE_STRING='RMagick 1.15.
|
|
576
|
+
PACKAGE_TARNAME='RMagick-1.15.12.tar.gz'
|
|
577
|
+
PACKAGE_VERSION='1.15.12'
|
|
578
|
+
PACKAGE_STRING='RMagick 1.15.12'
|
|
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.
|
|
1184
|
+
\`configure' configures RMagick 1.15.12 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.
|
|
1232
|
+
--docdir=DIR documentation root [DATAROOTDIR/doc/RMagick-1.15.12.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.
|
|
1245
|
+
short | recursive ) echo "Configuration of RMagick 1.15.12:";;
|
|
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.
|
|
1358
|
+
RMagick configure 1.15.12
|
|
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.
|
|
1372
|
+
It was created by RMagick $as_me 1.15.12, which was
|
|
1373
1373
|
generated by GNU Autoconf 2.61. Invocation command line was
|
|
1374
1374
|
|
|
1375
1375
|
$ $0 $@
|
|
@@ -3034,11 +3034,25 @@ fi
|
|
|
3034
3034
|
|
|
3035
3035
|
|
|
3036
3036
|
if test -z "$RUBY"; then
|
|
3037
|
-
{ { echo "$as_me:$LINENO: error: Can't install
|
|
3038
|
-
echo "$as_me: error: Can't install
|
|
3037
|
+
{ { echo "$as_me:$LINENO: error: Can't install $PACKAGE_NAME. Ruby must be installed first." >&5
|
|
3038
|
+
echo "$as_me: error: Can't install $PACKAGE_NAME. Ruby must be installed first." >&2;}
|
|
3039
3039
|
{ (exit 1); exit 1; }; }
|
|
3040
3040
|
fi
|
|
3041
3041
|
|
|
3042
|
+
|
|
3043
|
+
{ echo "$as_me:$LINENO: checking Ruby version" >&5
|
|
3044
|
+
echo $ECHO_N "checking Ruby version... $ECHO_C" >&6; }
|
|
3045
|
+
RUBYVERS=`${RUBY} --version | cut -d" " -f2`
|
|
3046
|
+
{ echo "$as_me:$LINENO: result: $RUBYVERS" >&5
|
|
3047
|
+
echo "${ECHO_T}$RUBYVERS" >&6; }
|
|
3048
|
+
RUBYVERS=`echo ${RUBYVERS} | tr -d .`
|
|
3049
|
+
if test $RUBYVERS -ge 190; then
|
|
3050
|
+
{ { echo "$as_me:$LINENO: error: $PACKAGE_STRING doesn't work with this version of Ruby. Use $PACKAGE_NAME 2.0.0 or later." >&5
|
|
3051
|
+
echo "$as_me: error: $PACKAGE_STRING doesn't work with this version of Ruby. Use $PACKAGE_NAME 2.0.0 or later." >&2;}
|
|
3052
|
+
{ (exit 1); exit 1; }; }
|
|
3053
|
+
fi
|
|
3054
|
+
|
|
3055
|
+
|
|
3042
3056
|
# See if user prefers GraphicsMagick over ImageMagick
|
|
3043
3057
|
|
|
3044
3058
|
# Check whether --with-graphics-magick was given.
|
|
@@ -3093,8 +3107,8 @@ fi
|
|
|
3093
3107
|
done
|
|
3094
3108
|
|
|
3095
3109
|
if test -z "$MAGICKCONFIG"; then
|
|
3096
|
-
{ { echo "$as_me:$LINENO: error: Can't install
|
|
3097
|
-
echo "$as_me: error: Can't install
|
|
3110
|
+
{ { echo "$as_me:$LINENO: error: Can't install $PACKAGE_NAME. Can't find GraphicsMagick-config program." >&5
|
|
3111
|
+
echo "$as_me: error: Can't install $PACKAGE_NAME. Can't find GraphicsMagick-config program." >&2;}
|
|
3098
3112
|
{ (exit 1); exit 1; }; }
|
|
3099
3113
|
fi
|
|
3100
3114
|
MAGICKNAME=GraphicsMagick
|
|
@@ -3149,25 +3163,29 @@ fi
|
|
|
3149
3163
|
done
|
|
3150
3164
|
|
|
3151
3165
|
if test -z "$MAGICKCONFIG"; then
|
|
3152
|
-
{ { echo "$as_me:$LINENO: error: Can't install
|
|
3153
|
-
echo "$as_me: error: Can't install
|
|
3166
|
+
{ { echo "$as_me:$LINENO: error: Can't install $PACKAGE_NAME. Can't find Magick-config or GraphicsMagick-config program." >&5
|
|
3167
|
+
echo "$as_me: error: Can't install $PACKAGE_NAME. Can't find Magick-config or GraphicsMagick-config program." >&2;}
|
|
3154
3168
|
{ (exit 1); exit 1; }; }
|
|
3155
3169
|
else
|
|
3156
3170
|
case "$MAGICKCONFIG" in
|
|
3157
3171
|
Magick-config )
|
|
3158
3172
|
MAGICKNAME=ImageMagick
|
|
3159
3173
|
MAGICKLIB=Magick
|
|
3160
|
-
|
|
3174
|
+
{ echo "$as_me:$LINENO: checking ImageMagick version" >&5
|
|
3175
|
+
echo $ECHO_N "checking ImageMagick version... $ECHO_C" >&6; }
|
|
3176
|
+
MAGICKVERS=`${MAGICKCONFIG} --version | cut -d" " -f1`
|
|
3177
|
+
{ echo "$as_me:$LINENO: result: $MAGICKVERS" >&5
|
|
3178
|
+
echo "${ECHO_T}$MAGICKVERS" >&6; }
|
|
3179
|
+
MAGICKVERS=`echo ${MAGICKVERS} | tr -d .`
|
|
3161
3180
|
if test $MAGICKVERS -lt 600; then
|
|
3162
|
-
|
|
3163
|
-
|
|
3164
|
-
echo "$as_me: error: Can't install RMagick. You must have ImageMagick 6.0.0 or later installed. Your version of ImageMagick is ${MAGICKVERS}" >&2;}
|
|
3181
|
+
{ { echo "$as_me:$LINENO: error: Can't install $PACKAGE_NAME. You must have ImageMagick 6.0.0 or later installed." >&5
|
|
3182
|
+
echo "$as_me: error: Can't install $PACKAGE_NAME. You must have ImageMagick 6.0.0 or later installed." >&2;}
|
|
3165
3183
|
{ (exit 1); exit 1; }; }
|
|
3166
3184
|
fi
|
|
3167
3185
|
HDRI=`${MAGICKCONFIG} --version | cut -d" " -f3`
|
|
3168
3186
|
if test "$HDRI" = HDRI; then
|
|
3169
|
-
{ { echo "$as_me:$LINENO: error: Can't install
|
|
3170
|
-
echo "$as_me: error: Can't install
|
|
3187
|
+
{ { echo "$as_me:$LINENO: error: Can't install $PACKAGE_NAME. $PACKAGE_NAME does not work with ImageMagick's HDRI." >&5
|
|
3188
|
+
echo "$as_me: error: Can't install $PACKAGE_NAME. $PACKAGE_NAME does not work with ImageMagick's HDRI." >&2;}
|
|
3171
3189
|
{ (exit 1); exit 1; }; }
|
|
3172
3190
|
fi
|
|
3173
3191
|
;;
|
|
@@ -3269,9 +3287,9 @@ _ACEOF
|
|
|
3269
3287
|
LIBS="-l$MAGICKLIB $LIBS"
|
|
3270
3288
|
|
|
3271
3289
|
else
|
|
3272
|
-
{ { echo "$as_me:$LINENO: error: Can't install
|
|
3290
|
+
{ { echo "$as_me:$LINENO: error: Can't install $PACKAGE_NAME. Can't find lib${MAGICKLIB} or one of the dependent libraries.
|
|
3273
3291
|
Check the config.log file for more detailed information." >&5
|
|
3274
|
-
echo "$as_me: error: Can't install
|
|
3292
|
+
echo "$as_me: error: Can't install $PACKAGE_NAME. Can't find lib${MAGICKLIB} or one of the dependent libraries.
|
|
3275
3293
|
Check the config.log file for more detailed information." >&2;}
|
|
3276
3294
|
{ (exit 1); exit 1; }; }
|
|
3277
3295
|
fi
|
|
@@ -5510,7 +5528,8 @@ done
|
|
|
5510
5528
|
|
|
5511
5529
|
|
|
5512
5530
|
|
|
5513
|
-
|
|
5531
|
+
|
|
5532
|
+
for ac_func in GetImageHistogram GetImageProfile GetImageProperty
|
|
5514
5533
|
do
|
|
5515
5534
|
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
5516
5535
|
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
@@ -7045,7 +7064,8 @@ done
|
|
|
7045
7064
|
|
|
7046
7065
|
|
|
7047
7066
|
|
|
7048
|
-
|
|
7067
|
+
|
|
7068
|
+
for ac_func in SetImageInfoFile SetImageOption SetImageProperty SetImageRegistry SetImageStorageClass
|
|
7049
7069
|
do
|
|
7050
7070
|
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
7051
7071
|
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
@@ -11212,7 +11232,7 @@ exec 6>&1
|
|
|
11212
11232
|
# report actual input values of CONFIG_FILES etc. instead of their
|
|
11213
11233
|
# values after options handling.
|
|
11214
11234
|
ac_log="
|
|
11215
|
-
This file was extended by RMagick $as_me 1.15.
|
|
11235
|
+
This file was extended by RMagick $as_me 1.15.12, which was
|
|
11216
11236
|
generated by GNU Autoconf 2.61. Invocation command line was
|
|
11217
11237
|
|
|
11218
11238
|
CONFIG_FILES = $CONFIG_FILES
|
|
@@ -11261,7 +11281,7 @@ Report bugs to <bug-autoconf@gnu.org>."
|
|
|
11261
11281
|
_ACEOF
|
|
11262
11282
|
cat >>$CONFIG_STATUS <<_ACEOF
|
|
11263
11283
|
ac_cs_version="\\
|
|
11264
|
-
RMagick config.status 1.15.
|
|
11284
|
+
RMagick config.status 1.15.12
|
|
11265
11285
|
configured by $0, generated by GNU Autoconf 2.61,
|
|
11266
11286
|
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
|
11267
11287
|
|
|
@@ -11915,9 +11935,13 @@ if test "$no_create" != yes; then
|
|
|
11915
11935
|
fi
|
|
11916
11936
|
|
|
11917
11937
|
|
|
11918
|
-
|
|
11919
|
-
|
|
11920
|
-
echo "
|
|
11921
|
-
|
|
11938
|
+
|
|
11939
|
+
MAGICKVERS=`${MAGICKCONFIG} --version | cut -d" " -f1`
|
|
11940
|
+
{ echo "$as_me:$LINENO:
|
|
11941
|
+
|
|
11942
|
+
This installation of $PACKAGE_STRING is configured for $RUBY_VERSION_STRING and $MAGICKNAME $MAGICKVERS." >&5
|
|
11943
|
+
echo "$as_me:
|
|
11944
|
+
|
|
11945
|
+
This installation of $PACKAGE_STRING is configured for $RUBY_VERSION_STRING and $MAGICKNAME $MAGICKVERS." >&6;}
|
|
11922
11946
|
|
|
11923
11947
|
|
data/configure.ac
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
|
|
2
2
|
# RMagick configure.ac
|
|
3
3
|
|
|
4
|
-
AC_INIT(RMagick, 1.15.
|
|
4
|
+
AC_INIT(RMagick, 1.15.12, rmagick@rubyforge.org, RMagick-1.15.12.tar.gz)
|
|
5
5
|
echo "Configuring ${PACKAGE_STRING}"
|
|
6
6
|
|
|
7
7
|
AC_CONFIG_HEADER([ext/RMagick/rmagick_config.h])
|
|
@@ -14,9 +14,19 @@ AC_PROG_CC
|
|
|
14
14
|
AC_PROG_CC_STDC
|
|
15
15
|
AC_PATH_PROG(RUBY, ruby,)
|
|
16
16
|
if test -z "$RUBY"; then
|
|
17
|
-
AC_MSG_ERROR([Can't install
|
|
17
|
+
AC_MSG_ERROR([Can't install $PACKAGE_NAME. Ruby must be installed first.])
|
|
18
18
|
fi
|
|
19
19
|
|
|
20
|
+
|
|
21
|
+
AC_MSG_CHECKING([Ruby version])
|
|
22
|
+
RUBYVERS=`${RUBY} --version | cut -d" " -f2`
|
|
23
|
+
AC_MSG_RESULT($RUBYVERS)
|
|
24
|
+
RUBYVERS=`echo ${RUBYVERS} | tr -d .`
|
|
25
|
+
if test $RUBYVERS -ge 190; then
|
|
26
|
+
AC_MSG_ERROR([$PACKAGE_STRING doesn't work with this version of Ruby. Use $PACKAGE_NAME 2.0.0 or later.])
|
|
27
|
+
fi
|
|
28
|
+
|
|
29
|
+
|
|
20
30
|
# See if user prefers GraphicsMagick over ImageMagick
|
|
21
31
|
AC_ARG_WITH(graphics-magick,
|
|
22
32
|
AS_HELP_STRING([--with-graphics-magick], [configure RMagick with GraphicsMagick]),
|
|
@@ -26,7 +36,7 @@ AC_ARG_WITH(graphics-magick,
|
|
|
26
36
|
if test "$with_graphics_magick" != 'no' ; then
|
|
27
37
|
AC_CHECK_PROGS(MAGICKCONFIG, GraphicsMagick-config)
|
|
28
38
|
if test -z "$MAGICKCONFIG"; then
|
|
29
|
-
AC_MSG_ERROR([Can't install
|
|
39
|
+
AC_MSG_ERROR([Can't install $PACKAGE_NAME. Can't find GraphicsMagick-config program.])
|
|
30
40
|
fi
|
|
31
41
|
MAGICKNAME=GraphicsMagick
|
|
32
42
|
MAGICKLIB=GraphicsMagick
|
|
@@ -36,20 +46,22 @@ if test "$with_graphics_magick" != 'no' ; then
|
|
|
36
46
|
else
|
|
37
47
|
AC_CHECK_PROGS(MAGICKCONFIG, [Magick-config GraphicsMagick-config])
|
|
38
48
|
if test -z "$MAGICKCONFIG"; then
|
|
39
|
-
AC_MSG_ERROR([Can't install
|
|
49
|
+
AC_MSG_ERROR([Can't install $PACKAGE_NAME. Can't find Magick-config or GraphicsMagick-config program.])
|
|
40
50
|
else
|
|
41
51
|
case "$MAGICKCONFIG" in
|
|
42
52
|
Magick-config )
|
|
43
53
|
MAGICKNAME=ImageMagick
|
|
44
54
|
MAGICKLIB=Magick
|
|
45
|
-
|
|
55
|
+
AC_MSG_CHECKING([ImageMagick version])
|
|
56
|
+
MAGICKVERS=`${MAGICKCONFIG} --version | cut -d" " -f1`
|
|
57
|
+
AC_MSG_RESULT($MAGICKVERS)
|
|
58
|
+
MAGICKVERS=`echo ${MAGICKVERS} | tr -d .`
|
|
46
59
|
if test $MAGICKVERS -lt 600; then
|
|
47
|
-
|
|
48
|
-
AC_MSG_ERROR([Can't install RMagick. You must have ImageMagick 6.0.0 or later installed. Your version of ImageMagick is ${MAGICKVERS}])
|
|
60
|
+
AC_MSG_ERROR([Can't install $PACKAGE_NAME. You must have ImageMagick 6.0.0 or later installed.])
|
|
49
61
|
fi
|
|
50
62
|
HDRI=`${MAGICKCONFIG} --version | cut -d" " -f3`
|
|
51
63
|
if test "$HDRI" = HDRI; then
|
|
52
|
-
AC_MSG_ERROR([Can't install
|
|
64
|
+
AC_MSG_ERROR([Can't install $PACKAGE_NAME. $PACKAGE_NAME does not work with ImageMagick's HDRI.])
|
|
53
65
|
fi
|
|
54
66
|
;;
|
|
55
67
|
GraphicsMagick-config )
|
|
@@ -71,7 +83,7 @@ AC_SUBST(CPPFLAGS, ${CPPFLAGS})
|
|
|
71
83
|
AC_SUBST(LOCAL_LIBS, `${MAGICKCONFIG} --libs`)
|
|
72
84
|
|
|
73
85
|
AC_CHECK_LIB($MAGICKLIB, InitializeMagick, [],
|
|
74
|
-
[AC_MSG_ERROR([Can't install
|
|
86
|
+
[AC_MSG_ERROR([Can't install $PACKAGE_NAME. Can't find lib${MAGICKLIB} or one of the dependent libraries.
|
|
75
87
|
Check the config.log file for more detailed information.])],
|
|
76
88
|
[`${MAGICKCONFIG} --libs`])
|
|
77
89
|
|
|
@@ -121,7 +133,7 @@ fi
|
|
|
121
133
|
|
|
122
134
|
AC_CHECK_FUNCS([GetImageChannelDepth GetImageChannelDistortion])
|
|
123
135
|
AC_CHECK_FUNCS([GetImageChannelExtrema GetImageChannelMean GetImageClipMask])
|
|
124
|
-
AC_CHECK_FUNCS([GetImageHistogram GetImageProfile])
|
|
136
|
+
AC_CHECK_FUNCS([GetImageHistogram GetImageProfile GetImageProperty])
|
|
125
137
|
|
|
126
138
|
# We need to be able to query this later in the configure script, so set a shell variable here
|
|
127
139
|
# as well as defining a symbol.
|
|
@@ -166,7 +178,7 @@ AC_CHECK_FUNCS([QuantumOperatorRegionImage RadialBlurImage RadialBlurImageChanne
|
|
|
166
178
|
AC_CHECK_FUNCS([RandomChannelThresholdImage RandomThresholdImageChannel])
|
|
167
179
|
AC_CHECK_FUNCS([RecolorImage SeparateImageChannel SepiaToneImage])
|
|
168
180
|
AC_CHECK_FUNCS([SetImageBackgroundColor SetImageChannelDepth SetImageColorspace SetImageExtent])
|
|
169
|
-
AC_CHECK_FUNCS([SetImageInfoFile SetImageOption SetImageRegistry SetImageStorageClass])
|
|
181
|
+
AC_CHECK_FUNCS([SetImageInfoFile SetImageOption SetImageProperty SetImageRegistry SetImageStorageClass])
|
|
170
182
|
AC_CHECK_FUNCS([SetImageProgressMonitor ShadowImage SharpenImageChannel])
|
|
171
183
|
AC_CHECK_FUNCS([SigmoidalContrastImageChannel SketchImage SpliceImage StripImage])
|
|
172
184
|
AC_CHECK_FUNCS([ThresholdImageChannel TintImage TransposeImage TransverseImage UniqueImageColors])
|
|
@@ -750,9 +762,10 @@ AC_SUBST(RUBY_CONFIG_OPTS)
|
|
|
750
762
|
AC_CONFIG_FILES(Makefile ext/RMagick/extconf.rb metaconfig)
|
|
751
763
|
AC_OUTPUT
|
|
752
764
|
|
|
753
|
-
|
|
754
|
-
|
|
755
|
-
|
|
756
|
-
|
|
765
|
+
|
|
766
|
+
MAGICKVERS=`${MAGICKCONFIG} --version | cut -d" " -f1`
|
|
767
|
+
AC_MSG_NOTICE([
|
|
768
|
+
|
|
769
|
+
This installation of $PACKAGE_STRING is configured for $RUBY_VERSION_STRING and $MAGICKNAME $MAGICKVERS.])
|
|
757
770
|
|
|
758
771
|
|
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.
|
|
9
|
+
<title>RMagick 1.15.12: 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.
|
|
34
|
+
<h6 id="header">RMagick 1.15.12 User's Guide and Reference</h6>
|
|
35
35
|
|
|
36
36
|
<div class="nav">
|
|
37
37
|
« <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.
|
|
9
|
+
<title>RMagick 1.15.12: 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.
|
|
64
|
+
<h6 id="header">RMagick 1.15.12 User's Guide and Reference</h6>
|
|
65
65
|
|
|
66
66
|
<div class="nav">
|
|
67
67
|
« <a href="info.html">Prev</a> | <a href=
|