rmagick 1.7.3 → 1.7.4
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 +9 -0
- data/README.html +7 -7
- data/README.txt +6 -6
- data/configure +263 -81
- data/configure.ac +47 -4
- data/doc/ex/affine_transform.rb +3 -3
- data/ext/RMagick/MANIFEST +1 -1
- data/ext/RMagick/rmagick_config.h.in +2 -0
- data/ext/RMagick/rmimage.c +9 -1
- data/rmagick.gemspec +1 -1
- metadata +2 -2
data/ChangeLog
CHANGED
data/README.html
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
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.7.
|
|
4
|
+
<title>RMagick 1.7.4 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
|
-
<p>RMagick 1.7.
|
|
9
|
+
<p>RMagick 1.7.4</p>
|
|
10
10
|
|
|
11
11
|
<pre><code>README
|
|
12
12
|
|
|
13
13
|
|
|
14
|
-
02/
|
|
14
|
+
04/02/05
|
|
15
15
|
|
|
16
16
|
|
|
17
17
|
Table of Contents
|
|
@@ -211,7 +211,7 @@ addition to the regular options, there are a few RMagick-specific options:</p>
|
|
|
211
211
|
<pre><code> Running the |configure| and |make| scripts
|
|
212
212
|
</code></pre>
|
|
213
213
|
|
|
214
|
-
<p>De-compress the RMagick-1.7.
|
|
214
|
+
<p>De-compress the RMagick-1.7.4.tar.gz archive and enter the
|
|
215
215
|
top directory. Then type:</p>
|
|
216
216
|
|
|
217
217
|
<pre><code>$ ./configure <configuration options>
|
|
@@ -231,9 +231,9 @@ $ make
|
|
|
231
231
|
<pre><code>When |make| is running the examples, if you get a message like this:
|
|
232
232
|
</code></pre>
|
|
233
233
|
|
|
234
|
-
<p>/home/you/RMagick-1.7.
|
|
234
|
+
<p>/home/you/RMagick-1.7.4/lib/RMagick.rb:11:in 'require': libMagick.so.0:
|
|
235
235
|
cannot open shared object file: No such file or directory -
|
|
236
|
-
/home/you/RMagick-1.7.
|
|
236
|
+
/home/you/RMagick-1.7.4/ext/RMagick/RMagick.so (LoadError)</p>
|
|
237
237
|
|
|
238
238
|
<pre><code>you probably do not have the directory in which the ImageMagick or
|
|
239
239
|
GraphicsMagick library is installed in your load path. An easy way
|
|
@@ -256,7 +256,7 @@ facility.
|
|
|
256
256
|
<pre><code>When |make| is running the examples, if you get a message like this:
|
|
257
257
|
</code></pre>
|
|
258
258
|
|
|
259
|
-
<p>hook /home/me/src/RMagick-1.7.
|
|
259
|
+
<p>hook /home/me/src/RMagick-1.7.4/./post-setup.rb failed:
|
|
260
260
|
No such file or directory - "/tmp/rmagick6872.6"</p>
|
|
261
261
|
|
|
262
262
|
<pre><code>you probably do not have a temporary directory environment variable
|
data/README.txt
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
|
|
2
|
-
RMagick 1.7.
|
|
2
|
+
RMagick 1.7.4
|
|
3
3
|
|
|
4
4
|
|
|
5
5
|
README
|
|
6
6
|
|
|
7
7
|
|
|
8
|
-
02/
|
|
8
|
+
04/02/05
|
|
9
9
|
|
|
10
10
|
|
|
11
11
|
Table of Contents
|
|
@@ -204,7 +204,7 @@ addition to the regular options, there are a few RMagick-specific options:
|
|
|
204
204
|
|
|
205
205
|
Running the |configure| and |make| scripts
|
|
206
206
|
|
|
207
|
-
De-compress the RMagick-1.7.
|
|
207
|
+
De-compress the RMagick-1.7.4.tar.gz archive and enter the
|
|
208
208
|
top directory. Then type:
|
|
209
209
|
|
|
210
210
|
$ ./configure <configuration options>
|
|
@@ -221,9 +221,9 @@ top directory. Then type:
|
|
|
221
221
|
|
|
222
222
|
When |make| is running the examples, if you get a message like this:
|
|
223
223
|
|
|
224
|
-
/home/you/RMagick-1.7.
|
|
224
|
+
/home/you/RMagick-1.7.4/lib/RMagick.rb:11:in 'require': libMagick.so.0:
|
|
225
225
|
cannot open shared object file: No such file or directory -
|
|
226
|
-
/home/you/RMagick-1.7.
|
|
226
|
+
/home/you/RMagick-1.7.4/ext/RMagick/RMagick.so (LoadError)
|
|
227
227
|
|
|
228
228
|
you probably do not have the directory in which the ImageMagick or
|
|
229
229
|
GraphicsMagick library is installed in your load path. An easy way
|
|
@@ -243,7 +243,7 @@ export LD_LIBRARY_PATH=/usr/local/lib
|
|
|
243
243
|
|
|
244
244
|
When |make| is running the examples, if you get a message like this:
|
|
245
245
|
|
|
246
|
-
hook /home/me/src/RMagick-1.7.
|
|
246
|
+
hook /home/me/src/RMagick-1.7.4/./post-setup.rb failed:
|
|
247
247
|
No such file or directory - "/tmp/rmagick6872.6"
|
|
248
248
|
|
|
249
249
|
you probably do not have a temporary directory environment variable
|
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.7.
|
|
3
|
+
# Generated by GNU Autoconf 2.59 for RMagick 1.7.4.
|
|
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.7.
|
|
272
|
-
PACKAGE_VERSION='1.7.
|
|
273
|
-
PACKAGE_STRING='RMagick 1.7.
|
|
271
|
+
PACKAGE_TARNAME='RMagick-1.7.4.tar.gz'
|
|
272
|
+
PACKAGE_VERSION='1.7.4'
|
|
273
|
+
PACKAGE_STRING='RMagick 1.7.4'
|
|
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.7.
|
|
782
|
+
\`configure' configures RMagick 1.7.4 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.7.
|
|
839
|
+
short | recursive ) echo "Configuration of RMagick 1.7.4:";;
|
|
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.7.
|
|
984
|
+
RMagick configure 1.7.4
|
|
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.7.
|
|
998
|
+
It was created by RMagick $as_me 1.7.4, which was
|
|
999
999
|
generated by GNU Autoconf 2.59. Invocation command line was
|
|
1000
1000
|
|
|
1001
1001
|
$ $0 $@
|
|
@@ -3709,8 +3709,7 @@ done
|
|
|
3709
3709
|
|
|
3710
3710
|
|
|
3711
3711
|
|
|
3712
|
-
|
|
3713
|
-
for ac_func in AcquireMagickMemory AcquireStringInfo BlackThresholdImage WhiteThresholdImage
|
|
3712
|
+
for ac_func in AcquireMagickMemory BlackThresholdImage WhiteThresholdImage
|
|
3714
3713
|
do
|
|
3715
3714
|
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
3716
3715
|
echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
@@ -4334,6 +4333,111 @@ fi
|
|
|
4334
4333
|
done
|
|
4335
4334
|
|
|
4336
4335
|
|
|
4336
|
+
# We need to be able to query this later in the configure script, so set a shell variable here
|
|
4337
|
+
# as well as defining a symbol.
|
|
4338
|
+
echo "$as_me:$LINENO: checking for AcquireStringInfo" >&5
|
|
4339
|
+
echo $ECHO_N "checking for AcquireStringInfo... $ECHO_C" >&6
|
|
4340
|
+
if test "${ac_cv_func_AcquireStringInfo+set}" = set; then
|
|
4341
|
+
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
4342
|
+
else
|
|
4343
|
+
cat >conftest.$ac_ext <<_ACEOF
|
|
4344
|
+
/* confdefs.h. */
|
|
4345
|
+
_ACEOF
|
|
4346
|
+
cat confdefs.h >>conftest.$ac_ext
|
|
4347
|
+
cat >>conftest.$ac_ext <<_ACEOF
|
|
4348
|
+
/* end confdefs.h. */
|
|
4349
|
+
/* Define AcquireStringInfo to an innocuous variant, in case <limits.h> declares AcquireStringInfo.
|
|
4350
|
+
For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
4351
|
+
#define AcquireStringInfo innocuous_AcquireStringInfo
|
|
4352
|
+
|
|
4353
|
+
/* System header to define __stub macros and hopefully few prototypes,
|
|
4354
|
+
which can conflict with char AcquireStringInfo (); below.
|
|
4355
|
+
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
|
4356
|
+
<limits.h> exists even on freestanding compilers. */
|
|
4357
|
+
|
|
4358
|
+
#ifdef __STDC__
|
|
4359
|
+
# include <limits.h>
|
|
4360
|
+
#else
|
|
4361
|
+
# include <assert.h>
|
|
4362
|
+
#endif
|
|
4363
|
+
|
|
4364
|
+
#undef AcquireStringInfo
|
|
4365
|
+
|
|
4366
|
+
/* Override any gcc2 internal prototype to avoid an error. */
|
|
4367
|
+
#ifdef __cplusplus
|
|
4368
|
+
extern "C"
|
|
4369
|
+
{
|
|
4370
|
+
#endif
|
|
4371
|
+
/* We use char because int might match the return type of a gcc2
|
|
4372
|
+
builtin and then its argument prototype would still apply. */
|
|
4373
|
+
char AcquireStringInfo ();
|
|
4374
|
+
/* The GNU C library defines this for functions which it implements
|
|
4375
|
+
to always fail with ENOSYS. Some functions are actually named
|
|
4376
|
+
something starting with __ and the normal name is an alias. */
|
|
4377
|
+
#if defined (__stub_AcquireStringInfo) || defined (__stub___AcquireStringInfo)
|
|
4378
|
+
choke me
|
|
4379
|
+
#else
|
|
4380
|
+
char (*f) () = AcquireStringInfo;
|
|
4381
|
+
#endif
|
|
4382
|
+
#ifdef __cplusplus
|
|
4383
|
+
}
|
|
4384
|
+
#endif
|
|
4385
|
+
|
|
4386
|
+
int
|
|
4387
|
+
main ()
|
|
4388
|
+
{
|
|
4389
|
+
return f != AcquireStringInfo;
|
|
4390
|
+
;
|
|
4391
|
+
return 0;
|
|
4392
|
+
}
|
|
4393
|
+
_ACEOF
|
|
4394
|
+
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
4395
|
+
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
4396
|
+
(eval $ac_link) 2>conftest.er1
|
|
4397
|
+
ac_status=$?
|
|
4398
|
+
grep -v '^ *+' conftest.er1 >conftest.err
|
|
4399
|
+
rm -f conftest.er1
|
|
4400
|
+
cat conftest.err >&5
|
|
4401
|
+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
4402
|
+
(exit $ac_status); } &&
|
|
4403
|
+
{ ac_try='test -z "$ac_c_werror_flag"
|
|
4404
|
+
|| test ! -s conftest.err'
|
|
4405
|
+
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
4406
|
+
(eval $ac_try) 2>&5
|
|
4407
|
+
ac_status=$?
|
|
4408
|
+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
4409
|
+
(exit $ac_status); }; } &&
|
|
4410
|
+
{ ac_try='test -s conftest$ac_exeext'
|
|
4411
|
+
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
4412
|
+
(eval $ac_try) 2>&5
|
|
4413
|
+
ac_status=$?
|
|
4414
|
+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
4415
|
+
(exit $ac_status); }; }; then
|
|
4416
|
+
ac_cv_func_AcquireStringInfo=yes
|
|
4417
|
+
else
|
|
4418
|
+
echo "$as_me: failed program was:" >&5
|
|
4419
|
+
sed 's/^/| /' conftest.$ac_ext >&5
|
|
4420
|
+
|
|
4421
|
+
ac_cv_func_AcquireStringInfo=no
|
|
4422
|
+
fi
|
|
4423
|
+
rm -f conftest.err conftest.$ac_objext \
|
|
4424
|
+
conftest$ac_exeext conftest.$ac_ext
|
|
4425
|
+
fi
|
|
4426
|
+
echo "$as_me:$LINENO: result: $ac_cv_func_AcquireStringInfo" >&5
|
|
4427
|
+
echo "${ECHO_T}$ac_cv_func_AcquireStringInfo" >&6
|
|
4428
|
+
if test $ac_cv_func_AcquireStringInfo = yes; then
|
|
4429
|
+
rm_have_acquirestringinfo=yes
|
|
4430
|
+
else
|
|
4431
|
+
rm_have_acquirestringinfo=no
|
|
4432
|
+
fi
|
|
4433
|
+
|
|
4434
|
+
if test "$rm_have_acquirestringinfo" = yes; then
|
|
4435
|
+
cat >>confdefs.h <<\_ACEOF
|
|
4436
|
+
#define HAVE_ACQUIRESTRINGINFO 1
|
|
4437
|
+
_ACEOF
|
|
4438
|
+
|
|
4439
|
+
fi
|
|
4440
|
+
|
|
4337
4441
|
# We need to be able to query this later in the configure script, so set a shell variable here
|
|
4338
4442
|
# as well as defining a symbol.
|
|
4339
4443
|
echo "$as_me:$LINENO: checking for GetImageQuantumDepth" >&5
|
|
@@ -5583,6 +5687,82 @@ done
|
|
|
5583
5687
|
|
|
5584
5688
|
|
|
5585
5689
|
# What typedefs?
|
|
5690
|
+
|
|
5691
|
+
# Need a separate test for this so we can set an env. variable to test below.
|
|
5692
|
+
echo "$as_me:$LINENO: checking for MagickBooleanType" >&5
|
|
5693
|
+
echo $ECHO_N "checking for MagickBooleanType... $ECHO_C" >&6
|
|
5694
|
+
if test "${ac_cv_type_MagickBooleanType+set}" = set; then
|
|
5695
|
+
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
5696
|
+
else
|
|
5697
|
+
cat >conftest.$ac_ext <<_ACEOF
|
|
5698
|
+
/* confdefs.h. */
|
|
5699
|
+
_ACEOF
|
|
5700
|
+
cat confdefs.h >>conftest.$ac_ext
|
|
5701
|
+
cat >>conftest.$ac_ext <<_ACEOF
|
|
5702
|
+
/* end confdefs.h. */
|
|
5703
|
+
#include <stdio.h>
|
|
5704
|
+
#if HAVE_SYS_TYPES_H
|
|
5705
|
+
#include <sys/types.h>
|
|
5706
|
+
#endif
|
|
5707
|
+
#include "magick/api.h"
|
|
5708
|
+
|
|
5709
|
+
int
|
|
5710
|
+
main ()
|
|
5711
|
+
{
|
|
5712
|
+
if ((MagickBooleanType *) 0)
|
|
5713
|
+
return 0;
|
|
5714
|
+
if (sizeof (MagickBooleanType))
|
|
5715
|
+
return 0;
|
|
5716
|
+
;
|
|
5717
|
+
return 0;
|
|
5718
|
+
}
|
|
5719
|
+
_ACEOF
|
|
5720
|
+
rm -f conftest.$ac_objext
|
|
5721
|
+
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
5722
|
+
(eval $ac_compile) 2>conftest.er1
|
|
5723
|
+
ac_status=$?
|
|
5724
|
+
grep -v '^ *+' conftest.er1 >conftest.err
|
|
5725
|
+
rm -f conftest.er1
|
|
5726
|
+
cat conftest.err >&5
|
|
5727
|
+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
5728
|
+
(exit $ac_status); } &&
|
|
5729
|
+
{ ac_try='test -z "$ac_c_werror_flag"
|
|
5730
|
+
|| test ! -s conftest.err'
|
|
5731
|
+
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
5732
|
+
(eval $ac_try) 2>&5
|
|
5733
|
+
ac_status=$?
|
|
5734
|
+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
5735
|
+
(exit $ac_status); }; } &&
|
|
5736
|
+
{ ac_try='test -s conftest.$ac_objext'
|
|
5737
|
+
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
5738
|
+
(eval $ac_try) 2>&5
|
|
5739
|
+
ac_status=$?
|
|
5740
|
+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
5741
|
+
(exit $ac_status); }; }; then
|
|
5742
|
+
ac_cv_type_MagickBooleanType=yes
|
|
5743
|
+
else
|
|
5744
|
+
echo "$as_me: failed program was:" >&5
|
|
5745
|
+
sed 's/^/| /' conftest.$ac_ext >&5
|
|
5746
|
+
|
|
5747
|
+
ac_cv_type_MagickBooleanType=no
|
|
5748
|
+
fi
|
|
5749
|
+
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
5750
|
+
fi
|
|
5751
|
+
echo "$as_me:$LINENO: result: $ac_cv_type_MagickBooleanType" >&5
|
|
5752
|
+
echo "${ECHO_T}$ac_cv_type_MagickBooleanType" >&6
|
|
5753
|
+
if test $ac_cv_type_MagickBooleanType = yes; then
|
|
5754
|
+
rm_have_magickbooleantype=yes
|
|
5755
|
+
else
|
|
5756
|
+
rm_have_magickbooleantype=no
|
|
5757
|
+
fi
|
|
5758
|
+
|
|
5759
|
+
if test "$rm_have_magickbooleantype" = yes; then
|
|
5760
|
+
cat >>confdefs.h <<\_ACEOF
|
|
5761
|
+
#define HAVE_MAGICKBOOLEANTYPE 1
|
|
5762
|
+
_ACEOF
|
|
5763
|
+
|
|
5764
|
+
fi
|
|
5765
|
+
|
|
5586
5766
|
echo "$as_me:$LINENO: checking for DisposeType" >&5
|
|
5587
5767
|
echo $ECHO_N "checking for DisposeType... $ECHO_C" >&6
|
|
5588
5768
|
if test "${ac_cv_type_DisposeType+set}" = set; then
|
|
@@ -6065,75 +6245,6 @@ cat >>confdefs.h <<_ACEOF
|
|
|
6065
6245
|
_ACEOF
|
|
6066
6246
|
|
|
6067
6247
|
|
|
6068
|
-
fi
|
|
6069
|
-
echo "$as_me:$LINENO: checking for MagickBooleanType" >&5
|
|
6070
|
-
echo $ECHO_N "checking for MagickBooleanType... $ECHO_C" >&6
|
|
6071
|
-
if test "${ac_cv_type_MagickBooleanType+set}" = set; then
|
|
6072
|
-
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
6073
|
-
else
|
|
6074
|
-
cat >conftest.$ac_ext <<_ACEOF
|
|
6075
|
-
/* confdefs.h. */
|
|
6076
|
-
_ACEOF
|
|
6077
|
-
cat confdefs.h >>conftest.$ac_ext
|
|
6078
|
-
cat >>conftest.$ac_ext <<_ACEOF
|
|
6079
|
-
/* end confdefs.h. */
|
|
6080
|
-
#include <stdio.h>
|
|
6081
|
-
#if HAVE_SYS_TYPES_H
|
|
6082
|
-
#include <sys/types.h>
|
|
6083
|
-
#endif
|
|
6084
|
-
#include "magick/api.h"
|
|
6085
|
-
|
|
6086
|
-
int
|
|
6087
|
-
main ()
|
|
6088
|
-
{
|
|
6089
|
-
if ((MagickBooleanType *) 0)
|
|
6090
|
-
return 0;
|
|
6091
|
-
if (sizeof (MagickBooleanType))
|
|
6092
|
-
return 0;
|
|
6093
|
-
;
|
|
6094
|
-
return 0;
|
|
6095
|
-
}
|
|
6096
|
-
_ACEOF
|
|
6097
|
-
rm -f conftest.$ac_objext
|
|
6098
|
-
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
6099
|
-
(eval $ac_compile) 2>conftest.er1
|
|
6100
|
-
ac_status=$?
|
|
6101
|
-
grep -v '^ *+' conftest.er1 >conftest.err
|
|
6102
|
-
rm -f conftest.er1
|
|
6103
|
-
cat conftest.err >&5
|
|
6104
|
-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
6105
|
-
(exit $ac_status); } &&
|
|
6106
|
-
{ ac_try='test -z "$ac_c_werror_flag"
|
|
6107
|
-
|| test ! -s conftest.err'
|
|
6108
|
-
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
6109
|
-
(eval $ac_try) 2>&5
|
|
6110
|
-
ac_status=$?
|
|
6111
|
-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
6112
|
-
(exit $ac_status); }; } &&
|
|
6113
|
-
{ ac_try='test -s conftest.$ac_objext'
|
|
6114
|
-
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
6115
|
-
(eval $ac_try) 2>&5
|
|
6116
|
-
ac_status=$?
|
|
6117
|
-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
6118
|
-
(exit $ac_status); }; }; then
|
|
6119
|
-
ac_cv_type_MagickBooleanType=yes
|
|
6120
|
-
else
|
|
6121
|
-
echo "$as_me: failed program was:" >&5
|
|
6122
|
-
sed 's/^/| /' conftest.$ac_ext >&5
|
|
6123
|
-
|
|
6124
|
-
ac_cv_type_MagickBooleanType=no
|
|
6125
|
-
fi
|
|
6126
|
-
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
6127
|
-
fi
|
|
6128
|
-
echo "$as_me:$LINENO: result: $ac_cv_type_MagickBooleanType" >&5
|
|
6129
|
-
echo "${ECHO_T}$ac_cv_type_MagickBooleanType" >&6
|
|
6130
|
-
if test $ac_cv_type_MagickBooleanType = yes; then
|
|
6131
|
-
|
|
6132
|
-
cat >>confdefs.h <<_ACEOF
|
|
6133
|
-
#define HAVE_MAGICKBOOLEANTYPE 1
|
|
6134
|
-
_ACEOF
|
|
6135
|
-
|
|
6136
|
-
|
|
6137
6248
|
fi
|
|
6138
6249
|
|
|
6139
6250
|
|
|
@@ -7556,6 +7667,77 @@ _ACEOF
|
|
|
7556
7667
|
fi
|
|
7557
7668
|
fi
|
|
7558
7669
|
|
|
7670
|
+
# IM 6.2.1 changed the return value from RemoveImageProfile from StringInfo * to
|
|
7671
|
+
# MagickBooleanType. The presence of StringInfo implies RemoveImageProfile.
|
|
7672
|
+
if test "$rm_have_acquirestringinfo" = yes -a "$rm_have_magickbooleantype" = yes; then
|
|
7673
|
+
echo "$as_me:$LINENO: checking if RemoveImageProfile returns MagickBooleanType" >&5
|
|
7674
|
+
echo $ECHO_N "checking if RemoveImageProfile returns MagickBooleanType... $ECHO_C" >&6
|
|
7675
|
+
if test "${rv_cv_args_remove_image_profile+set}" = set; then
|
|
7676
|
+
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
7677
|
+
else
|
|
7678
|
+
cat >conftest.$ac_ext <<_ACEOF
|
|
7679
|
+
/* confdefs.h. */
|
|
7680
|
+
_ACEOF
|
|
7681
|
+
cat confdefs.h >>conftest.$ac_ext
|
|
7682
|
+
cat >>conftest.$ac_ext <<_ACEOF
|
|
7683
|
+
/* end confdefs.h. */
|
|
7684
|
+
#include <stdio.h>
|
|
7685
|
+
#if HAVE_SYS_TYPES_H
|
|
7686
|
+
#include <sys/types.h>
|
|
7687
|
+
#endif
|
|
7688
|
+
#include "magick/api.h"
|
|
7689
|
+
int
|
|
7690
|
+
main ()
|
|
7691
|
+
{
|
|
7692
|
+
MagickBooleanType bool; Image *image; bool=RemoveImageProfile(image, "icc")
|
|
7693
|
+
;
|
|
7694
|
+
return 0;
|
|
7695
|
+
}
|
|
7696
|
+
_ACEOF
|
|
7697
|
+
rm -f conftest.$ac_objext
|
|
7698
|
+
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
7699
|
+
(eval $ac_compile) 2>conftest.er1
|
|
7700
|
+
ac_status=$?
|
|
7701
|
+
grep -v '^ *+' conftest.er1 >conftest.err
|
|
7702
|
+
rm -f conftest.er1
|
|
7703
|
+
cat conftest.err >&5
|
|
7704
|
+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
7705
|
+
(exit $ac_status); } &&
|
|
7706
|
+
{ ac_try='test -z "$ac_c_werror_flag"
|
|
7707
|
+
|| test ! -s conftest.err'
|
|
7708
|
+
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
7709
|
+
(eval $ac_try) 2>&5
|
|
7710
|
+
ac_status=$?
|
|
7711
|
+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
7712
|
+
(exit $ac_status); }; } &&
|
|
7713
|
+
{ ac_try='test -s conftest.$ac_objext'
|
|
7714
|
+
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
7715
|
+
(eval $ac_try) 2>&5
|
|
7716
|
+
ac_status=$?
|
|
7717
|
+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
7718
|
+
(exit $ac_status); }; }; then
|
|
7719
|
+
rv_cv_args_remove_image_profile='yes'
|
|
7720
|
+
else
|
|
7721
|
+
echo "$as_me: failed program was:" >&5
|
|
7722
|
+
sed 's/^/| /' conftest.$ac_ext >&5
|
|
7723
|
+
|
|
7724
|
+
rv_cv_args_remove_image_profile='no'
|
|
7725
|
+
fi
|
|
7726
|
+
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
7727
|
+
fi
|
|
7728
|
+
echo "$as_me:$LINENO: result: $rv_cv_args_remove_image_profile" >&5
|
|
7729
|
+
echo "${ECHO_T}$rv_cv_args_remove_image_profile" >&6
|
|
7730
|
+
|
|
7731
|
+
if test "$rv_cv_args_remove_image_profile" = yes; then
|
|
7732
|
+
cat >>confdefs.h <<\_ACEOF
|
|
7733
|
+
#define HAVE_NEW_REMOVEIMAGEPROFILE 1
|
|
7734
|
+
_ACEOF
|
|
7735
|
+
|
|
7736
|
+
fi
|
|
7737
|
+
fi
|
|
7738
|
+
|
|
7739
|
+
|
|
7740
|
+
|
|
7559
7741
|
# Where is ****Magick installed?
|
|
7560
7742
|
MAGICKPREFIX=`${MAGICKCONFIG} --prefix`
|
|
7561
7743
|
|
|
@@ -8035,7 +8217,7 @@ _ASBOX
|
|
|
8035
8217
|
} >&5
|
|
8036
8218
|
cat >&5 <<_CSEOF
|
|
8037
8219
|
|
|
8038
|
-
This file was extended by RMagick $as_me 1.7.
|
|
8220
|
+
This file was extended by RMagick $as_me 1.7.4, which was
|
|
8039
8221
|
generated by GNU Autoconf 2.59. Invocation command line was
|
|
8040
8222
|
|
|
8041
8223
|
CONFIG_FILES = $CONFIG_FILES
|
|
@@ -8095,7 +8277,7 @@ _ACEOF
|
|
|
8095
8277
|
|
|
8096
8278
|
cat >>$CONFIG_STATUS <<_ACEOF
|
|
8097
8279
|
ac_cs_version="\\
|
|
8098
|
-
RMagick config.status 1.7.
|
|
8280
|
+
RMagick config.status 1.7.4
|
|
8099
8281
|
configured by $0, generated by GNU Autoconf 2.59,
|
|
8100
8282
|
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
|
8101
8283
|
|
data/configure.ac
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
|
|
2
2
|
# RMagick configure.ac
|
|
3
3
|
|
|
4
|
-
AC_INIT(RMagick, 1.7.
|
|
4
|
+
AC_INIT(RMagick, 1.7.4, rmagick@rubyforge.org, RMagick-1.7.4.tar.gz)
|
|
5
5
|
echo "Configuring ${PACKAGE_STRING}"
|
|
6
6
|
|
|
7
7
|
AC_CONFIG_HEADER([ext/RMagick/rmagick_config.h])
|
|
@@ -85,13 +85,22 @@ AC_CHECK_FUNCS([AdaptiveThresholdImage AppendImageToList LevelImageChannel])
|
|
|
85
85
|
AC_CHECK_FUNCS([ThumbnailImage RemoveFirstImageFromList GetNextImageInList])
|
|
86
86
|
AC_CHECK_FUNCS([SetLogFormat XImportImage ExportImagePixels ImportImagePixels])
|
|
87
87
|
AC_CHECK_FUNCS([ThresholdImageChannel RandomChannelThresholdImage StripImage])
|
|
88
|
-
AC_CHECK_FUNCS([AcquireMagickMemory
|
|
88
|
+
AC_CHECK_FUNCS([AcquireMagickMemory BlackThresholdImage WhiteThresholdImage])
|
|
89
89
|
AC_CHECK_FUNCS([GetMagickInfoArray GetColorInfoArray GetLocaleExceptionMessage])
|
|
90
90
|
AC_CHECK_FUNCS([GetMagickGeometry ParseSizeGeometry TintImage GetColorHistogram])
|
|
91
91
|
AC_CHECK_FUNCS([GetImageHistogram FuzzyColorCompare GetImageProfile GetNextImageProfile])
|
|
92
92
|
AC_CHECK_FUNCS([GetImageChannelDepth GetImageChannelExtrema GetImageChannelMean])
|
|
93
93
|
AC_CHECK_FUNCS([CompareImageChannels PreviewImage SetImageColorspace])
|
|
94
94
|
|
|
95
|
+
# We need to be able to query this later in the configure script, so set a shell variable here
|
|
96
|
+
# as well as defining a symbol.
|
|
97
|
+
AC_CHECK_FUNC(AcquireStringInfo,
|
|
98
|
+
rm_have_acquirestringinfo=yes,
|
|
99
|
+
rm_have_acquirestringinfo=no)
|
|
100
|
+
if test "$rm_have_acquirestringinfo" = yes; then
|
|
101
|
+
AC_DEFINE(HAVE_ACQUIRESTRINGINFO)
|
|
102
|
+
fi
|
|
103
|
+
|
|
95
104
|
# We need to be able to query this later in the configure script, so set a shell variable here
|
|
96
105
|
# as well as defining a symbol.
|
|
97
106
|
AC_CHECK_FUNC(GetImageQuantumDepth,
|
|
@@ -135,14 +144,27 @@ AC_CHECK_FUNCS([SetImageChannelDepth BlurImageChannel GetMultilineTypeMetrics])
|
|
|
135
144
|
AC_CHECK_FUNCS([NormalizeImageChannel UnsharpMaskImageChannel])
|
|
136
145
|
|
|
137
146
|
# What typedefs?
|
|
147
|
+
|
|
148
|
+
# Need a separate test for this so we can set an env. variable to test below.
|
|
149
|
+
AC_CHECK_TYPE(MagickBooleanType,
|
|
150
|
+
rm_have_magickbooleantype=yes,
|
|
151
|
+
rm_have_magickbooleantype=no,
|
|
152
|
+
[#include <stdio.h>
|
|
153
|
+
#if HAVE_SYS_TYPES_H
|
|
154
|
+
#include <sys/types.h>
|
|
155
|
+
#endif
|
|
156
|
+
#include "magick/api.h"])
|
|
157
|
+
if test "$rm_have_magickbooleantype" = yes; then
|
|
158
|
+
AC_DEFINE(HAVE_MAGICKBOOLEANTYPE)
|
|
159
|
+
fi
|
|
160
|
+
|
|
138
161
|
AC_CHECK_TYPES([DisposeType,
|
|
139
162
|
magick_int64_t,
|
|
140
163
|
magick_uint64_t,
|
|
141
164
|
ExtendedSignedIntegralType,
|
|
142
165
|
ExtendedUnsignedIntegralType,
|
|
143
166
|
MagickOffsetType,
|
|
144
|
-
MagickSizeType,
|
|
145
|
-
MagickBooleanType],
|
|
167
|
+
MagickSizeType],
|
|
146
168
|
[], [],
|
|
147
169
|
[#include <stdio.h>
|
|
148
170
|
#if HAVE_SYS_TYPES_H
|
|
@@ -425,6 +447,27 @@ if test "$rm_have_getmagickinfolist" = yes; then
|
|
|
425
447
|
fi
|
|
426
448
|
fi
|
|
427
449
|
|
|
450
|
+
# IM 6.2.1 changed the return value from RemoveImageProfile from StringInfo * to
|
|
451
|
+
# MagickBooleanType. The presence of StringInfo implies RemoveImageProfile.
|
|
452
|
+
if test "$rm_have_acquirestringinfo" = yes -a "$rm_have_magickbooleantype" = yes; then
|
|
453
|
+
AC_CACHE_CHECK(if RemoveImageProfile returns MagickBooleanType, rv_cv_args_remove_image_profile,
|
|
454
|
+
[AC_TRY_COMPILE(
|
|
455
|
+
[#include <stdio.h>
|
|
456
|
+
#if HAVE_SYS_TYPES_H
|
|
457
|
+
#include <sys/types.h>
|
|
458
|
+
#endif
|
|
459
|
+
#include "magick/api.h"],
|
|
460
|
+
[MagickBooleanType bool; Image *image; bool=RemoveImageProfile(image, "icc")],
|
|
461
|
+
rv_cv_args_remove_image_profile='yes',
|
|
462
|
+
rv_cv_args_remove_image_profile='no')])
|
|
463
|
+
|
|
464
|
+
if test "$rv_cv_args_remove_image_profile" = yes; then
|
|
465
|
+
AC_DEFINE(HAVE_NEW_REMOVEIMAGEPROFILE)
|
|
466
|
+
fi
|
|
467
|
+
fi
|
|
468
|
+
|
|
469
|
+
|
|
470
|
+
|
|
428
471
|
# Where is ****Magick installed?
|
|
429
472
|
MAGICKPREFIX=`${MAGICKCONFIG} --prefix`
|
|
430
473
|
|
data/doc/ex/affine_transform.rb
CHANGED
|
@@ -3,11 +3,11 @@ require 'RMagick'
|
|
|
3
3
|
|
|
4
4
|
# Demonstrate the Image#affine_transform method
|
|
5
5
|
|
|
6
|
-
# Construct a simple affine matrix
|
|
7
|
-
flipflop = Magick::AffineMatrix.new(-1, Math::PI/6, Math::PI/6, -1, 0, 0)
|
|
8
|
-
|
|
9
6
|
img = Magick::Image.read("images/Flower_Hat.jpg").first
|
|
10
7
|
|
|
8
|
+
# Construct a simple affine matrix
|
|
9
|
+
flipflop = Magick::AffineMatrix.new(1, Math::PI/6, Math::PI/6, 1, 0, 0)
|
|
10
|
+
|
|
11
11
|
# Apply the transform
|
|
12
12
|
img = img.affine_transform(flipflop)
|
|
13
13
|
|
data/ext/RMagick/MANIFEST
CHANGED
|
@@ -138,6 +138,8 @@
|
|
|
138
138
|
#undef HAVE_RANDOMCHANNELTHRESHOLDIMAGE
|
|
139
139
|
#undef HAVE_RANDOMTHRESHOLDIMAGECHANNEL
|
|
140
140
|
#undef HAVE_REMOVEFIRSTIMAGEFROMLIST
|
|
141
|
+
/* Introduced in IM 6.2.1 */
|
|
142
|
+
#undef HAVE_NEW_REMOVEIMAGEPROFILE
|
|
141
143
|
#undef HAVE_REPLACECOMPOSITEOP
|
|
142
144
|
#undef HAVE_SEPARATEIMAGECHANNEL
|
|
143
145
|
#undef HAVE_SETIMAGECOLORSPACE
|
data/ext/RMagick/rmimage.c
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/* $Id: rmimage.c,v 1.89.2.2 2005/02
|
|
1
|
+
/* $Id: rmimage.c,v 1.89.2.2.4.1 2005/04/02 22:00:13 rmagick Exp $ */
|
|
2
2
|
/*============================================================================\
|
|
3
3
|
| Copyright (C) 2004 by Timothy P. Hunter
|
|
4
4
|
| Name: rmimage.c
|
|
@@ -1381,11 +1381,15 @@ Image_color_profile_eq(VALUE self, VALUE profile)
|
|
|
1381
1381
|
|
|
1382
1382
|
if (profile == Qnil)
|
|
1383
1383
|
{
|
|
1384
|
+
#if defined(HAVE_NEW_REMOVEIMAGEPROFILE)
|
|
1385
|
+
(void)RemoveImageProfile(image, "icc");
|
|
1386
|
+
#else
|
|
1384
1387
|
str_info = RemoveImageProfile(image, "icc");
|
|
1385
1388
|
if(str_info)
|
|
1386
1389
|
{
|
|
1387
1390
|
DestroyStringInfo(str_info);
|
|
1388
1391
|
}
|
|
1392
|
+
#endif
|
|
1389
1393
|
}
|
|
1390
1394
|
else
|
|
1391
1395
|
{
|
|
@@ -4011,11 +4015,15 @@ Image_iptc_profile_eq(VALUE self, VALUE profile)
|
|
|
4011
4015
|
|
|
4012
4016
|
if (profile == Qnil)
|
|
4013
4017
|
{
|
|
4018
|
+
#if defined(HAVE_NEW_REMOVEIMAGEPROFILE)
|
|
4019
|
+
(void)RemoveImageProfile(image, "iptc");
|
|
4020
|
+
#else
|
|
4014
4021
|
str_info = RemoveImageProfile(image, "iptc");
|
|
4015
4022
|
if(str_info)
|
|
4016
4023
|
{
|
|
4017
4024
|
DestroyStringInfo(str_info);
|
|
4018
4025
|
}
|
|
4026
|
+
#endif
|
|
4019
4027
|
}
|
|
4020
4028
|
else
|
|
4021
4029
|
{
|
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.7.
|
|
4
|
+
s.version = "1.7.4"
|
|
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.7.
|
|
7
|
-
date: 2005-02
|
|
6
|
+
version: 1.7.4
|
|
7
|
+
date: 2005-04-02
|
|
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
|