(no commit message)

diff --git a/coders/tiff.c b/coders/tiff.c
index b86caa895ffed04cb28671ff4bed25287a800ea0..f9a3cdcac4900b698af315fbaa4f9ec516e5be2f 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -166,6 +166,7 @@ static const ExifInfo
     { 0, 0, (char *) NULL }
 };
 #endif
+#endif  /* MAGICKCORE_TIFF_DELEGATE */
 \f
 /*
   Global declarations.
@@ -178,7 +179,6 @@ static SemaphoreInfo
 
 static volatile MagickBooleanType
   instantiate_key = MagickFalse;
-#endif
 \f
 /*
   Forward declarations.

diff --git a/config/configure.xml b/config/configure.xml
index c78426b5388c5a5c9daff4ed9b2b0dedfdfe3e78..688f303cd1522e2ab5d3afa2290d4aee6c22b866 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x667"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,7,4"/>
-  <configure name="RELEASE_DATE" value="2011-01-26"/>
+  <configure name="RELEASE_DATE" value="2011-01-29"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index c44aa81aefcd524bda8c00ec3964e5f29752dace..601a9b09f4077f5c529402bf45f87b69807db0fa 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.66 for ImageMagick 6.6.6.
+# Generated by GNU Autoconf 2.66 for ImageMagick 6.6.7.
 #
 # Report bugs to <http://www.imagemagick.org>.
 #
@@ -566,8 +566,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ImageMagick'
 PACKAGE_TARNAME='ImageMagick'
-PACKAGE_VERSION='6.6.6'
-PACKAGE_STRING='ImageMagick 6.6.6'
+PACKAGE_VERSION='6.6.7'
+PACKAGE_STRING='ImageMagick 6.6.7'
 PACKAGE_BUGREPORT='http://www.imagemagick.org'
 PACKAGE_URL=''
 
@@ -1694,7 +1694,7 @@ if test "$ac_init_help" = "long"; then
   # 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 ImageMagick 6.6.6 to adapt to many kinds of systems.
+\`configure' configures ImageMagick 6.6.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1769,7 +1769,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ImageMagick 6.6.6:";;
+     short | recursive ) echo "Configuration of ImageMagick 6.6.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1975,7 +1975,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ImageMagick configure 6.6.6
+ImageMagick configure 6.6.7
 generated by GNU Autoconf 2.66
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2891,7 +2891,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ImageMagick $as_me 6.6.6, which was
+It was created by ImageMagick $as_me 6.6.7, which was
 generated by GNU Autoconf 2.66.  Invocation command line was
 
   $ $0 $@
@@ -33432,7 +33432,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ImageMagick $as_me 6.6.6, which was
+This file was extended by ImageMagick $as_me 6.6.7, which was
 generated by GNU Autoconf 2.66.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -33498,7 +33498,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ImageMagick config.status 6.6.6
+ImageMagick config.status 6.6.7
 configured by $0, generated by GNU Autoconf 2.66,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index d3688300817a33987ec12cb15a62b6e9cba2b42e..7bb3279bd48a1abc597373019f9a8da8b4c5c6a2 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 #  Copyright (C) 2003 - 2008 GraphicsMagick Group
 
 AC_PREREQ(2.64)
-AC_INIT([ImageMagick],[6.6.6],[http://www.imagemagick.org],[ImageMagick])
+AC_INIT([ImageMagick],[6.6.7],[http://www.imagemagick.org],[ImageMagick])
 AC_CONFIG_SRCDIR([magick/MagickCore.h])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/magick/magick-config.h b/magick/magick-config.h
index 0cc7f988021df308dfb8ddd724c056d15efd1cc0..9423687971abe36ee7b87ecf7ef83deba453c331 100644 (file)
--- a/magick/magick-config.h
+++ b/magick/magick-config.h
@@ -1176,7 +1176,7 @@
 
 /* Define to the full name and version of this package. */
 #ifndef MAGICKCORE_PACKAGE_STRING
-#define MAGICKCORE_PACKAGE_STRING "ImageMagick 6.6.6"
+#define MAGICKCORE_PACKAGE_STRING "ImageMagick 6.6.7"
 #endif
 
 /* Define to the one symbol short name of this package. */
@@ -1191,7 +1191,7 @@
 
 /* Define to the version of this package. */
 #ifndef MAGICKCORE_PACKAGE_VERSION
-#define MAGICKCORE_PACKAGE_VERSION "6.6.6"
+#define MAGICKCORE_PACKAGE_VERSION "6.6.7"
 #endif
 
 /* Define if you have PNG library */

diff --git a/magick/version.h b/magick/version.h
index c044fa8ceb78916e786035cba4846fc882ae14e4..cda5b34b19222f0302bd2cfe55394d1801b2c50e 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -33,8 +33,8 @@ extern "C" {
 #define MagickLibAddendum  "-4"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2011-01-26"
-#define MagickChangeDate   "20110125"
+#define MagickReleaseDate  "2011-01-29"
+#define MagickChangeDate   "20110129"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #define MagickOpenMPFeature  "OpenMP "