rmagick 1.14.0 → 1.14.1

Sign up to get free protection for your applications and to get access to all the features.
data/ChangeLog CHANGED
@@ -1,3 +1,7 @@
1
+ RMagick 1.14.1
2
+ o Handle change to the type of the ColorInfo.color field introduced by
3
+ ImageMagick 6.3.0
4
+
1
5
  RMagick 1.14.0
2
6
  o Feature request #5015, support CMYK->RGB conversions. Added the
3
7
  add_profile and delete_profiles to the Image class. Fixed the profile!,
@@ -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.14.0 README</title>
4
+ <title>RMagick 1.14.1 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.14.0 README</h1>
9
+ <h1>RMagick 1.14.1 README</h1>
10
10
 
11
- <h2>09/28/06</h2>
11
+ <h2>10/21/06</h2>
12
12
 
13
13
  <h2>Table Of Contents</h2>
14
14
 
@@ -42,7 +42,7 @@ ImageMagick and GraphicsMagick image processing libraries.</p>
42
42
 
43
43
  <p><strong>Author:</strong> Tim Hunter</p>
44
44
 
45
- <p><strong>Email:</strong> <a href="&#109;&#x61;&#105;&#108;&#116;&#111;:&#x72;&#109;&#x61;&#x67;&#x69;&#099;&#107;&#064;&#x72;&#117;&#098;&#121;&#x66;&#x6F;&#114;&#103;&#101;&#046;&#111;&#x72;&#103;">&#x72;&#109;&#x61;&#x67;&#x69;&#099;&#107;&#064;&#x72;&#117;&#098;&#121;&#x66;&#x6F;&#114;&#103;&#101;&#046;&#111;&#x72;&#103;</a></p>
45
+ <p><strong>Email:</strong> <a href="&#x6D;&#097;&#x69;&#x6C;&#116;&#x6F;:&#114;&#x6D;&#x61;&#103;&#x69;ck&#x40;&#x72;&#x75;&#x62;&#121;&#x66;&#111;&#x72;&#103;&#101;&#046;&#x6F;&#x72;&#103;">&#114;&#x6D;&#x61;&#103;&#x69;ck&#x40;&#x72;&#x75;&#x62;&#121;&#x66;&#111;&#x72;&#103;&#101;&#046;&#x6F;&#x72;&#103;</a></p>
46
46
 
47
47
  <p><strong>RubyForge:</strong> <a href="http://rubyforge.org/projects/rmagick/">http://rubyforge.org/projects/rmagick/</a></p>
48
48
 
@@ -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.14.0.tar.gz archive and enter the top
231
+ <p>De-compress the RMagick-1.14.1.tar.gz archive and enter the top
232
232
  directory. Then type:</p>
233
233
 
234
234
  <pre><code>$ ./configure &lt;configuration options&gt;
@@ -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.14.0/lib/RMagick.rb:11:in `require': libMagick.so.0:
252
+ <pre><code>/home/you/RMagick-1.14.1/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.14.0/ext/RMagick/RMagick.so (LoadError)
254
+ /home/you/RMagick-1.14.1/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.14.0/./post-setup.rb failed:
274
+ <pre><code>hook /home/me/src/RMagick-1.14.1/./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.14.0 README
1
+ RMagick 1.14.1 README
2
2
  ================================
3
- 09/28/06
3
+ 10/21/06
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.14.0.tar.gz archive and enter the top
199
+ De-compress the RMagick-1.14.1.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.14.0/lib/RMagick.rb:11:in `require': libMagick.so.0:
217
+ /home/you/RMagick-1.14.1/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.14.0/ext/RMagick/RMagick.so (LoadError)
219
+ /home/you/RMagick-1.14.1/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.14.0/./post-setup.rb failed:
236
+ hook /home/me/src/RMagick-1.14.1/./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.59 for RMagick 1.14.0.
3
+ # Generated by GNU Autoconf 2.59 for RMagick 1.14.1.
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.14.0.tar.gz'
272
- PACKAGE_VERSION='1.14.0'
273
- PACKAGE_STRING='RMagick 1.14.0'
271
+ PACKAGE_TARNAME='RMagick-1.14.1.tar.gz'
272
+ PACKAGE_VERSION='1.14.1'
273
+ PACKAGE_STRING='RMagick 1.14.1'
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.14.0 to adapt to many kinds of systems.
782
+ \`configure' configures RMagick 1.14.1 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.14.0:";;
839
+ short | recursive ) echo "Configuration of RMagick 1.14.1:";;
840
840
  esac
841
841
  cat <<\_ACEOF
842
842
 
@@ -983,7 +983,7 @@ fi
983
983
  test -n "$ac_init_help" && exit 0
984
984
  if $ac_init_version; then
985
985
  cat <<\_ACEOF
986
- RMagick configure 1.14.0
986
+ RMagick configure 1.14.1
987
987
  generated by GNU Autoconf 2.59
988
988
 
989
989
  Copyright (C) 2003 Free Software Foundation, Inc.
@@ -997,7 +997,7 @@ cat >&5 <<_ACEOF
997
997
  This file contains any messages produced by compilers while
998
998
  running configure, to aid debugging if configure makes a mistake.
999
999
 
1000
- It was created by RMagick $as_me 1.14.0, which was
1000
+ It was created by RMagick $as_me 1.14.1, which was
1001
1001
  generated by GNU Autoconf 2.59. Invocation command line was
1002
1002
 
1003
1003
  $ $0 $@
@@ -4964,6 +4964,109 @@ fi
4964
4964
  done
4965
4965
 
4966
4966
 
4967
+ echo "$as_me:$LINENO: checking for GetMagickPixelPacket" >&5
4968
+ echo $ECHO_N "checking for GetMagickPixelPacket... $ECHO_C" >&6
4969
+ if test "${ac_cv_func_GetMagickPixelPacket+set}" = set; then
4970
+ echo $ECHO_N "(cached) $ECHO_C" >&6
4971
+ else
4972
+ cat >conftest.$ac_ext <<_ACEOF
4973
+ /* confdefs.h. */
4974
+ _ACEOF
4975
+ cat confdefs.h >>conftest.$ac_ext
4976
+ cat >>conftest.$ac_ext <<_ACEOF
4977
+ /* end confdefs.h. */
4978
+ /* Define GetMagickPixelPacket to an innocuous variant, in case <limits.h> declares GetMagickPixelPacket.
4979
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
4980
+ #define GetMagickPixelPacket innocuous_GetMagickPixelPacket
4981
+
4982
+ /* System header to define __stub macros and hopefully few prototypes,
4983
+ which can conflict with char GetMagickPixelPacket (); below.
4984
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
4985
+ <limits.h> exists even on freestanding compilers. */
4986
+
4987
+ #ifdef __STDC__
4988
+ # include <limits.h>
4989
+ #else
4990
+ # include <assert.h>
4991
+ #endif
4992
+
4993
+ #undef GetMagickPixelPacket
4994
+
4995
+ /* Override any gcc2 internal prototype to avoid an error. */
4996
+ #ifdef __cplusplus
4997
+ extern "C"
4998
+ {
4999
+ #endif
5000
+ /* We use char because int might match the return type of a gcc2
5001
+ builtin and then its argument prototype would still apply. */
5002
+ char GetMagickPixelPacket ();
5003
+ /* The GNU C library defines this for functions which it implements
5004
+ to always fail with ENOSYS. Some functions are actually named
5005
+ something starting with __ and the normal name is an alias. */
5006
+ #if defined (__stub_GetMagickPixelPacket) || defined (__stub___GetMagickPixelPacket)
5007
+ choke me
5008
+ #else
5009
+ char (*f) () = GetMagickPixelPacket;
5010
+ #endif
5011
+ #ifdef __cplusplus
5012
+ }
5013
+ #endif
5014
+
5015
+ int
5016
+ main ()
5017
+ {
5018
+ return f != GetMagickPixelPacket;
5019
+ ;
5020
+ return 0;
5021
+ }
5022
+ _ACEOF
5023
+ rm -f conftest.$ac_objext conftest$ac_exeext
5024
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5025
+ (eval $ac_link) 2>conftest.er1
5026
+ ac_status=$?
5027
+ grep -v '^ *+' conftest.er1 >conftest.err
5028
+ rm -f conftest.er1
5029
+ cat conftest.err >&5
5030
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
5031
+ (exit $ac_status); } &&
5032
+ { ac_try='test -z "$ac_c_werror_flag"
5033
+ || test ! -s conftest.err'
5034
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5035
+ (eval $ac_try) 2>&5
5036
+ ac_status=$?
5037
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
5038
+ (exit $ac_status); }; } &&
5039
+ { ac_try='test -s conftest$ac_exeext'
5040
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5041
+ (eval $ac_try) 2>&5
5042
+ ac_status=$?
5043
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
5044
+ (exit $ac_status); }; }; then
5045
+ ac_cv_func_GetMagickPixelPacket=yes
5046
+ else
5047
+ echo "$as_me: failed program was:" >&5
5048
+ sed 's/^/| /' conftest.$ac_ext >&5
5049
+
5050
+ ac_cv_func_GetMagickPixelPacket=no
5051
+ fi
5052
+ rm -f conftest.err conftest.$ac_objext \
5053
+ conftest$ac_exeext conftest.$ac_ext
5054
+ fi
5055
+ echo "$as_me:$LINENO: result: $ac_cv_func_GetMagickPixelPacket" >&5
5056
+ echo "${ECHO_T}$ac_cv_func_GetMagickPixelPacket" >&6
5057
+ if test $ac_cv_func_GetMagickPixelPacket = yes; then
5058
+ rm_have_getmagickpixelpacket=yes
5059
+ else
5060
+ rm_have_getmagickpixelpacket=no
5061
+ fi
5062
+
5063
+ if test "$rm_have_getmagickpixelpacket" = yes; then
5064
+ cat >>confdefs.h <<\_ACEOF
5065
+ #define HAVE_GETMAGICKPIXELPACKET 1
5066
+ _ACEOF
5067
+
5068
+ fi
5069
+
4967
5070
  echo "$as_me:$LINENO: checking for GetMagickInfoList" >&5
4968
5071
  echo $ECHO_N "checking for GetMagickInfoList... $ECHO_C" >&6
4969
5072
  if test "${ac_cv_func_GetMagickInfoList+set}" = set; then
@@ -5070,7 +5173,8 @@ fi
5070
5173
 
5071
5174
 
5072
5175
 
5073
- for ac_func in GetMultilineTypeMetrics GetNextImageAttribute GetNextImageProfile
5176
+
5177
+ for ac_func in GetMagickResourceLimit GetMultilineTypeMetrics GetNextImageAttribute GetNextImageProfile
5074
5178
  do
5075
5179
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
5076
5180
  echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -5278,8 +5382,7 @@ fi
5278
5382
 
5279
5383
 
5280
5384
 
5281
-
5282
- for ac_func in GetMagickResourceLimit GrayscalePseudoClassImage ImagesToBlob ImportImagePixels
5385
+ for ac_func in GrayscalePseudoClassImage ImagesToBlob ImportImagePixels
5283
5386
  do
5284
5387
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
5285
5388
  echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -9927,6 +10030,75 @@ _ACEOF
9927
10030
  fi
9928
10031
 
9929
10032
 
10033
+ # The MagickPixelPacket type was introduced in IM 6.0.0. The GetMagickPixelPacket
10034
+ # function was introduced in 6.2.0. IM 6.3.0 changed the type of the 'color'
10035
+ # member of the ColorInfo structure from PixelPacket to MagickPixelPacket.
10036
+ if test "$rm_have_getmagickpixelpacket" = yes; then
10037
+ echo "$as_me:$LINENO: checking if ColorInfo.color is a MagickPixelPacket" >&5
10038
+ echo $ECHO_N "checking if ColorInfo.color is a MagickPixelPacket... $ECHO_C" >&6
10039
+ if test "${rv_cv_struct_color_info_color+set}" = set; then
10040
+ echo $ECHO_N "(cached) $ECHO_C" >&6
10041
+ else
10042
+ cat >conftest.$ac_ext <<_ACEOF
10043
+ /* confdefs.h. */
10044
+ _ACEOF
10045
+ cat confdefs.h >>conftest.$ac_ext
10046
+ cat >>conftest.$ac_ext <<_ACEOF
10047
+ /* end confdefs.h. */
10048
+ #include <stdio.h>
10049
+ #if HAVE_SYS_TYPES_H
10050
+ #include <sys/types.h>
10051
+ #endif
10052
+ #include "magick/api.h"
10053
+ int
10054
+ main ()
10055
+ {
10056
+ ColorInfo color_info; MagickPixelPacket p; color_info.color = p
10057
+ ;
10058
+ return 0;
10059
+ }
10060
+ _ACEOF
10061
+ rm -f conftest.$ac_objext
10062
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10063
+ (eval $ac_compile) 2>conftest.er1
10064
+ ac_status=$?
10065
+ grep -v '^ *+' conftest.er1 >conftest.err
10066
+ rm -f conftest.er1
10067
+ cat conftest.err >&5
10068
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10069
+ (exit $ac_status); } &&
10070
+ { ac_try='test -z "$ac_c_werror_flag"
10071
+ || test ! -s conftest.err'
10072
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10073
+ (eval $ac_try) 2>&5
10074
+ ac_status=$?
10075
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10076
+ (exit $ac_status); }; } &&
10077
+ { ac_try='test -s conftest.$ac_objext'
10078
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10079
+ (eval $ac_try) 2>&5
10080
+ ac_status=$?
10081
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10082
+ (exit $ac_status); }; }; then
10083
+ rv_cv_struct_color_info_color='yes'
10084
+ else
10085
+ echo "$as_me: failed program was:" >&5
10086
+ sed 's/^/| /' conftest.$ac_ext >&5
10087
+
10088
+ rv_cv_struct_color_info_color='no'
10089
+ fi
10090
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
10091
+ fi
10092
+ echo "$as_me:$LINENO: result: $rv_cv_struct_color_info_color" >&5
10093
+ echo "${ECHO_T}$rv_cv_struct_color_info_color" >&6
10094
+
10095
+ if test "$rv_cv_struct_color_info_color" = yes; then
10096
+ cat >>confdefs.h <<\_ACEOF
10097
+ #define HAVE_NEW_COLORINFO 1
10098
+ _ACEOF
10099
+
10100
+ fi
10101
+ fi
9930
10102
 
9931
10103
  # Where is ****Magick installed?
9932
10104
  MAGICKPREFIX=`${MAGICKCONFIG} --prefix`
@@ -10415,7 +10587,7 @@ _ASBOX
10415
10587
  } >&5
10416
10588
  cat >&5 <<_CSEOF
10417
10589
 
10418
- This file was extended by RMagick $as_me 1.14.0, which was
10590
+ This file was extended by RMagick $as_me 1.14.1, which was
10419
10591
  generated by GNU Autoconf 2.59. Invocation command line was
10420
10592
 
10421
10593
  CONFIG_FILES = $CONFIG_FILES
@@ -10475,7 +10647,7 @@ _ACEOF
10475
10647
 
10476
10648
  cat >>$CONFIG_STATUS <<_ACEOF
10477
10649
  ac_cs_version="\\
10478
- RMagick config.status 1.14.0
10650
+ RMagick config.status 1.14.1
10479
10651
  configured by $0, generated by GNU Autoconf 2.59,
10480
10652
  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
10481
10653
 
@@ -1,7 +1,7 @@
1
1
 
2
2
  # RMagick configure.ac
3
3
 
4
- AC_INIT(RMagick, 1.14.0, rmagick@rubyforge.org, RMagick-1.14.0.tar.gz)
4
+ AC_INIT(RMagick, 1.14.1, rmagick@rubyforge.org, RMagick-1.14.1.tar.gz)
5
5
  echo "Configuring ${PACKAGE_STRING}"
6
6
 
7
7
  AC_CONFIG_HEADER([ext/RMagick/rmagick_config.h])
@@ -131,6 +131,13 @@ fi
131
131
 
132
132
  AC_CHECK_FUNCS([GetImageStatistics GetMagickInfoArray])
133
133
 
134
+ AC_CHECK_FUNC(GetMagickPixelPacket,
135
+ rm_have_getmagickpixelpacket=yes,
136
+ rm_have_getmagickpixelpacket=no)
137
+ if test "$rm_have_getmagickpixelpacket" = yes; then
138
+ AC_DEFINE(HAVE_GETMAGICKPIXELPACKET)
139
+ fi
140
+
134
141
  AC_CHECK_FUNC(GetMagickInfoList,
135
142
  rm_have_getmagickinfolist=yes,
136
143
  rm_have_getmagickinfolist=no)
@@ -138,7 +145,7 @@ if test "$rm_have_getmagickinfolist" = yes; then
138
145
  AC_DEFINE(HAVE_GETMAGICKINFOLIST)
139
146
  fi
140
147
 
141
- AC_CHECK_FUNCS([GetMultilineTypeMetrics GetNextImageAttribute GetNextImageProfile])
148
+ AC_CHECK_FUNCS([GetMagickResourceLimit GetMultilineTypeMetrics GetNextImageAttribute GetNextImageProfile])
142
149
 
143
150
  AC_CHECK_FUNC(GetTypeInfoList,
144
151
  rm_have_gettypeinfolist=yes,
@@ -147,7 +154,7 @@ if test "$rm_have_gettypeinfolist" = yes; then
147
154
  AC_DEFINE(HAVE_GETTYPEINFOLIST)
148
155
  fi
149
156
 
150
- AC_CHECK_FUNCS([GetMagickResourceLimit GrayscalePseudoClassImage ImagesToBlob ImportImagePixels])
157
+ AC_CHECK_FUNCS([GrayscalePseudoClassImage ImagesToBlob ImportImagePixels])
151
158
  AC_CHECK_FUNCS([InheritException InterpolatePixelColor InterpretImageAttributes IsColorSimilar])
152
159
  AC_CHECK_FUNCS([IsImageSimilar NegateImageChannel])
153
160
  AC_CHECK_FUNCS([NormalizeImageChannel ParseSizeGeometry PosterizeImage PreviewImage])
@@ -634,6 +641,25 @@ if test "$rm_have_acquirestringinfo" = yes -a "$rm_have_magickbooleantype" = yes
634
641
  fi
635
642
 
636
643
 
644
+ # The MagickPixelPacket type was introduced in IM 6.0.0. The GetMagickPixelPacket
645
+ # function was introduced in 6.2.0. IM 6.3.0 changed the type of the 'color'
646
+ # member of the ColorInfo structure from PixelPacket to MagickPixelPacket.
647
+ if test "$rm_have_getmagickpixelpacket" = yes; then
648
+ AC_CACHE_CHECK(if ColorInfo.color is a MagickPixelPacket, rv_cv_struct_color_info_color,
649
+ [AC_TRY_COMPILE(
650
+ [#include <stdio.h>
651
+ #if HAVE_SYS_TYPES_H
652
+ #include <sys/types.h>
653
+ #endif
654
+ #include "magick/api.h"],
655
+ [ColorInfo color_info; MagickPixelPacket p; color_info.color = p],
656
+ rv_cv_struct_color_info_color='yes',
657
+ rv_cv_struct_color_info_color='no')])
658
+
659
+ if test "$rv_cv_struct_color_info_color" = yes; then
660
+ AC_DEFINE(HAVE_NEW_COLORINFO)
661
+ fi
662
+ fi
637
663
 
638
664
  # Where is ****Magick installed?
639
665
  MAGICKPREFIX=`${MAGICKCONFIG} --prefix`
@@ -1685,7 +1685,7 @@ img = Magick::Image.read_inline(content)
1685
1685
  "bordered" onmouseover=
1686
1686
  "this.style.display='none'; borderless.style.display='';" src=
1687
1687
  "ex/border.jpg" alt="border example"
1688
- /></a><img src="ex/images/spin.gif" alt="" class=
1688
+ /></a><img src="ex/images/spin.gif" alt="" class=
1689
1689
  "spin" style="left: 224px;" title=
1690
1690
  "Mouse over the example to see the original image" /></p>
1691
1691
 
@@ -3799,6 +3799,9 @@ exit
3799
3799
 
3800
3800
  <h4>Returns</h4>
3801
3801
 
3802
+ <p>The distortion metric, represented as a floating-point
3803
+ number.</p>
3804
+
3802
3805
  <h4>Magick API</h4>
3803
3806
 
3804
3807
  <p>GetImageChannelDistortion (available in ImageMagick
@@ -3834,7 +3837,9 @@ exit
3834
3837
  <div class="sig">
3835
3838
  <h3 id="each_iptc_dataset">each_iptc_dataset</h3>
3836
3839
 
3837
- <p>image.each_iptc_dataset -&gt; <code>nil</code></p>
3840
+ <p>image.each_iptc_dataset { |<span class="arg">dataset</span>,
3841
+ <span class="arg">data_field</span>| <span class=
3842
+ "arg">block</span>} -&gt; <code>nil</code></p>
3838
3843
  </div>
3839
3844
 
3840
3845
  <div class="desc">
@@ -1113,12 +1113,11 @@ random_threshold_channel(geom, RedChannel)
1113
1113
 
1114
1114
  <p>Rotate the receiver by the specified angle. Positive angles
1115
1115
  rotate clockwise while negative angles rotate
1116
- counter-clockwise. <span class="imquote">Rotated images are
1117
- usually larger than the originals and have "empty" triangular
1118
- corners. Empty triangles left over from shearing the image are
1119
- filled with the <a href=
1120
- "imageattrs.html#background_color">background
1121
- color</a>.</span></p>
1116
+ counter-clockwise. New pixels introduced by the rotation are
1117
+ the same color as the current <a href=
1118
+ "imageattrs.html#background_color">background color</a>. Set
1119
+ the background color to "none" to make the new pixels
1120
+ transparent black.</p>
1122
1121
 
1123
1122
  <h4>Arguments</h4>
1124
1123
 
@@ -1,4 +1,4 @@
1
- MANIFEST for RMagick-1.14.0 - 18:45:26 09/28/06
1
+ MANIFEST for RMagick-1.14.1 - 10:19:02 10/21/06
2
2
 
3
3
  configure
4
4
  README.html
@@ -6,7 +6,7 @@ require 'mkmf'
6
6
  # Pass along Ruby's version number
7
7
  VERSION_NUMBER = '0x'+RUBY_VERSION.tr('.','')
8
8
 
9
- $CFLAGS = "-Wall @CFLAGS@"
9
+ $CFLAGS = "@CFLAGS@"
10
10
  $CPPFLAGS = "-DRUBY_VERSION=#{VERSION_NUMBER} @CPPFLAGS@"
11
11
 
12
12
  if RUBY_VERSION >= '1.8.0'
@@ -1,4 +1,4 @@
1
- /* $Id: rmagick.h,v 1.138 2006/09/27 21:26:35 rmagick Exp $ */
1
+ /* $Id: rmagick.h,v 1.139 2006/10/21 13:40:47 rmagick Exp $ */
2
2
  /*=============================================================================
3
3
  | Copyright (C) 2006 by Timothy P. Hunter
4
4
  | Name: rmagick.h
@@ -1021,9 +1021,6 @@ extern VALUE Pixel_to_s(VALUE);
1021
1021
  extern VALUE PixelPacket_to_Color_Name(Image *, PixelPacket *);
1022
1022
  extern VALUE PixelPacket_to_Color_Name_Info(Info *, PixelPacket *);
1023
1023
  extern VALUE Pixel_from_PixelPacket(PixelPacket *);
1024
- #if defined(HAVE_MAGICKPIXELPACKET)
1025
- extern VALUE Pixel_from_MagickPixelPacket(MagickPixelPacket *);
1026
- #endif
1027
1024
 
1028
1025
  extern void Point_to_PointInfo(PointInfo *, VALUE);
1029
1026
  extern VALUE PointInfo_to_Point(PointInfo *);
@@ -95,6 +95,8 @@
95
95
  #undef HAVE_GETMAGICKINFOLIST
96
96
  /* API changed in IM 6.1.3 */
97
97
  #undef HAVE_OLD_GETMAGICKINFOLIST
98
+ /* Introduced in IM 6.3.0 */
99
+ #undef HAVE_GETMAGICKPIXELPACKET
98
100
  /* Introduced in IM 6.2.5 */
99
101
  #undef HAVE_GETMAGICKRESOURCELIMIT
100
102
  /* Introduced in IM 6.1.5 */
@@ -163,6 +165,8 @@
163
165
  #undef HAVE_MEMORY_H
164
166
  /* Introduced in IM 6.0.0, GM 1.1 */
165
167
  #undef HAVE_NEGATEIMAGECHANNEL
168
+ /* ColorInfo changed in 6.3.0 */
169
+ #undef HAVE_NEW_COLORINFO
166
170
  /* Introduced in IM 6.1.0 */
167
171
  #undef HAVE_NORMALIZEIMAGECHANNEL
168
172
  /* Introduced in IM 5.5.4 - Not available in GM */
@@ -1,4 +1,4 @@
1
- /* $Id: rmmain.c,v 1.146 2006/09/27 21:26:35 rmagick Exp $ */
1
+ /* $Id: rmmain.c,v 1.147 2006/10/21 13:43:23 rmagick Exp $ */
2
2
  /*============================================================================\
3
3
  | Copyright (C) 2006 by Timothy P. Hunter
4
4
  | Name: rmmain.c
@@ -1826,9 +1826,8 @@ static void test_Magick_version(void)
1826
1826
  rb_raise(rb_eRuntimeError,
1827
1827
  "This version of RMagick was created to run with %s %s\n"
1828
1828
  "but %.*s is installed on this system. You should either\n"
1829
- " 1) refer to the RMagick README file to learn how to create\n"
1830
- " a version of RMagick for %.*s, or\n"
1831
- " 2) download %s %s from %s and install it." ,
1829
+ " 1) Configure and build RMagick for %.*s, or\n"
1830
+ " 2) download %s %s from %s and install it.\n" ,
1832
1831
  MagickPackageName, MagickLibVersionText, x, version_str, x, version_str,
1833
1832
  MagickPackageName, MagickLibVersionText, web_site);
1834
1833
  }
@@ -1860,7 +1859,7 @@ static void version_constants(void)
1860
1859
  rb_define_const(Module_Magick, "Version", str);
1861
1860
 
1862
1861
  sprintf(long_version,
1863
- "This is %s ($Date: 2006/09/27 21:26:35 $) Copyright (C) 2006 by Timothy P. Hunter\n"
1862
+ "This is %s ($Date: 2006/10/21 13:43:23 $) Copyright (C) 2006 by Timothy P. Hunter\n"
1864
1863
  "Built with %s\n"
1865
1864
  "Built for %s\n"
1866
1865
  "Web page: http://rmagick.rubyforge.org\n"
@@ -1,4 +1,4 @@
1
- /* $Id: rmutil.c,v 1.83 2006/09/27 21:26:36 rmagick Exp $ */
1
+ /* $Id: rmutil.c,v 1.84 2006/10/21 13:41:32 rmagick Exp $ */
2
2
  /*============================================================================\
3
3
  | Copyright (C) 2006 by Timothy P. Hunter
4
4
  | Name: rmutil.c
@@ -16,6 +16,9 @@ static void Color_Name_to_PixelPacket(PixelPacket *, VALUE);
16
16
  static VALUE Enum_type_values(VALUE);
17
17
  static VALUE Enum_type_inspect(VALUE);
18
18
  static void handle_exception(ExceptionInfo *, Image *, ErrorRetention);
19
+ #if defined(HAVE_NEW_COLORINFO)
20
+ static VALUE Pixel_from_MagickPixelPacket(MagickPixelPacket *);
21
+ #endif
19
22
 
20
23
  /*
21
24
  Extern: magick_malloc, magick_free, magick_realloc
@@ -1076,26 +1079,6 @@ Color_Name_to_PixelPacket(PixelPacket *color, VALUE name_arg)
1076
1079
  }
1077
1080
 
1078
1081
 
1079
- /*
1080
- Extern: Pixel_from_MagickPixelPacket
1081
- Purpose: Create a Magick::Pixel from a MagickPixelPacket structure
1082
- */
1083
- #if defined(HAVE_MAGICKPIXELPACKET)
1084
- VALUE
1085
- Pixel_from_MagickPixelPacket(MagickPixelPacket *mpp)
1086
- {
1087
- PixelPacket pixel;
1088
-
1089
- pixel.red = RoundToQuantum(mpp->red);
1090
- pixel.green = RoundToQuantum(mpp->green);
1091
- pixel.blue = RoundToQuantum(mpp->blue);
1092
- pixel.opacity = RoundToQuantum(mpp->opacity);
1093
-
1094
- return Pixel_from_PixelPacket(&pixel);
1095
- }
1096
- #endif
1097
-
1098
-
1099
1082
  /*
1100
1083
  Extern: AffineMatrix_to_AffineMatrix
1101
1084
  Purpose: Convert a Magick::AffineMatrix object to a AffineMatrix structure.
@@ -1785,7 +1768,11 @@ Color_from_ColorInfo(const ColorInfo *ci)
1785
1768
 
1786
1769
  compliance_type = ci->compliance;
1787
1770
  compliance = ComplianceType_new(compliance_type);
1771
+ #if defined(HAVE_NEW_COLORINFO)
1772
+ color = Pixel_from_MagickPixelPacket((MagickPixelPacket *)(&(ci->color)));
1773
+ #else
1788
1774
  color = Pixel_from_PixelPacket((PixelPacket *)(&(ci->color)));
1775
+ #endif
1789
1776
 
1790
1777
  return rb_funcall(Class_Color, ID_new, 3
1791
1778
  , name, compliance, color);
@@ -1826,7 +1813,18 @@ Color_to_ColorInfo(ColorInfo *ci, VALUE st)
1826
1813
  if (m != Qnil)
1827
1814
  {
1828
1815
  Data_Get_Struct(m, Pixel, pixel);
1816
+ #if defined(HAVE_NEW_COLORINFO)
1817
+ // For >= 6.3.0, ColorInfo.color is a MagickPixelPacket so we have to
1818
+ // convert the PixelPacket.
1819
+ GetMagickPixelPacket(NULL, &ci->color);
1820
+ ci->color.red = (MagickRealType) pixel->red;
1821
+ ci->color.green = (MagickRealType) pixel->green;
1822
+ ci->color.blue = (MagickRealType) pixel->blue;
1823
+ ci->color.opacity = (MagickRealType) OpaqueOpacity;
1824
+ ci->color.index = (MagickRealType) 0;
1825
+ #else
1829
1826
  ci->color = *pixel;
1827
+ #endif
1830
1828
  }
1831
1829
  }
1832
1830
 
@@ -1852,11 +1850,20 @@ Color_to_s(VALUE self)
1852
1850
  char buff[1024];
1853
1851
 
1854
1852
  Color_to_ColorInfo(&ci, self);
1853
+
1854
+ #if defined(HAVE_NEW_COLORINFO)
1855
+ sprintf(buff, "name=%s, compliance=%s, "
1856
+ "color.red=%g, color.green=%g, color.blue=%g, color.opacity=%g ",
1857
+ ci.name,
1858
+ ComplianceType_name(&ci.compliance),
1859
+ ci.color.red, ci.color.green, ci.color.blue, ci.color.opacity);
1860
+ #else
1855
1861
  sprintf(buff, "name=%s, compliance=%s, "
1856
1862
  "color.red=%d, color.green=%d, color.blue=%d, color.opacity=%d ",
1857
1863
  ci.name,
1858
1864
  ComplianceType_name(&ci.compliance),
1859
1865
  ci.color.red, ci.color.green, ci.color.blue, ci.color.opacity);
1866
+ #endif
1860
1867
 
1861
1868
  destroy_ColorInfo(&ci);
1862
1869
  return rb_str_new2(buff);
@@ -1878,6 +1885,28 @@ Pixel_from_PixelPacket(PixelPacket *pp)
1878
1885
  }
1879
1886
 
1880
1887
 
1888
+ /*
1889
+ Static: Pixel_from_MagickPixelPacket
1890
+ Purpose: Create a Magick::Pixel object from a MagickPixelPacket structure.
1891
+ Notes: bypasses normal Pixel.new, Pixel#initialize methods
1892
+ */
1893
+ #if defined(HAVE_NEW_COLORINFO)
1894
+ static VALUE
1895
+ Pixel_from_MagickPixelPacket(MagickPixelPacket *pp)
1896
+ {
1897
+ Pixel *pixel;
1898
+
1899
+ pixel = ALLOC(Pixel);
1900
+ pixel->red = RoundToQuantum(pp->red);
1901
+ pixel->green = RoundToQuantum(pp->green);
1902
+ pixel->blue = RoundToQuantum(pp->blue);
1903
+ pixel->opacity = RoundToQuantum(pp->opacity);
1904
+
1905
+ return Data_Wrap_Struct(Class_Pixel, NULL, destroy_Pixel, pixel);
1906
+ }
1907
+ #endif
1908
+
1909
+
1881
1910
  /*
1882
1911
  * Static: color_arg_rescue
1883
1912
  * Purpose: raise ArgumentError if the color name cannot be converted
@@ -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.14.0"
4
+ s.version = "1.14.1"
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.9.0
3
3
  specification_version: 1
4
4
  name: rmagick
5
5
  version: !ruby/object:Gem::Version
6
- version: 1.14.0
7
- date: 2006-09-28 00:00:00 -04:00
6
+ version: 1.14.1
7
+ date: 2006-10-21 00:00:00 -04:00
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