$ ./configure <configuration options>
@@ -249,9 +249,9 @@
=20
When make is running the examples, if you get a message like this:
=20
-/home/you/RMagick-1.14.0/lib/RMagick.rb:11:in `require': libMagic=
k.so.0:
+/home/you/RMagick-1.14.1/lib/RMagick.rb:11:in `require': libMagic=
k.so.0:
cannot open shared object file: No such file or directory -
- /home/you/RMagick-1.14.0/ext/RMagick/RMagick.so (LoadError)
+ /home/you/RMagick-1.14.1/ext/RMagick/RMagick.so (LoadError)
=20
you probably do not have the directory in which the ImageMagick or Graphi=
csMagick
@@ -271,7 +271,7 @@
=20
When make is running the examples, if you get a message like this:
=20
-hook /home/me/src/RMagick-1.14.0/./post-setup.rb failed:
+hook /home/me/src/RMagick-1.14.1/./post-setup.rb failed:
No such file or directory - "/tmp/rmagick6872.6"
=20
diff -urN --exclude=3DCVS --exclude=3D.cvsignore --exclude=3D.svn --exclude=
=3D.svnignore old/RMagick-1.14.0/README.txt new/RMagick-1.14.1/README.txt
--- old/RMagick-1.14.0/README.txt 2006-09-29 00:45:20.000000000 +0200
+++ new/RMagick-1.14.1/README.txt 2006-10-21 16:18:53.000000000 +0200
@@ -1,6 +1,6 @@
-RMagick 1.14.0 README
+RMagick 1.14.1 README
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
-09/28/06
+10/21/06
--------
=20
Table Of Contents
@@ -196,7 +196,7 @@
=20
Running the configure and make =
scripts
=20
-De-compress the RMagick-1.14.0.tar.gz archive and enter the top
+De-compress the RMagick-1.14.1.tar.gz archive and enter the top
directory. Then type:
=20
$ ./configure
@@ -214,9 +214,9 @@
#### Cannot open shared object file
When make is running the examples, if you get a message like this:
=20
- /home/you/RMagick-1.14.0/lib/RMagick.rb:11:in `require': libMagick.so.0:
+ /home/you/RMagick-1.14.1/lib/RMagick.rb:11:in `require': libMagick.so.0:
cannot open shared object file: No such file or directory -
- /home/you/RMagick-1.14.0/ext/RMagick/RMagick.so (LoadError)
+ /home/you/RMagick-1.14.1/ext/RMagick/RMagick.so (LoadError)
=20
you probably do not have the directory in which the ImageMagick or GraphicsM=
agick
library is installed in your load path. An easy way to fix this is to define=
the
@@ -233,7 +233,7 @@
#### No such file or directory - "/tmp/rmagick6872.6"
When make is running the examples, if you get a message like this:
=20
- hook /home/me/src/RMagick-1.14.0/./post-setup.rb failed:
+ hook /home/me/src/RMagick-1.14.1/./post-setup.rb failed:
No such file or directory - "/tmp/rmagick6872.6"
=20
you probably do not have a temporary directory environment variable set. Set
diff -urN --exclude=3DCVS --exclude=3D.cvsignore --exclude=3D.svn --exclude=
=3D.svnignore old/RMagick-1.14.0/configure new/RMagick-1.14.1/configure
--- old/RMagick-1.14.0/configure 2006-09-29 00:45:26.000000000 +0200
+++ new/RMagick-1.14.1/configure 2006-10-21 16:19:02.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for RMagick 1.14.0.
+# Generated by GNU Autoconf 2.59 for RMagick 1.14.1.
#
# Report bugs to .
#
@@ -268,9 +268,9 @@
=20
# Identity of this package.
PACKAGE_NAME=3D'RMagick'
-PACKAGE_TARNAME=3D'RMagick-1.14.0.tar.gz'
-PACKAGE_VERSION=3D'1.14.0'
-PACKAGE_STRING=3D'RMagick 1.14.0'
+PACKAGE_TARNAME=3D'RMagick-1.14.1.tar.gz'
+PACKAGE_VERSION=3D'1.14.1'
+PACKAGE_STRING=3D'RMagick 1.14.1'
PACKAGE_BUGREPORT=3D'rmagick(a)rubyforge.org'
=20
# Factoring default headers for most tests.
@@ -779,7 +779,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures RMagick 1.14.0 to adapt to many kinds of systems.
+\`configure' configures RMagick 1.14.1 to adapt to many kinds of systems.
=20
Usage: $0 [OPTION]... [VAR=3DVALUE]...
=20
@@ -836,7 +836,7 @@
=20
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of RMagick 1.14.0:";;
+ short | recursive ) echo "Configuration of RMagick 1.14.1:";;
esac
cat <<\_ACEOF
=20
@@ -983,7 +983,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-RMagick configure 1.14.0
+RMagick configure 1.14.1
generated by GNU Autoconf 2.59
=20
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -997,7 +997,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
=20
-It was created by RMagick $as_me 1.14.0, which was
+It was created by RMagick $as_me 1.14.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
=20
$ $0 $@
@@ -4964,6 +4964,109 @@
done
=20
=20
+echo "$as_me:$LINENO: checking for GetMagickPixelPacket" >&5
+echo $ECHO_N "checking for GetMagickPixelPacket... $ECHO_C" >&6
+if test "${ac_cv_func_GetMagickPixelPacket+set}" =3D set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define GetMagickPixelPacket to an innocuous variant, in case d=
eclares GetMagickPixelPacket.
+ For example, HP-UX 11i declares gettimeofday. */
+#define GetMagickPixelPacket innocuous_GetMagickPixelPacket
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char GetMagickPixelPacket (); below.
+ Prefer to if __STDC__ is defined, since
+ exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include
+#else
+# include
+#endif
+
+#undef GetMagickPixelPacket
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char GetMagickPixelPacket ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_GetMagickPixelPacket) || defined (__stub___GetMagickPixe=
lPacket)
+choke me
+#else
+char (*f) () =3D GetMagickPixelPacket;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f !=3D GetMagickPixelPacket;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try=3D'test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_GetMagickPixelPacket=3Dyes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_GetMagickPixelPacket=3Dno
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_GetMagickPixelPacket" >&5
+echo "${ECHO_T}$ac_cv_func_GetMagickPixelPacket" >&6
+if test $ac_cv_func_GetMagickPixelPacket =3D yes; then
+ rm_have_getmagickpixelpacket=3Dyes
+else
+ rm_have_getmagickpixelpacket=3Dno
+fi
+
+if test "$rm_have_getmagickpixelpacket" =3D yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_GETMAGICKPIXELPACKET 1
+_ACEOF
+
+fi
+
echo "$as_me:$LINENO: checking for GetMagickInfoList" >&5
echo $ECHO_N "checking for GetMagickInfoList... $ECHO_C" >&6
if test "${ac_cv_func_GetMagickInfoList+set}" =3D set; then
@@ -5070,7 +5173,8 @@
=20
=20
=20
-for ac_func in GetMultilineTypeMetrics GetNextImageAttribute GetNextImagePro=
file
+
+for ac_func in GetMagickResourceLimit GetMultilineTypeMetrics GetNextImageAt=
tribute GetNextImageProfile
do
as_ac_var=3D`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -5278,8 +5382,7 @@
=20
=20
=20
-
-for ac_func in GetMagickResourceLimit GrayscalePseudoClassImage ImagesToBlob=
ImportImagePixels
+for ac_func in GrayscalePseudoClassImage ImagesToBlob ImportImagePixels
do
as_ac_var=3D`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -9927,6 +10030,75 @@
fi
=20
=20
+# The MagickPixelPacket type was introduced in IM 6.0.0. The GetMagickPixelP=
acket
+# function was introduced in 6.2.0. IM 6.3.0 changed the type of the 'color'
+# member of the ColorInfo structure from PixelPacket to MagickPixelPacket.
+if test "$rm_have_getmagickpixelpacket" =3D yes; then
+ echo "$as_me:$LINENO: checking if ColorInfo.color is a MagickPixelPacket"=
>&5
+echo $ECHO_N "checking if ColorInfo.color is a MagickPixelPacket... $ECHO_C"=
>&6
+if test "${rv_cv_struct_color_info_color+set}" =3D set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include
+ #if HAVE_SYS_TYPES_H
+ #include
+ #endif
+ #include "magick/api.h"
+int
+main ()
+{
+ColorInfo color_info; MagickPixelPacket p; color_info.color =3D p
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try=3D'test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; }; then
+ rv_cv_struct_color_info_color=3D'yes'
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+rv_cv_struct_color_info_color=3D'no'
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $rv_cv_struct_color_info_color" >&5
+echo "${ECHO_T}$rv_cv_struct_color_info_color" >&6
+
+ if test "$rv_cv_struct_color_info_color" =3D yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_NEW_COLORINFO 1
+_ACEOF
+
+ fi
+fi
=20
# Where is ****Magick installed?
MAGICKPREFIX=3D`${MAGICKCONFIG} --prefix`
@@ -10415,7 +10587,7 @@
} >&5
cat >&5 <<_CSEOF
=20
-This file was extended by RMagick $as_me 1.14.0, which was
+This file was extended by RMagick $as_me 1.14.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
=20
CONFIG_FILES =3D $CONFIG_FILES
@@ -10475,7 +10647,7 @@
=20
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version=3D"\\
-RMagick config.status 1.14.0
+RMagick config.status 1.14.1
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
=20
diff -urN --exclude=3DCVS --exclude=3D.cvsignore --exclude=3D.svn --exclude=
=3D.svnignore old/RMagick-1.14.0/configure.ac new/RMagick-1.14.1/configure.ac
--- old/RMagick-1.14.0/configure.ac 2006-09-29 00:45:22.000000000 +0200
+++ new/RMagick-1.14.1/configure.ac 2006-10-21 16:18:55.000000000 +0200
@@ -1,7 +1,7 @@
=20
# RMagick configure.ac
=20
-AC_INIT(RMagick, 1.14.0, rmagick(a)rubyforge.org, RMagick-1.14.0.tar.gz)
+AC_INIT(RMagick, 1.14.1, rmagick(a)rubyforge.org, RMagick-1.14.1.tar.gz)
echo "Configuring ${PACKAGE_STRING}"
=20
AC_CONFIG_HEADER([ext/RMagick/rmagick_config.h])
@@ -131,6 +131,13 @@
=20
AC_CHECK_FUNCS([GetImageStatistics GetMagickInfoArray])
=20
+AC_CHECK_FUNC(GetMagickPixelPacket,
+ rm_have_getmagickpixelpacket=3Dyes,
+ rm_have_getmagickpixelpacket=3Dno)
+if test "$rm_have_getmagickpixelpacket" =3D yes; then
+ AC_DEFINE(HAVE_GETMAGICKPIXELPACKET)
+fi
+
AC_CHECK_FUNC(GetMagickInfoList,
rm_have_getmagickinfolist=3Dyes,
rm_have_getmagickinfolist=3Dno)
@@ -138,7 +145,7 @@
AC_DEFINE(HAVE_GETMAGICKINFOLIST)
fi
=20
-AC_CHECK_FUNCS([GetMultilineTypeMetrics GetNextImageAttribute GetNextImagePr=
ofile])
+AC_CHECK_FUNCS([GetMagickResourceLimit GetMultilineTypeMetrics GetNextImageA=
ttribute GetNextImageProfile])
=20
AC_CHECK_FUNC(GetTypeInfoList,
rm_have_gettypeinfolist=3Dyes,
@@ -147,7 +154,7 @@
AC_DEFINE(HAVE_GETTYPEINFOLIST)
fi
=20
-AC_CHECK_FUNCS([GetMagickResourceLimit GrayscalePseudoClassImage ImagesToBlo=
b ImportImagePixels])
+AC_CHECK_FUNCS([GrayscalePseudoClassImage ImagesToBlob ImportImagePixels])
AC_CHECK_FUNCS([InheritException InterpolatePixelColor InterpretImageAttribu=
tes IsColorSimilar])
AC_CHECK_FUNCS([IsImageSimilar NegateImageChannel])
AC_CHECK_FUNCS([NormalizeImageChannel ParseSizeGeometry PosterizeImage Previ=
ewImage])
@@ -634,6 +641,25 @@
fi
=20
=20
+# The MagickPixelPacket type was introduced in IM 6.0.0. The GetMagickPixelP=
acket
+# function was introduced in 6.2.0. IM 6.3.0 changed the type of the 'color'
+# member of the ColorInfo structure from PixelPacket to MagickPixelPacket.
+if test "$rm_have_getmagickpixelpacket" =3D yes; then
+ AC_CACHE_CHECK(if ColorInfo.color is a MagickPixelPacket, rv_cv_struct_co=
lor_info_color,
+ [AC_TRY_COMPILE(
+ [#include
+ #if HAVE_SYS_TYPES_H
+ #include
+ #endif
+ #include "magick/api.h"],
+ [ColorInfo color_info; MagickPixelPacket p; color_info.color =3D p],
+ rv_cv_struct_color_info_color=3D'yes',
+ rv_cv_struct_color_info_color=3D'no')])
+
+ if test "$rv_cv_struct_color_info_color" =3D yes; then
+ AC_DEFINE(HAVE_NEW_COLORINFO)
+ fi
+fi
=20
# Where is ****Magick installed?
MAGICKPREFIX=3D`${MAGICKCONFIG} --prefix`
diff -urN --exclude=3DCVS --exclude=3D.cvsignore --exclude=3D.svn --exclude=
=3D.svnignore old/RMagick-1.14.0/doc/image1.html new/RMagick-1.14.1/doc/image=
1.html
--- old/RMagick-1.14.0/doc/image1.html 2006-09-10 21:35:16.000000000 +0200
+++ new/RMagick-1.14.1/doc/image1.html 2006-10-04 00:35:35.000000000 +0200
@@ -1685,7 +1685,7 @@
"bordered" onmouseover=3D
"this.style.display=3D'none'; borderless.style.display=3D'';" src=3D
"ex/border.jpg" alt=3D"border example"
- />![3D""](3D"ex/images/spin.gif")
=20
@@ -3799,6 +3799,9 @@
=20
Returns
=20
+ The distortion metric, represented as a floating-point
+ number.
+
Magick API
=20
GetImageChannelDistortion (available in ImageMagick
@@ -3834,7 +3837,9 @@
each_iptc_dataset
=20
- image.each_iptc_dataset -> nil
+ image.each_iptc_dataset { |dataset,
+ data_field| block} -> nil
=20
diff -urN --exclude=3DCVS --exclude=3D.cvsignore --exclude=3D.svn --exclude=
=3D.svnignore old/RMagick-1.14.0/doc/image3.html new/RMagick-1.14.1/doc/image=
3.html
--- old/RMagick-1.14.0/doc/image3.html 2006-09-12 00:54:39.000000000 +0200
+++ new/RMagick-1.14.1/doc/image3.html 2006-10-06 02:03:27.000000000 +0200
@@ -1113,12 +1113,11 @@
=20
Rotate the receiver by the specified angle. Positive angles
rotate clockwise while negative angles rotate
- counter-clockwise. Rotated images are
- usually larger than the originals and have "empty" triangular
- corners. Empty triangles left over from shearing the image are
- filled with the background
- color.
+ counter-clockwise. New pixels introduced by the rotation are
+ the same color as the current background color. Set
+ the background color to "none" to make the new pixels
+ transparent black.
=20
Arguments
=20
diff -urN --exclude=3DCVS --exclude=3D.cvsignore --exclude=3D.svn --exclude=
=3D.svnignore old/RMagick-1.14.0/ext/RMagick/MANIFEST new/RMagick-1.14.1/ext/=
RMagick/MANIFEST
--- old/RMagick-1.14.0/ext/RMagick/MANIFEST 2006-09-29 00:45:26.000000000 +02=
00
+++ new/RMagick-1.14.1/ext/RMagick/MANIFEST 2006-10-21 16:19:02.000000000 +02=
00
@@ -1,4 +1,4 @@
-MANIFEST for RMagick-1.14.0 - 18:45:26 09/28/06
+MANIFEST for RMagick-1.14.1 - 10:19:02 10/21/06
=20
configure
README.html
diff -urN --exclude=3DCVS --exclude=3D.cvsignore --exclude=3D.svn --exclude=
=3D.svnignore old/RMagick-1.14.0/ext/RMagick/extconf.rb.in new/RMagick-1.14.1=
/ext/RMagick/extconf.rb.in
--- old/RMagick-1.14.0/ext/RMagick/extconf.rb.in 2006-07-31 00:08:33.00000000=
0 +0200
+++ new/RMagick-1.14.1/ext/RMagick/extconf.rb.in 2006-10-04 00:40:22.00000000=
0 +0200
@@ -6,7 +6,7 @@
# Pass along Ruby's version number
VERSION_NUMBER =3D '0x'+RUBY_VERSION.tr('.','')
=20
-$CFLAGS =3D "-Wall @CFLAGS@"
+$CFLAGS =3D "@CFLAGS@"
$CPPFLAGS =3D "-DRUBY_VERSION=3D#{VERSION_NUMBER} @CPPFLAGS@"
=20
if RUBY_VERSION >=3D '1.8.0'
diff -urN --exclude=3DCVS --exclude=3D.cvsignore --exclude=3D.svn --exclude=
=3D.svnignore old/RMagick-1.14.0/ext/RMagick/rmagick.h new/RMagick-1.14.1/ext=
/RMagick/rmagick.h
--- old/RMagick-1.14.0/ext/RMagick/rmagick.h 2006-09-27 23:26:35.000000000 +0=
200
+++ new/RMagick-1.14.1/ext/RMagick/rmagick.h 2006-10-21 15:40:47.000000000 +0=
200
@@ -1,4 +1,4 @@
-/* $Id: rmagick.h,v 1.138 2006/09/27 21:26:35 rmagick Exp $ */
+/* $Id: rmagick.h,v 1.139 2006/10/21 13:40:47 rmagick Exp $ */
/*=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
| Copyright (C) 2006 by Timothy P. Hunter
| Name: rmagick.h
@@ -1021,9 +1021,6 @@
extern VALUE PixelPacket_to_Color_Name(Image *, PixelPacket *);
extern VALUE PixelPacket_to_Color_Name_Info(Info *, PixelPacket *);
extern VALUE Pixel_from_PixelPacket(PixelPacket *);
-#if defined(HAVE_MAGICKPIXELPACKET)
-extern VALUE Pixel_from_MagickPixelPacket(MagickPixelPacket *);
-#endif
=20
extern void Point_to_PointInfo(PointInfo *, VALUE);
extern VALUE PointInfo_to_Point(PointInfo *);
diff -urN --exclude=3DCVS --exclude=3D.cvsignore --exclude=3D.svn --exclude=
=3D.svnignore old/RMagick-1.14.0/ext/RMagick/rmagick_config.h.in new/RMagick-=
1.14.1/ext/RMagick/rmagick_config.h.in
--- old/RMagick-1.14.0/ext/RMagick/rmagick_config.h.in 2006-09-27 23:26:35.00=
0000000 +0200
+++ new/RMagick-1.14.1/ext/RMagick/rmagick_config.h.in 2006-10-21 15:44:44.00=
0000000 +0200
@@ -95,6 +95,8 @@
#undef HAVE_GETMAGICKINFOLIST
/* API changed in IM 6.1.3 */
#undef HAVE_OLD_GETMAGICKINFOLIST
+/* Introduced in IM 6.3.0 */
+#undef HAVE_GETMAGICKPIXELPACKET
/* Introduced in IM 6.2.5 */
#undef HAVE_GETMAGICKRESOURCELIMIT
/* Introduced in IM 6.1.5 */
@@ -163,6 +165,8 @@
#undef HAVE_MEMORY_H
/* Introduced in IM 6.0.0, GM 1.1 */
#undef HAVE_NEGATEIMAGECHANNEL
+/* ColorInfo changed in 6.3.0 */
+#undef HAVE_NEW_COLORINFO
/* Introduced in IM 6.1.0 */
#undef HAVE_NORMALIZEIMAGECHANNEL
/* Introduced in IM 5.5.4 - Not available in GM */
diff -urN --exclude=3DCVS --exclude=3D.cvsignore --exclude=3D.svn --exclude=
=3D.svnignore old/RMagick-1.14.0/ext/RMagick/rmmain.c new/RMagick-1.14.1/ext/=
RMagick/rmmain.c
--- old/RMagick-1.14.0/ext/RMagick/rmmain.c 2006-09-27 23:26:35.000000000 +02=
00
+++ new/RMagick-1.14.1/ext/RMagick/rmmain.c 2006-10-21 15:43:23.000000000 +02=
00
@@ -1,4 +1,4 @@
-/* $Id: rmmain.c,v 1.146 2006/09/27 21:26:35 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.147 2006/10/21 13:43:23 rmagick Exp $ */
/*=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D\
| Copyright (C) 2006 by Timothy P. Hunter
| Name: rmmain.c
@@ -1826,9 +1826,8 @@
rb_raise(rb_eRuntimeError,
"This version of RMagick was created to run with %s %s\n"
"but %.*s is installed on this system. You should either\n"
- " 1) refer to the RMagick README file to learn how to create\n"
- " a version of RMagick for %.*s, or\n"
- " 2) download %s %s from %s and install it." ,
+ " 1) Configure and build RMagick for %.*s, or\n"
+ " 2) download %s %s from %s and install it.\n" ,
MagickPackageName, MagickLibVersionText, x, version_str, x, vers=
ion_str,
MagickPackageName, MagickLibVersionText, web_site);
}
@@ -1860,7 +1859,7 @@
rb_define_const(Module_Magick, "Version", str);
=20
sprintf(long_version,
- "This is %s ($Date: 2006/09/27 21:26:35 $) Copyright (C) 2006 by Tim=
othy P. Hunter\n"
+ "This is %s ($Date: 2006/10/21 13:43:23 $) Copyright (C) 2006 by Tim=
othy P. Hunter\n"
"Built with %s\n"
"Built for %s\n"
"Web page: http://rmagick.rubyforge.org\n"
diff -urN --exclude=3DCVS --exclude=3D.cvsignore --exclude=3D.svn --exclude=
=3D.svnignore old/RMagick-1.14.0/ext/RMagick/rmutil.c new/RMagick-1.14.1/ext/=
RMagick/rmutil.c
--- old/RMagick-1.14.0/ext/RMagick/rmutil.c 2006-09-27 23:26:36.000000000 +02=
00
+++ new/RMagick-1.14.1/ext/RMagick/rmutil.c 2006-10-21 15:41:32.000000000 +02=
00
@@ -1,4 +1,4 @@
-/* $Id: rmutil.c,v 1.83 2006/09/27 21:26:36 rmagick Exp $ */
+/* $Id: rmutil.c,v 1.84 2006/10/21 13:41:32 rmagick Exp $ */
/*=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D\
| Copyright (C) 2006 by Timothy P. Hunter
| Name: rmutil.c
@@ -16,6 +16,9 @@
static VALUE Enum_type_values(VALUE);
static VALUE Enum_type_inspect(VALUE);
static void handle_exception(ExceptionInfo *, Image *, ErrorRetention);
+#if defined(HAVE_NEW_COLORINFO)
+static VALUE Pixel_from_MagickPixelPacket(MagickPixelPacket *);
+#endif
=20
/*
Extern: magick_malloc, magick_free, magick_realloc
@@ -1077,26 +1080,6 @@
=20
=20
/*
- Extern: Pixel_from_MagickPixelPacket
- Purpose: Create a Magick::Pixel from a MagickPixelPacket structure
-*/
-#if defined(HAVE_MAGICKPIXELPACKET)
-VALUE
-Pixel_from_MagickPixelPacket(MagickPixelPacket *mpp)
-{
- PixelPacket pixel;
-
- pixel.red =3D RoundToQuantum(mpp->red);
- pixel.green =3D RoundToQuantum(mpp->green);
- pixel.blue =3D RoundToQuantum(mpp->blue);
- pixel.opacity =3D RoundToQuantum(mpp->opacity);
-
- return Pixel_from_PixelPacket(&pixel);
-}
-#endif
-
-
-/*
Extern: AffineMatrix_to_AffineMatrix
Purpose: Convert a Magick::AffineMatrix object to a AffineMatrix stru=
cture.
Notes: If not initialized, the defaults are [sx,rx,ry,sy,tx,ty] =3D=
[1,0,0,1,0,0]
@@ -1785,7 +1768,11 @@
=20
compliance_type =3D ci->compliance;
compliance =3D ComplianceType_new(compliance_type);
+#if defined(HAVE_NEW_COLORINFO)
+ color =3D Pixel_from_MagickPixelPacket((MagickPixelPacket *)(&(ci->=
color)));
+#else
color =3D Pixel_from_PixelPacket((PixelPacket *)(&(ci->color)));
+#endif
=20
return rb_funcall(Class_Color, ID_new, 3
, name, compliance, color);
@@ -1826,7 +1813,18 @@
if (m !=3D Qnil)
{
Data_Get_Struct(m, Pixel, pixel);
+#if defined(HAVE_NEW_COLORINFO)
+ // For >=3D 6.3.0, ColorInfo.color is a MagickPixelPacket so we have=
to
+ // convert the PixelPacket.
+ GetMagickPixelPacket(NULL, &ci->color);
+ ci->color.red =3D (MagickRealType) pixel->red;
+ ci->color.green =3D (MagickRealType) pixel->green;
+ ci->color.blue =3D (MagickRealType) pixel->blue;
+ ci->color.opacity =3D (MagickRealType) OpaqueOpacity;
+ ci->color.index =3D (MagickRealType) 0;
+#else
ci->color =3D *pixel;
+#endif
}
}
=20
@@ -1852,11 +1850,20 @@
char buff[1024];
=20
Color_to_ColorInfo(&ci, self);
+
+#if defined(HAVE_NEW_COLORINFO)
+ sprintf(buff, "name=3D%s, compliance=3D%s, "
+ "color.red=3D%g, color.green=3D%g, color.blue=3D%g, color.=
opacity=3D%g ",
+ ci.name,
+ ComplianceType_name(&ci.compliance),
+ ci.color.red, ci.color.green, ci.color.blue, ci.color.opac=
ity);
+#else
sprintf(buff, "name=3D%s, compliance=3D%s, "
"color.red=3D%d, color.green=3D%d, color.blue=3D%d, color.=
opacity=3D%d ",
ci.name,
ComplianceType_name(&ci.compliance),
ci.color.red, ci.color.green, ci.color.blue, ci.color.opac=
ity);
+#endif
=20
destroy_ColorInfo(&ci);
return rb_str_new2(buff);
@@ -1879,6 +1886,28 @@
=20
=20
/*
+ Static: Pixel_from_MagickPixelPacket
+ Purpose: Create a Magick::Pixel object from a MagickPixelPacket struc=
ture.
+ Notes: bypasses normal Pixel.new, Pixel#initialize methods
+*/
+#if defined(HAVE_NEW_COLORINFO)
+static VALUE
+Pixel_from_MagickPixelPacket(MagickPixelPacket *pp)
+{
+ Pixel *pixel;
+
+ pixel =3D ALLOC(Pixel);
+ pixel->red =3D RoundToQuantum(pp->red);
+ pixel->green =3D RoundToQuantum(pp->green);
+ pixel->blue =3D RoundToQuantum(pp->blue);
+ pixel->opacity =3D RoundToQuantum(pp->opacity);
+
+ return Data_Wrap_Struct(Class_Pixel, NULL, destroy_Pixel, pixel);
+}
+#endif
+
+
+/*
* Static: color_arg_rescue
* Purpose: raise ArgumentError if the color name cannot be converted
* to a string via rb_str_to_str.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
--===============4625104213091402056==--