rmagick 1.10.1 → 1.11.0

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 CHANGED
@@ -1,3 +1,18 @@
1
+ RMagick 1.11.0
2
+ o Feature #3705, add resize_to_fit (thanks to Robert Manni for the code)
3
+ o Added optimize_layers method to the ImageList class (available with
4
+ ImageMagick 6.2.6)
5
+ o Added limit_resource method to the Magick module
6
+ o Replaced install.rb with setup.rb, improved gem install
7
+ (bug report from Ryan Davis)
8
+ o Added --disable-htmldoc option to setup.rb
9
+ o Fix bug #4104, incorrect label on example (reported by Jason Lee)
10
+ o Added contrast_stretch_channel to the Image class (available with
11
+ ImageMagick 6.2.6)
12
+ o Improved Magick exception handling to eliminate memory leaks when an exception
13
+ is rescued and execution continues.
14
+ o Tested with ImageMagick 6.2.7
15
+
1
16
  RMagick 1.10.1
2
17
  o Fix bug #3437, memory leak in ImageList#to_blob
3
18
  o Fix bug #3363, Image#composite doesn't work when the source image
@@ -1,28 +1,41 @@
1
1
 
2
+ SHELL=/bin/sh
3
+
2
4
  # Path to ruby interpreter
3
5
  RUBY=@RUBY@
4
6
 
5
- # Any extra options from configure script to pass to 'install.rb config'
7
+ # Any extra options from configure script to pass to 'setup.rb config'
6
8
  RUBY_CONFIG_OPTS=@RUBY_CONFIG_OPTS@
7
9
 
8
- all: config.save
9
- $(RUBY) install.rb setup
10
+ # gem install expects to find these 2 lines
11
+ RUBYLIBDIR = $(sitelibdir)$(target_prefix)
12
+ RUBYARCHDIR = $(sitearchdir)$(target_prefix)
13
+
14
+
15
+ all: .config
16
+ $(RUBY) setup.rb setup
10
17
 
11
18
  install:
12
- $(RUBY) install.rb install
19
+ $(RUBY) setup.rb install
13
20
 
14
- clean: config.save
15
- $(RUBY) install.rb clean
21
+ clean: .config
22
+ $(RUBY) setup.rb clean
16
23
 
17
- distclean: config.save
18
- $(RUBY) install.rb clean
24
+ distclean: .config
25
+ $(RUBY) setup.rb clean
19
26
  rm -f Makefile ext/RMagick/extconf.rb metaconfig
20
- rm -f config.status Makefile config.cache config.log
27
+ rm -f ext/RMagick/Makefile config.cache config.log
21
28
  rm -rf autom4te.cache
22
29
 
23
- uninstall: config.save
30
+ uninstall: .config
24
31
  $(RUBY) uninstall.rb $(RUBY_CONFIG_OPTS)
25
32
 
26
- config.save: metaconfig
27
- $(RUBY) install.rb config $(RUBY_CONFIG_OPTS)
33
+ .config: metaconfig
34
+ if test -n "$(RUBYLIBDIR)"; then \
35
+ RUBYLIBDIR=--rbdir="$(RUBYLIBDIR)"; \
36
+ fi; \
37
+ if test -n "$(RUBYARCHDIR)"; then \
38
+ RUBYARCHDIR=--sodir="$(RUBYARCHDIR)"; \
39
+ fi; \
40
+ $(RUBY) setup.rb config $$RUBYLIBDIR $$RUBYARCHDIR $(RUBY_CONFIG_OPTS)
28
41
 
@@ -1,192 +1 @@
1
- HOWTO Install RMagick on Mac OS X
2
-
3
- This HOWTO describes a method for installing RMagick, ImageMagick or
4
- GraphicsMagick, and the delegate libraries used by ImageMagick and
5
- GraphicsMagick. You only need to install one of ImageMagick or GraphicsMagick.
6
- The procedure is the same for either library. Throughout the remainder of this
7
- document I will use the word "xMagick" to refer to either of these two
8
- libraries. I developed this procedure using a Powerbook G4 and Mac OS X
9
- 10.3.8, and I've tested it with Tiger. If you are using a different version of
10
- Mac OS X some of the details may be different. In particular these
11
- instructions assume you are using bash as your shell.
12
-
13
- You will need to have your Mac OS X installation disks, a connection to
14
- the Internet, and at least an hour of free time (assuming you have a
15
- broadband connection).
16
-
17
- Step 1. Install X11, the Xcode Tools, and the X11SDK.
18
-
19
- xMagick needs the X11 fonts and a X server to display images, so you'll need to
20
- install X11. You also need the Xcode tools and the X11SDK.
21
-
22
- Apple says that both the Panther and Tiger install disks include these
23
- packages as an optional install (although I couldn't find X11 on my 10.3.8
24
- disks. Let's hope you can. Tiger definitely includes them). See
25
- http://developer.apple.com/darwin/runningX11.html for more information. Install
26
- X11, the Xcode Tools and the X11SDK.
27
-
28
- Step 2. Install DarwinPorts
29
-
30
- Go to http://darwinports.opendarwin.org/getdp/ and follow the instructions to
31
- download and install DarwinPorts. (The remainder of this document assumes that
32
- you take all the defaults during the installation.)
33
-
34
- Step 3: Install the delegate libraries
35
-
36
- xMagick uses a large number of delegate libraries. (See the README.txt file in
37
- the xMagick distribution for a complete list.) Here we'll use DarwinPorts to
38
- install delegates for popular image formats and that are needed to run the
39
- RMagick example programs. Enter the following port commands:
40
-
41
- sudo port install jpeg
42
- sudo port install libpng
43
- sudo port install libwmf
44
- sudo port install tiff
45
- sudo port install lcms
46
- sudo port install freetype
47
- sudo port install ghostscript
48
-
49
- Note that some of these libraries have prerequisites which will be automatically
50
- installed.
51
-
52
- Step 4: Install ImageMagick or GraphicsMagick
53
-
54
- Go to http://www.imagemagick.org or http://www.graphicsmagick.org and download
55
- the latest version of the software to a temporary directory. Unroll the tarball
56
- and make the new directory current.
57
-
58
- Before proceeding, you need to make sure you're using the correct version of the
59
- freetype library. The X11 files you installed in Step 1 include a version of
60
- the freetype library, and of course you just installed another version using
61
- DarwinPorts. You need to use the DarwinPorts version when you're building
62
- xMagick. To make sure you have the right version, enter the command:
63
-
64
- freetype-config --cflags
65
-
66
- You should see this output:
67
-
68
- -I/opt/local/include/freetype2 -I/opt/local/include
69
-
70
- If you see the following output instead,
71
-
72
- -I/usr/X11R6/include -I/usr/X11R6/include/freetype2
73
-
74
- you should edit your $PATH to make sure that /opt/local/bin preceeds
75
- /usr/X11R6/bin. Do not try to install xMagick until you get the correct output
76
- from the freetype-config program.
77
-
78
- To configure xMagick, enter these commands:
79
-
80
- export CPPFLAGS=-I/opt/local/include
81
- export LDFLAGS=-L/opt/local/lib
82
- ./configure --prefix=/opt/local --disable-static --with-modules --without-perl --without-magick-plus-plus --with-quantum-depth=8 --with-gs-font-dir=/opt/local/share/ghostscript/fonts
83
-
84
- The ./configure command should be entered on a single line. The
85
- --prefix=/opt/local option will cause xMagick to be installed in the same
86
- directory as the libraries we installed with DarwinPorts. If you want to
87
- install xMagick somewhere else, specify a different directory. If you do not
88
- specify the --prefix option xMagick will be installed in /usr/local. The
89
- --disable-static and --with-modules options cause xMagick to be built with
90
- dynamically loaded modules. Since you're installing xMagick for use with Ruby,
91
- I've included the --without-perl and --without-magick-plus-plus options to
92
- suppress the Perl and C++ support. The --with-quantum-depth=8 option configures
93
- xMagick to use a bit depth of 8. If you need to build with a different bit
94
- depth (and if you need to you'll already know it) you can specify 16 or 32.
95
- Finally, the --with-gs-font-dir option tells xMagick where the Ghostscript fonts
96
- are installed.
97
-
98
- For more information about all these options see xMagick's README.txt file.
99
-
100
- ./configure will produce quite a bit of output. The last page is the most
101
- interesting. If you've successfully performed all the steps so far and used all
102
- the deafults, the output from configure should end with a page like this:
103
-
104
- -------------------------------------------------------------------------------
105
-
106
- ImageMagick is configured as follows. Please verify that this configuration matches your expectations.
107
-
108
- Host system type : powerpc-apple-darwin7.8.0
109
-
110
- Option Value
111
- -------------------------------------------------------------------------
112
- Shared libraries --enable-shared=yes yes
113
- Static libraries --enable-static=no no
114
- Module support --with-modules=yes yes
115
- GNU ld --with-gnu-ld=no no
116
- Quantum depth --with-quantum-depth=8 8
117
-
118
- Delegate Configuration:
119
- BZLIB --with-bzlib=yes yes
120
- DPS --with-dps=yes yes
121
- FlashPIX --with-fpx=no no
122
- FreeType 2.0 --with-ttf=yes yes
123
- Ghostscript None gs (8.14)
124
- Ghostscript fonts --with-gs-font-dir=/opt/local/share/ghostscript/fonts /opt/local/share/ghostscript/fonts/
125
- Ghostscript lib --with-gslib=no no
126
- Graphviz --with-dot=yes no
127
- JBIG --with-jbig=yes no
128
- JPEG v1 --with-jpeg=yes yes
129
- JPEG-2000 --with-jp2=yes no
130
- LCMS --with-lcms=yes yes
131
- Magick++ --with-magick-plus-plus=no no
132
- PERL --with-perl=no no
133
- PNG --with-png=yes yes
134
- TIFF --with-tiff=yes yes
135
- Windows fonts --with-windows-font-dir=none
136
- WMF --with-wmf=yes yes
137
- X11 --with-x= yes
138
- XML --with-xml=yes yes
139
- ZLIB --with-zlib=yes yes
140
-
141
- X11 Configuration:
142
- X_CFLAGS = -I/usr/X11R6/include
143
-
144
- X_PRE_LIBS = -lSM -lICE
145
- X_LIBS = -L/usr/X11R6/lib
146
- X_EXTRA_LIBS =
147
-
148
- Options used to compile and link:
149
- PREFIX = /opt/local
150
- EXEC-PREFIX = /opt/local
151
- VERSION = X.Y.Z
152
- CC = gcc
153
- CFLAGS = -g -O2 -Wall
154
- CPPFLAGS = -I/opt/local/include
155
- PCFLAGS =
156
- DEFS = -DHAVE_CONFIG_H
157
- LDFLAGS = -L/opt/local/lib -L/opt/local/lib -L/usr/X11R6/lib -L/opt/local/lib -lfreetype -lz -L/usr/lib
158
- LIBS = -lMagick -llcms -ltiff -lfreetype -ljpeg -lXext -lSM -lICE -lX11 -lXt -lbz2 -lz -lpthread -lm -lpthread
159
- CXX = g++
160
- CXXFLAGS =
161
-
162
- -------------------------------------------------------------------------------
163
-
164
- Of course, instead of VERSION X.Y.Z you will see the version number of the
165
- version of xMagick that you downloaded. Check your output to make sure that
166
- xMagick located all the delegate libraries. You should see "yes" in the Value
167
- column for bzlib, FreeType 2.0, JPEG v1, LCMS, PNG, TIFF, WMF, X11, XML, and
168
- ZLIB.
169
-
170
- If you get this output from ./configure you're ready to proceed. If you are
171
- missing some delegates you should resolve those issues before continuing.
172
- Re-run ./configure, being very careful to enter the commands correctly.
173
-
174
- Once you're satisfied that you've configured xMagick the way you want it, enter
175
- these two commands:
176
-
177
- make
178
- sudo make install
179
-
180
- Step 5: Installing RMagick
181
-
182
- The hard part is done. All we have to do now is install RMagick. If you
183
- haven't already done so, download the RMagick tarball from Rubyforge and unroll
184
- it into a temporary directory. Make that directory current. Enter these
185
- commands
186
-
187
- ./configure
188
- make
189
- sudo make install
190
-
191
- The make step will take a few minutes to run since it builds all of the RMagick
192
- examples. That's it. You should have a complete install of xMagick and RMagick.
1
+ For installation instructions see http://rmagick.rubyforge.org/install-osx.html
@@ -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.10.1 README</title>
4
+ <title>RMagick 1.11.0 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.10.1 README</h1>
9
+ <h1>RMagick 1.11.0 README</h1>
10
10
 
11
- <h2>02/25/06</h2>
11
+ <h2>05/11/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="m&#x61;&#105;&#x6C;&#x74;&#x6F;:&#x72;&#x6D;&#x61;&#103;&#x69;&#x63;&#x6B;&#064;&#x72;&#x75;&#098;&#121;&#102;&#x6F;&#114;&#103;&#x65;.o&#x72;&#103;">&#x72;&#x6D;&#x61;&#103;&#x69;&#x63;&#x6B;&#064;&#x72;&#x75;&#098;&#121;&#102;&#x6F;&#114;&#103;&#x65;.o&#x72;&#103;</a></p>
45
+ <p><strong>Email:</strong> <a href="&#109;&#097;&#105;&#108;&#x74;&#x6F;:&#x72;&#x6D;&#x61;&#103;&#105;&#x63;&#x6B;&#x40;r&#x75;&#098;&#x79;&#102;&#111;&#x72;&#x67;&#101;&#046;&#x6F;&#114;&#103;">&#x72;&#x6D;&#x61;&#103;&#105;&#x63;&#x6B;&#x40;r&#x75;&#098;&#x79;&#102;&#111;&#x72;&#x67;&#101;&#046;&#x6F;&#114;&#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
 
@@ -182,6 +182,13 @@ addition to the regular options, there are a few RMagick-specific options:</p>
182
182
  examples and will always complete. This option is useful if you're having
183
183
  trouble installing RMagick and you want to see all the failing examples.</p>
184
184
  </blockquote></li>
185
+ <li><p>--disable-htmldoc (or --enable-htmldoc=no)</p>
186
+
187
+ <blockquote>
188
+ <p>By default the install process runs all the RMagick example programs
189
+ and generates HTML versions of all the examples. This option causes
190
+ the install process to skip this step. No documentation is installed.</p>
191
+ </blockquote></li>
185
192
  <li><p>--with-graphics-magick</p>
186
193
 
187
194
  <blockquote>
@@ -218,7 +225,7 @@ addition to the regular options, there are a few RMagick-specific options:</p>
218
225
 
219
226
  <h4 id="scripts">Running the <code>configure</code> and <code>make</code> scripts</h4>
220
227
 
221
- <p>De-compress the RMagick-1.10.1.tar.gz archive and enter the top
228
+ <p>De-compress the RMagick-1.11.0.tar.gz archive and enter the top
222
229
  directory. Then type:</p>
223
230
 
224
231
  <pre><code>$ ./configure &lt;configuration options&gt;
@@ -239,9 +246,9 @@ $ make clean
239
246
 
240
247
  <p>When make is running the examples, if you get a message like this:</p>
241
248
 
242
- <pre><code>/home/you/RMagick-1.10.1/lib/RMagick.rb:11:in `require': libMagick.so.0:
249
+ <pre><code>/home/you/RMagick-1.11.0/lib/RMagick.rb:11:in `require': libMagick.so.0:
243
250
  cannot open shared object file: No such file or directory -
244
- /home/you/RMagick-1.10.1/ext/RMagick/RMagick.so (LoadError)
251
+ /home/you/RMagick-1.11.0/ext/RMagick/RMagick.so (LoadError)
245
252
  </code></pre>
246
253
 
247
254
  <p>you probably do not have the directory in which the ImageMagick or GraphicsMagick
@@ -261,7 +268,7 @@ systems, see the documentation for the dynamic loading facility.</p>
261
268
 
262
269
  <p>When make is running the examples, if you get a message like this:</p>
263
270
 
264
- <pre><code>hook /home/me/src/RMagick-1.10.1/./post-setup.rb failed:
271
+ <pre><code>hook /home/me/src/RMagick-1.11.0/./post-setup.rb failed:
265
272
  No such file or directory - "/tmp/rmagick6872.6"
266
273
  </code></pre>
267
274
 
data/README.txt CHANGED
@@ -1,6 +1,6 @@
1
- RMagick 1.10.1 README
1
+ RMagick 1.11.0 README
2
2
  ================================
3
- 02/25/06
3
+ 05/11/06
4
4
  --------
5
5
 
6
6
  Table Of Contents
@@ -166,6 +166,11 @@ addition to the regular options, there are a few RMagick-specific options:
166
166
  > examples and will always complete. This option is useful if you're having
167
167
  > trouble installing RMagick and you want to see all the failing examples.
168
168
 
169
+ * --disable-htmldoc (or --enable-htmldoc=no)
170
+ > By default the install process runs all the RMagick example programs
171
+ > and generates HTML versions of all the examples. This option causes
172
+ > the install process to skip this step. No documentation is installed.
173
+
169
174
  * --with-graphics-magick
170
175
  > If you have both ImageMagick and GraphicsMagick installed, this option will
171
176
  > force RMagick to be configured with GraphicsMagick.
@@ -188,7 +193,7 @@ addition to the regular options, there are a few RMagick-specific options:
188
193
 
189
194
  <h4 id="scripts">Running the <code>configure</code> and <code>make</code> scripts</h4>
190
195
 
191
- De-compress the RMagick-1.10.1.tar.gz archive and enter the top
196
+ De-compress the RMagick-1.11.0.tar.gz archive and enter the top
192
197
  directory. Then type:
193
198
 
194
199
  $ ./configure <configuration options>
@@ -206,9 +211,9 @@ The message can also refer to "libGraphicsMagick". Typically this message means
206
211
  #### Cannot open shared object file
207
212
  When make is running the examples, if you get a message like this:
208
213
 
209
- /home/you/RMagick-1.10.1/lib/RMagick.rb:11:in `require': libMagick.so.0:
214
+ /home/you/RMagick-1.11.0/lib/RMagick.rb:11:in `require': libMagick.so.0:
210
215
  cannot open shared object file: No such file or directory -
211
- /home/you/RMagick-1.10.1/ext/RMagick/RMagick.so (LoadError)
216
+ /home/you/RMagick-1.11.0/ext/RMagick/RMagick.so (LoadError)
212
217
 
213
218
  you probably do not have the directory in which the ImageMagick or GraphicsMagick
214
219
  library is installed in your load path. An easy way to fix this is to define the
@@ -225,7 +230,7 @@ systems, see the documentation for the dynamic loading facility.
225
230
  #### No such file or directory - "/tmp/rmagick6872.6"
226
231
  When make is running the examples, if you get a message like this:
227
232
 
228
- hook /home/me/src/RMagick-1.10.1/./post-setup.rb failed:
233
+ hook /home/me/src/RMagick-1.11.0/./post-setup.rb failed:
229
234
  No such file or directory - "/tmp/rmagick6872.6"
230
235
 
231
236
  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.10.1.
3
+ # Generated by GNU Autoconf 2.59 for RMagick 1.11.0.
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.10.1.tar.gz'
272
- PACKAGE_VERSION='1.10.1'
273
- PACKAGE_STRING='RMagick 1.10.1'
271
+ PACKAGE_TARNAME='RMagick-1.11.0.tar.gz'
272
+ PACKAGE_VERSION='1.11.0'
273
+ PACKAGE_STRING='RMagick 1.11.0'
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.10.1 to adapt to many kinds of systems.
782
+ \`configure' configures RMagick 1.11.0 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.10.1:";;
839
+ short | recursive ) echo "Configuration of RMagick 1.11.0:";;
840
840
  esac
841
841
  cat <<\_ACEOF
842
842
 
@@ -849,12 +849,17 @@ Optional Features:
849
849
  [--disable-no-harm]
850
850
  --enable-allow-example-errors
851
851
  allow installation to proceed even if a lot of
852
- examples fail --disable-allow-example-errors
852
+ examples fail [--disable-allow-example-errors]
853
+ --disable-htmldoc skip creating the HTML documentation and examples
854
+ [--enable-htmldoc]
853
855
 
854
856
  Optional Packages:
855
857
  --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
856
858
  --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
857
859
  --with-graphics-magick configure RMagick with GraphicsMagick
860
+ --with-ruby-prog=NAME the ruby program used for installation
861
+ [PREFIX/bin/ruby]
862
+ --with-rbconfig=PATH your rbconfig to load [ruby's]
858
863
  --with-doc-dir=DIR RMagick documentation directory
859
864
  [PREFIX/share/RMagick]
860
865
  --with-std-ruby=DIR the directory for standard ruby libraries
@@ -868,10 +873,7 @@ Optional Packages:
868
873
  [PREFIX/lib/ruby/site_ruby/1.x]
869
874
  --with-so-dir=DIR the directory for ruby extensions
870
875
  --with-ruby-path=DIR path to set to #! line [PREFIX/bin/ruby]
871
- --with-ruby-prog=NAME the ruby program used for installation
872
- [PREFIX/bin/ruby]
873
876
  --with-make-prog=NAME the make program to compile ruby extensions [make]
874
- --with-rbconfig=PATH your rbconfig to load [ruby's]
875
877
 
876
878
  Some influential environment variables:
877
879
  CC C compiler command
@@ -981,7 +983,7 @@ fi
981
983
  test -n "$ac_init_help" && exit 0
982
984
  if $ac_init_version; then
983
985
  cat <<\_ACEOF
984
- RMagick configure 1.10.1
986
+ RMagick configure 1.11.0
985
987
  generated by GNU Autoconf 2.59
986
988
 
987
989
  Copyright (C) 2003 Free Software Foundation, Inc.
@@ -995,7 +997,7 @@ cat >&5 <<_ACEOF
995
997
  This file contains any messages produced by compilers while
996
998
  running configure, to aid debugging if configure makes a mistake.
997
999
 
998
- It was created by RMagick $as_me 1.10.1, which was
1000
+ It was created by RMagick $as_me 1.11.0, which was
999
1001
  generated by GNU Autoconf 2.59. Invocation command line was
1000
1002
 
1001
1003
  $ $0 $@
@@ -3615,7 +3617,7 @@ done
3615
3617
 
3616
3618
 
3617
3619
 
3618
- for ac_func in BlackThresholdImage BlurImageChannel CompareImageChannels ConvolveImageChannel
3620
+ for ac_func in BlackThresholdImage BlurImageChannel ClearMagickException CompareImageChannels
3619
3621
  do
3620
3622
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
3621
3623
  echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -3719,7 +3721,8 @@ done
3719
3721
 
3720
3722
 
3721
3723
 
3722
- for ac_func in EvaluateImageChannel ExportImagePixels FuzzyColorCompare
3724
+
3725
+ for ac_func in CompareImageLayers ContrastStretchImageChannel ConvolveImageChannel EvaluateImageChannel
3723
3726
  do
3724
3727
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
3725
3728
  echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -3822,7 +3825,9 @@ done
3822
3825
 
3823
3826
 
3824
3827
 
3825
- for ac_func in GammaImageChannel GaussianBlurImageChannel
3828
+
3829
+
3830
+ for ac_func in ExportImagePixels FuzzyColorCompare GammaImageChannel GaussianBlurImageChannel
3826
3831
  do
3827
3832
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
3828
3833
  echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -4966,7 +4971,7 @@ fi
4966
4971
 
4967
4972
 
4968
4973
 
4969
- for ac_func in GrayscalePseudoClassImage ImagesToBlob ImportImagePixels InterpretImageAttributes
4974
+ for ac_func in GetMagickResourceLimit GrayscalePseudoClassImage ImagesToBlob ImportImagePixels
4970
4975
  do
4971
4976
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
4972
4977
  echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -5070,7 +5075,8 @@ done
5070
5075
 
5071
5076
 
5072
5077
 
5073
- for ac_func in IsColorSimilar NegateImageChannel NormalizeImageChannel
5078
+
5079
+ for ac_func in InheritException InterpretImageAttributes IsColorSimilar NegateImageChannel
5074
5080
  do
5075
5081
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
5076
5082
  echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -5175,7 +5181,7 @@ done
5175
5181
 
5176
5182
 
5177
5183
 
5178
- for ac_func in ParseSizeGeometry PosterizeImage PreviewImage QuantumOperatorRegionImage
5184
+ for ac_func in NormalizeImageChannel ParseSizeGeometry PosterizeImage PreviewImage
5179
5185
  do
5180
5186
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
5181
5187
  echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -5279,7 +5285,7 @@ done
5279
5285
 
5280
5286
 
5281
5287
 
5282
- for ac_func in RadialBlurImage RandomChannelThresholdImage RandomThresholdImageChannel
5288
+ for ac_func in QuantumOperatorRegionImage RadialBlurImage RandomChannelThresholdImage
5283
5289
  do
5284
5290
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
5285
5291
  echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -5383,7 +5389,7 @@ done
5383
5389
 
5384
5390
 
5385
5391
 
5386
- for ac_func in SeparateImageChannel SepiaToneImage SetImageBackgroundColor
5392
+ for ac_func in RandomThresholdImageChannel SeparateImageChannel SepiaToneImage
5387
5393
  do
5388
5394
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
5389
5395
  echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -5487,7 +5493,8 @@ done
5487
5493
 
5488
5494
 
5489
5495
 
5490
- for ac_func in SetImageChannelDepth SetImageColorspace SetImageOption
5496
+
5497
+ for ac_func in SetImageBackgroundColor SetImageChannelDepth SetImageColorspace SetImageOption
5491
5498
  do
5492
5499
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
5493
5500
  echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -7171,9 +7178,9 @@ _ACEOF
7171
7178
 
7172
7179
  fi
7173
7180
 
7174
- echo "$as_me:$LINENO: checking for HSBColorspace enum value" >&5
7175
- echo $ECHO_N "checking for HSBColorspace enum value... $ECHO_C" >&6
7176
- if test "${rm_cv_enum_hsbcolorspace+set}" = set; then
7181
+ echo "$as_me:$LINENO: checking for CineonLogRGBColorspace enum value" >&5
7182
+ echo $ECHO_N "checking for CineonLogRGBColorspace enum value... $ECHO_C" >&6
7183
+ if test "${rm_cv_enum_cineonlogrgbcolorspace+set}" = set; then
7177
7184
  echo $ECHO_N "(cached) $ECHO_C" >&6
7178
7185
  else
7179
7186
  cat >conftest.$ac_ext <<_ACEOF
@@ -7190,7 +7197,7 @@ cat >>conftest.$ac_ext <<_ACEOF
7190
7197
  int
7191
7198
  main ()
7192
7199
  {
7193
- ColorspaceType x; x = HSBColorspace
7200
+ ColorspaceType x; x = CineonLogRGBColorspace
7194
7201
  ;
7195
7202
  return 0;
7196
7203
  }
@@ -7217,28 +7224,28 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7217
7224
  ac_status=$?
7218
7225
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
7219
7226
  (exit $ac_status); }; }; then
7220
- rm_cv_enum_hsbcolorspace='yes'
7227
+ rm_cv_enum_cineonlogrgbcolorspace='yes'
7221
7228
  else
7222
7229
  echo "$as_me: failed program was:" >&5
7223
7230
  sed 's/^/| /' conftest.$ac_ext >&5
7224
7231
 
7225
- rm_cv_enum_hsbcolorspace='no'
7232
+ rm_cv_enum_cineonlogrgbcolorspace='no'
7226
7233
  fi
7227
7234
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
7228
7235
  fi
7229
- echo "$as_me:$LINENO: result: $rm_cv_enum_hsbcolorspace" >&5
7230
- echo "${ECHO_T}$rm_cv_enum_hsbcolorspace" >&6
7236
+ echo "$as_me:$LINENO: result: $rm_cv_enum_cineonlogrgbcolorspace" >&5
7237
+ echo "${ECHO_T}$rm_cv_enum_cineonlogrgbcolorspace" >&6
7231
7238
 
7232
- if test "$rm_cv_enum_hsbcolorspace" = yes; then
7239
+ if test "$rm_cv_enum_cineonlogrgbcolorspace" = yes; then
7233
7240
  cat >>confdefs.h <<\_ACEOF
7234
- #define HAVE_HSBCOLORSPACE 1
7241
+ #define HAVE_CINEONLOGRGBCOLORSPACE 1
7235
7242
  _ACEOF
7236
7243
 
7237
7244
  fi
7238
7245
 
7239
- echo "$as_me:$LINENO: checking for CineonLogRGBColorspace enum value" >&5
7240
- echo $ECHO_N "checking for CineonLogRGBColorspace enum value... $ECHO_C" >&6
7241
- if test "${rm_cv_enum_cineonlogrgbcolorspace+set}" = set; then
7246
+ echo "$as_me:$LINENO: checking for HSBColorspace enum value" >&5
7247
+ echo $ECHO_N "checking for HSBColorspace enum value... $ECHO_C" >&6
7248
+ if test "${rm_cv_enum_hsbcolorspace+set}" = set; then
7242
7249
  echo $ECHO_N "(cached) $ECHO_C" >&6
7243
7250
  else
7244
7251
  cat >conftest.$ac_ext <<_ACEOF
@@ -7255,7 +7262,7 @@ cat >>conftest.$ac_ext <<_ACEOF
7255
7262
  int
7256
7263
  main ()
7257
7264
  {
7258
- ColorspaceType x; x = CineonLogRGBColorspace
7265
+ ColorspaceType x; x = HSBColorspace
7259
7266
  ;
7260
7267
  return 0;
7261
7268
  }
@@ -7282,21 +7289,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7282
7289
  ac_status=$?
7283
7290
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
7284
7291
  (exit $ac_status); }; }; then
7285
- rm_cv_enum_cineonlogrgbcolorspace='yes'
7292
+ rm_cv_enum_hsbcolorspace='yes'
7286
7293
  else
7287
7294
  echo "$as_me: failed program was:" >&5
7288
7295
  sed 's/^/| /' conftest.$ac_ext >&5
7289
7296
 
7290
- rm_cv_enum_cineonlogrgbcolorspace='no'
7297
+ rm_cv_enum_hsbcolorspace='no'
7291
7298
  fi
7292
7299
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
7293
7300
  fi
7294
- echo "$as_me:$LINENO: result: $rm_cv_enum_cineonlogrgbcolorspace" >&5
7295
- echo "${ECHO_T}$rm_cv_enum_cineonlogrgbcolorspace" >&6
7301
+ echo "$as_me:$LINENO: result: $rm_cv_enum_hsbcolorspace" >&5
7302
+ echo "${ECHO_T}$rm_cv_enum_hsbcolorspace" >&6
7296
7303
 
7297
- if test "$rm_cv_enum_cineonlogrgbcolorspace" = yes; then
7304
+ if test "$rm_cv_enum_hsbcolorspace" = yes; then
7298
7305
  cat >>confdefs.h <<\_ACEOF
7299
- #define HAVE_CINEONLOGRGBCOLORSPACE 1
7306
+ #define HAVE_HSBCOLORSPACE 1
7300
7307
  _ACEOF
7301
7308
 
7302
7309
  fi
@@ -7691,7 +7698,6 @@ _ACEOF
7691
7698
 
7692
7699
  fi
7693
7700
 
7694
-
7695
7701
  echo "$as_me:$LINENO: checking for CopyCyanCompositeOp enum value" >&5
7696
7702
  echo $ECHO_N "checking for CopyCyanCompositeOp enum value... $ECHO_C" >&6
7697
7703
  if test "${rm_cv_enum_copycyancompositeop+set}" = set; then
@@ -8407,6 +8413,70 @@ _ACEOF
8407
8413
 
8408
8414
  fi
8409
8415
 
8416
+ echo "$as_me:$LINENO: checking for CoalesceLayer enum value" >&5
8417
+ echo $ECHO_N "checking for CoalesceLayer enum value... $ECHO_C" >&6
8418
+ if test "${rm_cv_enum_coalescelayer+set}" = set; then
8419
+ echo $ECHO_N "(cached) $ECHO_C" >&6
8420
+ else
8421
+ cat >conftest.$ac_ext <<_ACEOF
8422
+ /* confdefs.h. */
8423
+ _ACEOF
8424
+ cat confdefs.h >>conftest.$ac_ext
8425
+ cat >>conftest.$ac_ext <<_ACEOF
8426
+ /* end confdefs.h. */
8427
+ #include <stdio.h>
8428
+ #if HAVE_SYS_TYPES_H
8429
+ #include <sys/types.h>
8430
+ #endif
8431
+ #include "magick/api.h"
8432
+ int
8433
+ main ()
8434
+ {
8435
+ MagickLayerMethod x; x = CoalesceLayer
8436
+ ;
8437
+ return 0;
8438
+ }
8439
+ _ACEOF
8440
+ rm -f conftest.$ac_objext
8441
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8442
+ (eval $ac_compile) 2>conftest.er1
8443
+ ac_status=$?
8444
+ grep -v '^ *+' conftest.er1 >conftest.err
8445
+ rm -f conftest.er1
8446
+ cat conftest.err >&5
8447
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8448
+ (exit $ac_status); } &&
8449
+ { ac_try='test -z "$ac_c_werror_flag"
8450
+ || test ! -s conftest.err'
8451
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8452
+ (eval $ac_try) 2>&5
8453
+ ac_status=$?
8454
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8455
+ (exit $ac_status); }; } &&
8456
+ { ac_try='test -s conftest.$ac_objext'
8457
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8458
+ (eval $ac_try) 2>&5
8459
+ ac_status=$?
8460
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8461
+ (exit $ac_status); }; }; then
8462
+ rm_cv_enum_coalescelayer='yes'
8463
+ else
8464
+ echo "$as_me: failed program was:" >&5
8465
+ sed 's/^/| /' conftest.$ac_ext >&5
8466
+
8467
+ rm_cv_enum_coalescelayer='no'
8468
+ fi
8469
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
8470
+ fi
8471
+ echo "$as_me:$LINENO: result: $rm_cv_enum_coalescelayer" >&5
8472
+ echo "${ECHO_T}$rm_cv_enum_coalescelayer" >&6
8473
+
8474
+ if test "$rm_cv_enum_coalescelayer" = yes; then
8475
+ cat >>confdefs.h <<\_ACEOF
8476
+ #define HAVE_COALESCELAYER 1
8477
+ _ACEOF
8478
+
8479
+ fi
8410
8480
 
8411
8481
  if test "$rm_have_getimagequantumdepth" = yes; then
8412
8482
  # IM 6.0.5 changed the number of arguments to GetImageQuantumDepth.
@@ -8769,6 +8839,21 @@ if test `eval echo $datadir` != ${prefix}/share; then
8769
8839
  fi
8770
8840
 
8771
8841
 
8842
+ # Check whether --with-ruby-prog or --without-ruby-prog was given.
8843
+ if test "${with_ruby_prog+set}" = set; then
8844
+ withval="$with_ruby_prog"
8845
+ RUBY_CONFIG_OPTS="$RUBY_CONFIG_OPTS --ruby-prog=$withval"
8846
+ RUBY=$withval
8847
+ fi;
8848
+
8849
+
8850
+ # Check whether --with-rbconfig or --without-rbconfig was given.
8851
+ if test "${with_rbconfig+set}" = set; then
8852
+ withval="$with_rbconfig"
8853
+ RUBY_CONFIG_OPTS="$RUBY_CONFIG_OPTS --rbconfig=$withval"
8854
+ fi;
8855
+
8856
+
8772
8857
  # Check whether --with-doc-dir or --without-doc-dir was given.
8773
8858
  if test "${with_doc_dir+set}" = set; then
8774
8859
  withval="$with_doc_dir"
@@ -8818,27 +8903,12 @@ if test "${with_ruby_path+set}" = set; then
8818
8903
  fi;
8819
8904
 
8820
8905
 
8821
- # Check whether --with-ruby-prog or --without-ruby-prog was given.
8822
- if test "${with_ruby_prog+set}" = set; then
8823
- withval="$with_ruby_prog"
8824
- RUBY_CONFIG_OPTS="$RUBY_CONFIG_OPTS --ruby-prog=$withval"
8825
- RUBY=$withval
8826
- fi;
8827
-
8828
-
8829
8906
  # Check whether --with-make-prog or --without-make-prog was given.
8830
8907
  if test "${with_make_prog+set}" = set; then
8831
8908
  withval="$with_make_prog"
8832
8909
  RUBY_CONFIG_OPTS="$RUBY_CONFIG_OPTS --make-prog=$withval"
8833
8910
  fi;
8834
8911
 
8835
-
8836
- # Check whether --with-rbconfig or --without-rbconfig was given.
8837
- if test "${with_rbconfig+set}" = set; then
8838
- withval="$with_rbconfig"
8839
- RUBY_CONFIG_OPTS="$RUBY_CONFIG_OPTS --rbconfig=$withval"
8840
- fi;
8841
-
8842
8912
  # Check whether --enable-without-ext or --disable-without-ext was given.
8843
8913
  if test "${enable_without_ext+set}" = set; then
8844
8914
  enableval="$enable_without_ext"
@@ -8857,6 +8927,14 @@ if test "${enable_allow_example_errors+set}" = set; then
8857
8927
  RUBY_CONFIG_OPTS="$RUBY_CONFIG_OPTS --allow-example-errors"
8858
8928
  fi;
8859
8929
 
8930
+ # Check whether --enable-htmldoc or --disable-htmldoc was given.
8931
+ if test "${enable_htmldoc+set}" = set; then
8932
+ enableval="$enable_htmldoc"
8933
+ if test "$enable_htmldoc" = no; then
8934
+ RUBY_CONFIG_OPTS="$RUBY_CONFIG_OPTS --disable-htmldoc"
8935
+ fi
8936
+ fi;
8937
+
8860
8938
 
8861
8939
  RUBY_VERSION_STRING=`$RUBY --version`
8862
8940
  cat >>confdefs.h <<_ACEOF
@@ -9230,7 +9308,7 @@ _ASBOX
9230
9308
  } >&5
9231
9309
  cat >&5 <<_CSEOF
9232
9310
 
9233
- This file was extended by RMagick $as_me 1.10.1, which was
9311
+ This file was extended by RMagick $as_me 1.11.0, which was
9234
9312
  generated by GNU Autoconf 2.59. Invocation command line was
9235
9313
 
9236
9314
  CONFIG_FILES = $CONFIG_FILES
@@ -9290,7 +9368,7 @@ _ACEOF
9290
9368
 
9291
9369
  cat >>$CONFIG_STATUS <<_ACEOF
9292
9370
  ac_cs_version="\\
9293
- RMagick config.status 1.10.1
9371
+ RMagick config.status 1.11.0
9294
9372
  configured by $0, generated by GNU Autoconf 2.59,
9295
9373
  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
9296
9374