Hello community,
here is the log from the commit of package ruby-RMagick
checked in at Wed Oct 25 02:12:56 CEST 2006.
--------
--- ruby-RMagick/ruby-RMagick.changes 2006-10-20 01:31:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/ruby-RMagick/ruby-RMagick.changes 2006-10-24 16:28:44.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Oct 24 16:14:13 CEST 2006 - mrueckert@suse.de
+
+- update to version 1.14.1
+ o fixes building with ImageMagick 6.3.0
+
+-------------------------------------------------------------------
Old:
----
RMagick-1.14.0.tar.bz2
New:
----
RMagick-1.14.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ruby-RMagick.spec ++++++
--- /var/tmp/diff_new_pack.t3ESFt/_old 2006-10-25 02:12:44.000000000 +0200
+++ /var/tmp/diff_new_pack.t3ESFt/_new 2006-10-25 02:12:44.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ruby-RMagick (Version 1.14.0)
+# spec file for package ruby-RMagick (Version 1.14.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,7 +13,7 @@
Name: ruby-RMagick
%define rb_mod RMagick
#
-Version: 1.14.0
+Version: 1.14.1
Release: 1
#
License: X11/MIT
@@ -23,7 +23,7 @@
BuildRequires: ImageMagick-devel ghostscript-fonts-std ruby-devel xorg-x11-fonts-scalable
#
URL: http://rmagick.rubyforge.org/
-Source: http://rubyforge.org/frs/download.php/13491/RMagick-1.14.0.tar.bz2
+Source: http://rubyforge.org/frs/download.php/14052/RMagick-1.14.1.tar.bz2
#
Summary: Ruby bindings for ImageMagick
@@ -103,6 +103,9 @@
%doc %{_docdir}/%{name}/doc
%changelog -n ruby-RMagick
+* Tue Oct 24 2006 - mrueckert@suse.de
+- update to version 1.14.1
+ o fixes building with ImageMagick 6.3.0
* Sun Oct 01 2006 - mrueckert@suse.de
- update to version 1.14.0
o Feature request #5015, support CMYK->RGB conversions. Added the
++++++ RMagick-1.14.0.tar.bz2 -> RMagick-1.14.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/RMagick-1.14.0/ChangeLog new/RMagick-1.14.1/ChangeLog
--- old/RMagick-1.14.0/ChangeLog 2006-09-27 23:27:33.000000000 +0200
+++ new/RMagick-1.14.1/ChangeLog 2006-10-21 16:22:44.000000000 +0200
@@ -1,3 +1,7 @@
+RMagick 1.14.1
+ o Handle change to the type of the ColorInfo.color field introduced by
+ ImageMagick 6.3.0
+
RMagick 1.14.0
o Feature request #5015, support CMYK->RGB conversions. Added the
add_profile and delete_profiles to the Image class. Fixed the profile!,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/RMagick-1.14.0/README.html new/RMagick-1.14.1/README.html
--- old/RMagick-1.14.0/README.html 2006-09-29 00:45:22.000000000 +0200
+++ new/RMagick-1.14.1/README.html 2006-10-21 16:18:55.000000000 +0200
@@ -1,14 +1,14 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
- <title>RMagick 1.14.0 README</title>
+ <title>RMagick 1.14.1 README</title>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="GENERATOR" content="BlueCloth">
</head>
<body>
-<h1>RMagick 1.14.0 README</h1>
+<h1>RMagick 1.14.1 README</h1>
-<h2>09/28/06</h2>
+<h2>10/21/06</h2>
<h2>Table Of Contents</h2>
@@ -42,7 +42,7 @@
<p><strong>Author:</strong> Tim Hunter</p>
-<p><strong>Email:</strong> <a href="mailto:rmagick@rubyforge.org">rmagick@rubyforge.org</a></p>
+<p><strong>Email:</strong> <a href="mailto:rmagick@rubyforge.org">rmagick@rubyforge.org</a></p>
<p><strong>RubyForge:</strong> <a href="http://rubyforge.org/projects/rmagick/">http://rubyforge.org/projects/rmagick/</a></p>
@@ -228,7 +228,7 @@
<h4 id="scripts">Running the <code>configure</code> and <code>make</code> scripts</h4>
-<p>De-compress the RMagick-1.14.0.tar.gz archive and enter the top
+<p>De-compress the RMagick-1.14.1.tar.gz archive and enter the top
directory. Then type:</p>
<pre><code>$ ./configure <configuration options>
@@ -249,9 +249,9 @@
<p>When make is running the examples, if you get a message like this:</p>
-<pre><code>/home/you/RMagick-1.14.0/lib/RMagick.rb:11:in `require': libMagick.so.0:
+<pre><code>/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)
</code></pre>
<p>you probably do not have the directory in which the ImageMagick or GraphicsMagick
@@ -271,7 +271,7 @@
<p>When make is running the examples, if you get a message like this:</p>
-<pre><code>hook /home/me/src/RMagick-1.14.0/./post-setup.rb failed:
+<pre><code>hook /home/me/src/RMagick-1.14.1/./post-setup.rb failed:
No such file or directory - "/tmp/rmagick6872.6"
</code></pre>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.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
================================
-09/28/06
+10/21/06
--------
Table Of Contents
@@ -196,7 +196,7 @@
<h4 id="scripts">Running the <code>configure</code> and <code>make</code> scripts</h4>
-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:
$ ./configure <configuration options>
@@ -214,9 +214,9 @@
#### Cannot open shared object file
When make is running the examples, if you get a message like this:
- /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)
you probably do not have the directory in which the ImageMagick or GraphicsMagick
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:
- 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"
you probably do not have a temporary directory environment variable set. Set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.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 @@
# Identity of this package.
PACKAGE_NAME='RMagick'
-PACKAGE_TARNAME='RMagick-1.14.0.tar.gz'
-PACKAGE_VERSION='1.14.0'
-PACKAGE_STRING='RMagick 1.14.0'
+PACKAGE_TARNAME='RMagick-1.14.1.tar.gz'
+PACKAGE_VERSION='1.14.1'
+PACKAGE_STRING='RMagick 1.14.1'
PACKAGE_BUGREPORT='rmagick@rubyforge.org'
# 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.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -836,7 +836,7 @@
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
@@ -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
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.
-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
$ $0 $@
@@ -4964,6 +4964,109 @@
done
+echo "$as_me:$LINENO: checking for GetMagickPixelPacket" >&5
+echo $ECHO_N "checking for GetMagickPixelPacket... $ECHO_C" >&6
+if test "${ac_cv_func_GetMagickPixelPacket+set}" = 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 declares 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___GetMagickPixelPacket)
+choke me
+#else
+char (*f) () = GetMagickPixelPacket;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != 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=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='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=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_GetMagickPixelPacket=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_GetMagickPixelPacket=no
+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 = yes; then
+ rm_have_getmagickpixelpacket=yes
+else
+ rm_have_getmagickpixelpacket=no
+fi
+
+if test "$rm_have_getmagickpixelpacket" = 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}" = set; then
@@ -5070,7 +5173,8 @@
-for ac_func in GetMultilineTypeMetrics GetNextImageAttribute GetNextImageProfile
+
+for ac_func in GetMagickResourceLimit GetMultilineTypeMetrics GetNextImageAttribute GetNextImageProfile
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -5278,8 +5382,7 @@
-
-for ac_func in GetMagickResourceLimit GrayscalePseudoClassImage ImagesToBlob ImportImagePixels
+for ac_func in GrayscalePseudoClassImage ImagesToBlob ImportImagePixels
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -9927,6 +10030,75 @@
fi
+# The MagickPixelPacket type was introduced in IM 6.0.0. The GetMagickPixelPacket
+# 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" = 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}" = 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 = 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=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='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=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ rv_cv_struct_color_info_color='yes'
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+rv_cv_struct_color_info_color='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" = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_NEW_COLORINFO 1
+_ACEOF
+
+ fi
+fi
# Where is ****Magick installed?
MAGICKPREFIX=`${MAGICKCONFIG} --prefix`
@@ -10415,7 +10587,7 @@
} >&5
cat >&5 <<_CSEOF
-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
CONFIG_FILES = $CONFIG_FILES
@@ -10475,7 +10647,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-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'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.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 @@
# RMagick configure.ac
-AC_INIT(RMagick, 1.14.0, rmagick@rubyforge.org, RMagick-1.14.0.tar.gz)
+AC_INIT(RMagick, 1.14.1, rmagick@rubyforge.org, RMagick-1.14.1.tar.gz)
echo "Configuring ${PACKAGE_STRING}"
AC_CONFIG_HEADER([ext/RMagick/rmagick_config.h])
@@ -131,6 +131,13 @@
AC_CHECK_FUNCS([GetImageStatistics GetMagickInfoArray])
+AC_CHECK_FUNC(GetMagickPixelPacket,
+ rm_have_getmagickpixelpacket=yes,
+ rm_have_getmagickpixelpacket=no)
+if test "$rm_have_getmagickpixelpacket" = yes; then
+ AC_DEFINE(HAVE_GETMAGICKPIXELPACKET)
+fi
+
AC_CHECK_FUNC(GetMagickInfoList,
rm_have_getmagickinfolist=yes,
rm_have_getmagickinfolist=no)
@@ -138,7 +145,7 @@
AC_DEFINE(HAVE_GETMAGICKINFOLIST)
fi
-AC_CHECK_FUNCS([GetMultilineTypeMetrics GetNextImageAttribute GetNextImageProfile])
+AC_CHECK_FUNCS([GetMagickResourceLimit GetMultilineTypeMetrics GetNextImageAttribute GetNextImageProfile])
AC_CHECK_FUNC(GetTypeInfoList,
rm_have_gettypeinfolist=yes,
@@ -147,7 +154,7 @@
AC_DEFINE(HAVE_GETTYPEINFOLIST)
fi
-AC_CHECK_FUNCS([GetMagickResourceLimit GrayscalePseudoClassImage ImagesToBlob ImportImagePixels])
+AC_CHECK_FUNCS([GrayscalePseudoClassImage ImagesToBlob ImportImagePixels])
AC_CHECK_FUNCS([InheritException InterpolatePixelColor InterpretImageAttributes IsColorSimilar])
AC_CHECK_FUNCS([IsImageSimilar NegateImageChannel])
AC_CHECK_FUNCS([NormalizeImageChannel ParseSizeGeometry PosterizeImage PreviewImage])
@@ -634,6 +641,25 @@
fi
+# The MagickPixelPacket type was introduced in IM 6.0.0. The GetMagickPixelPacket
+# 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" = yes; then
+ AC_CACHE_CHECK(if ColorInfo.color is a MagickPixelPacket, rv_cv_struct_color_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 = p],
+ rv_cv_struct_color_info_color='yes',
+ rv_cv_struct_color_info_color='no')])
+
+ if test "$rv_cv_struct_color_info_color" = yes; then
+ AC_DEFINE(HAVE_NEW_COLORINFO)
+ fi
+fi
# Where is ****Magick installed?
MAGICKPREFIX=`${MAGICKCONFIG} --prefix`
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/RMagick-1.14.0/doc/image1.html new/RMagick-1.14.1/doc/image1.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=
"this.style.display='none'; borderless.style.display='';" src=
"ex/border.jpg" alt="border example"
- /></a><img src="ex/images/spin.gif" alt="" class=
+ /></a><img src="ex/images/spin.gif" alt="" class=
"spin" style="left: 224px;" title=
"Mouse over the example to see the original image" /></p>
@@ -3799,6 +3799,9 @@
<h4>Returns</h4>
+ <p>The distortion metric, represented as a floating-point
+ number.</p>
+
<h4>Magick API</h4>
<p>GetImageChannelDistortion (available in ImageMagick
@@ -3834,7 +3837,9 @@
<div class="sig">
<h3 id="each_iptc_dataset">each_iptc_dataset</h3>
- <p>image.each_iptc_dataset -> <code>nil</code></p>
+ <p>image.each_iptc_dataset { |<span class="arg">dataset</span>,
+ <span class="arg">data_field</span>| block</span>} -> <code>nil</code></p>
</div>
<div class="desc">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/RMagick-1.14.0/doc/image3.html new/RMagick-1.14.1/doc/image3.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 @@
<p>Rotate the receiver by the specified angle. Positive angles
rotate clockwise while negative angles rotate
- counter-clockwise. <span class="imquote">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</a>.</span></p>
+ counter-clockwise. New pixels introduced by the rotation are
+ the same color as the current background color</a>. Set
+ the background color to "none" to make the new pixels
+ transparent black.</p>
<h4>Arguments</h4>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.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 +0200
+++ new/RMagick-1.14.1/ext/RMagick/MANIFEST 2006-10-21 16:19:02.000000000 +0200
@@ -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
configure
README.html
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.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.000000000 +0200
+++ new/RMagick-1.14.1/ext/RMagick/extconf.rb.in 2006-10-04 00:40:22.000000000 +0200
@@ -6,7 +6,7 @@
# Pass along Ruby's version number
VERSION_NUMBER = '0x'+RUBY_VERSION.tr('.','')
-$CFLAGS = "-Wall @CFLAGS@"
+$CFLAGS = "@CFLAGS@"
$CPPFLAGS = "-DRUBY_VERSION=#{VERSION_NUMBER} @CPPFLAGS@"
if RUBY_VERSION >= '1.8.0'
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.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 +0200
+++ new/RMagick-1.14.1/ext/RMagick/rmagick.h 2006-10-21 15:40:47.000000000 +0200
@@ -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 $ */
/*=============================================================================
| 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
extern void Point_to_PointInfo(PointInfo *, VALUE);
extern VALUE PointInfo_to_Point(PointInfo *);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.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.000000000 +0200
+++ new/RMagick-1.14.1/ext/RMagick/rmagick_config.h.in 2006-10-21 15:44:44.000000000 +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=CVS --exclude=.cvsignore --exclude=.svn --exclude=.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 +0200
+++ new/RMagick-1.14.1/ext/RMagick/rmmain.c 2006-10-21 15:43:23.000000000 +0200
@@ -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 $ */
/*============================================================================\
| 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, version_str,
MagickPackageName, MagickLibVersionText, web_site);
}
@@ -1860,7 +1859,7 @@
rb_define_const(Module_Magick, "Version", str);
sprintf(long_version,
- "This is %s ($Date: 2006/09/27 21:26:35 $) Copyright (C) 2006 by Timothy P. Hunter\n"
+ "This is %s ($Date: 2006/10/21 13:43:23 $) Copyright (C) 2006 by Timothy P. Hunter\n"
"Built with %s\n"
"Built for %s\n"
"Web page: http://rmagick.rubyforge.org\n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.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 +0200
+++ new/RMagick-1.14.1/ext/RMagick/rmutil.c 2006-10-21 15:41:32.000000000 +0200
@@ -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 $ */
/*============================================================================\
| 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
/*
Extern: magick_malloc, magick_free, magick_realloc
@@ -1077,26 +1080,6 @@
/*
- 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 = RoundToQuantum(mpp->red);
- pixel.green = RoundToQuantum(mpp->green);
- pixel.blue = RoundToQuantum(mpp->blue);
- pixel.opacity = RoundToQuantum(mpp->opacity);
-
- return Pixel_from_PixelPacket(&pixel);
-}
-#endif
-
-
-/*
Extern: AffineMatrix_to_AffineMatrix
Purpose: Convert a Magick::AffineMatrix object to a AffineMatrix structure.
Notes: If not initialized, the defaults are [sx,rx,ry,sy,tx,ty] = [1,0,0,1,0,0]
@@ -1785,7 +1768,11 @@
compliance_type = ci->compliance;
compliance = ComplianceType_new(compliance_type);
+#if defined(HAVE_NEW_COLORINFO)
+ color = Pixel_from_MagickPixelPacket((MagickPixelPacket *)(&(ci->color)));
+#else
color = Pixel_from_PixelPacket((PixelPacket *)(&(ci->color)));
+#endif
return rb_funcall(Class_Color, ID_new, 3
, name, compliance, color);
@@ -1826,7 +1813,18 @@
if (m != Qnil)
{
Data_Get_Struct(m, Pixel, pixel);
+#if defined(HAVE_NEW_COLORINFO)
+ // For >= 6.3.0, ColorInfo.color is a MagickPixelPacket so we have to
+ // convert the PixelPacket.
+ GetMagickPixelPacket(NULL, &ci->color);
+ ci->color.red = (MagickRealType) pixel->red;
+ ci->color.green = (MagickRealType) pixel->green;
+ ci->color.blue = (MagickRealType) pixel->blue;
+ ci->color.opacity = (MagickRealType) OpaqueOpacity;
+ ci->color.index = (MagickRealType) 0;
+#else
ci->color = *pixel;
+#endif
}
}
@@ -1852,11 +1850,20 @@
char buff[1024];
Color_to_ColorInfo(&ci, self);
+
+#if defined(HAVE_NEW_COLORINFO)
+ sprintf(buff, "name=%s, compliance=%s, "
+ "color.red=%g, color.green=%g, color.blue=%g, color.opacity=%g ",
+ ci.name,
+ ComplianceType_name(&ci.compliance),
+ ci.color.red, ci.color.green, ci.color.blue, ci.color.opacity);
+#else
sprintf(buff, "name=%s, compliance=%s, "
"color.red=%d, color.green=%d, color.blue=%d, color.opacity=%d ",
ci.name,
ComplianceType_name(&ci.compliance),
ci.color.red, ci.color.green, ci.color.blue, ci.color.opacity);
+#endif
destroy_ColorInfo(&ci);
return rb_str_new2(buff);
@@ -1879,6 +1886,28 @@
/*
+ Static: Pixel_from_MagickPixelPacket
+ Purpose: Create a Magick::Pixel object from a MagickPixelPacket structure.
+ Notes: bypasses normal Pixel.new, Pixel#initialize methods
+*/
+#if defined(HAVE_NEW_COLORINFO)
+static VALUE
+Pixel_from_MagickPixelPacket(MagickPixelPacket *pp)
+{
+ Pixel *pixel;
+
+ pixel = ALLOC(Pixel);
+ pixel->red = RoundToQuantum(pp->red);
+ pixel->green = RoundToQuantum(pp->green);
+ pixel->blue = RoundToQuantum(pp->blue);
+ pixel->opacity = 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@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org