(no commit message)

diff --git a/Magick++/lib/libMagick++.map b/Magick++/lib/libMagick++.map
index 85297c9a6d6d291da5d13d49ab19862010f117df..823a45ffaf41878b958c74f4015ef48cc5b5dabe 100644 (file)
--- a/Magick++/lib/libMagick++.map
+++ b/Magick++/lib/libMagick++.map
@@ -1,4 +1,4 @@
- VERS_7.0 {
+ VERS_8.0 {
         global:
                 *;
      };

diff --git a/MagickCore/libMagickCore.map b/MagickCore/libMagickCore.map
index 85297c9a6d6d291da5d13d49ab19862010f117df..823a45ffaf41878b958c74f4015ef48cc5b5dabe 100644 (file)
--- a/MagickCore/libMagickCore.map
+++ b/MagickCore/libMagickCore.map
@@ -1,4 +1,4 @@
- VERS_7.0 {
+ VERS_8.0 {
         global:
                 *;
      };

diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index f0dd43f5d08db23c5a6e57281a6343e2499ab86f..65b76f1f6616d364b8c75774967da1649e8a4d07 100644 (file)
--- a/MagickCore/magick-baseconfig.h
+++ b/MagickCore/magick-baseconfig.h
@@ -30,16 +30,11 @@
 /* Define to 1 if the `closedir' function returns void instead of `int'. */
 /* #undef CLOSEDIR_VOID */
 
-/* "coders subdirectory". */
+/* coders subdirectory. */
 #ifndef MAGICKCORE_CODER_DIRNAME
 #define MAGICKCORE_CODER_DIRNAME "coders"
 #endif
 
-/* Location of coder modules */
-#ifndef MAGICKCORE_CODER_PATH
-#define MAGICKCORE_CODER_PATH "/usr/local/lib/ImageMagick-7.0.0/modules-Q16-HDRI/coders"
-#endif
-
 /* Directory where architecture-dependent configuration files live. */
 #ifndef MAGICKCORE_CONFIGURE_PATH
 #define MAGICKCORE_CONFIGURE_PATH "/usr/local/etc/ImageMagick/"
@@ -77,16 +72,11 @@
 #define MAGICKCORE_FFTW_DELEGATE 1
 #endif
 
-/* "filter subdirectory". */
+/* filter subdirectory. */
 #ifndef MAGICKCORE_FILTER_DIRNAME
 #define MAGICKCORE_FILTER_DIRNAME "filters"
 #endif
 
-/* Location of filter modules */
-#ifndef MAGICKCORE_FILTER_PATH
-#define MAGICKCORE_FILTER_PATH ""
-#endif
-
 /* Define if you have FONTCONFIG library */
 #ifndef MAGICKCORE_FONTCONFIG_DELEGATE
 #define MAGICKCORE_FONTCONFIG_DELEGATE 1
@@ -1118,7 +1108,7 @@
 #endif
 
 /* Subdirectory of lib where ImageMagick architecture dependent files are
-   installed */
+   installed. */
 #ifndef MAGICKCORE_LIBRARY_RELATIVE_PATH
 #define MAGICKCORE_LIBRARY_RELATIVE_PATH "ImageMagick-7.0.0"
 #endif
@@ -1165,7 +1155,7 @@
 
 /* Module directory dirname */
 #ifndef MAGICKCORE_MODULES_DIRNAME
-#define MAGICKCORE_MODULES_DIRNAME "modules-Q16-HDRI"
+#define MAGICKCORE_MODULES_DIRNAME ""
 #endif
 
 /* Magick API method prefix */

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 4e9e9661f0cb8168aadd3d7d9ba0e2cf9b059393..8dff4832f26dba38e196a2d6c10ffd2ed9619185 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -39,7 +39,7 @@ extern "C" {
 #ifndef MAGICKCORE_HDRI_SUPPORT
 #define MAGICKCORE_ABI_SUFFIX  "Q" MAGICKCORE_STRING_XQUOTE(MAGICKCORE_QUANTUM_DEPTH)
 #else 
-#define MAGICKCORE_ABI_SUFFIX "Q" MAGICKCORE_STRING_XQUOTE(MAGICKCORE_QUANTUM_DEPTH) "-HDRI"
+#define MAGICKCORE_ABI_SUFFIX "Q" MAGICKCORE_STRING_XQUOTE(MAGICKCORE_QUANTUM_DEPTH) "HDRI"
 #endif 
 
 /* some path game */

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 3941d044999bf08658de75079055f7b55681f801..c15409cd639e225db51ebdbdd0c70fbd3a8b468a 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "10080M"
+#define MagickSVNRevision  "10080:10088M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  8,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  8
 #define MagickLibMinInterface  8
-#define MagickReleaseDate  "2012-12-01"
+#define MagickReleaseDate  "2012-12-02"
 #define MagickChangeDate   "20121005"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/MagickWand/libMagickWand.map b/MagickWand/libMagickWand.map
index 85297c9a6d6d291da5d13d49ab19862010f117df..823a45ffaf41878b958c74f4015ef48cc5b5dabe 100644 (file)
--- a/MagickWand/libMagickWand.map
+++ b/MagickWand/libMagickWand.map
@@ -1,4 +1,4 @@
- VERS_7.0 {
+ VERS_8.0 {
         global:
                 *;
      };

diff --git a/Makefile.in b/Makefile.in
index b1cfa0adab7eace06f9f57c4fb3f98126f94a377..9179332159672aed73bdb61e36ebbb1c878882b9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2452,6 +2452,7 @@ distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
+ABI_SUFFIX = @ABI_SUFFIX@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -2592,7 +2593,6 @@ LZMA_CFLAGS = @LZMA_CFLAGS@
 LZMA_LIBS = @LZMA_LIBS@
 LaunchDelegate = @LaunchDelegate@
 MAGICKCORE_PATH = @MAGICKCORE_PATH@
-MAGICK_ABI_SUFFIX = @MAGICK_ABI_SUFFIX@
 MAGICK_CFLAGS = @MAGICK_CFLAGS@
 MAGICK_CODER_MODULE_PATH = @MAGICK_CODER_MODULE_PATH@
 MAGICK_CONFIGURE_BUILD_PATH = @MAGICK_CONFIGURE_BUILD_PATH@

diff --git a/config/config.h.in b/config/config.h.in
index dfa383c82156f57f14f3b3e793ef0dbcb3ec6c24..6446cba8a903cf3c0ced9c3d9e1abe1371dff465 100644 (file)
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -21,12 +21,9 @@
 /* Define to 1 if the `closedir' function returns void instead of `int'. */
 #undef CLOSEDIR_VOID
 
-/* "coders subdirectory". */
+/* coders subdirectory. */
 #undef CODER_DIRNAME
 
-/* Location of coder modules */
-#undef CODER_PATH
-
 /* Directory where architecture-dependent configuration files live. */
 #undef CONFIGURE_PATH
 
@@ -52,12 +49,9 @@
 /* Define if you have FFTW library */
 #undef FFTW_DELEGATE
 
-/* "filter subdirectory". */
+/* filter subdirectory. */
 #undef FILTER_DIRNAME
 
-/* Location of filter modules */
-#undef FILTER_PATH
-
 /* Define if you have FONTCONFIG library */
 #undef FONTCONFIG_DELEGATE
 
@@ -731,7 +725,7 @@
 #undef LIBRARY_PATH
 
 /* Subdirectory of lib where ImageMagick architecture dependent files are
-   installed */
+   installed. */
 #undef LIBRARY_RELATIVE_PATH
 
 /* Define if you have LQR library */

diff --git a/configure b/configure
index caa2e70985222e8e1bd29ac27c5f2d3d5ad00fe9..5a335c805fdba74d5774c702f28e8641f12c4e61 100755 (executable)
--- a/configure
+++ b/configure
@@ -3646,7 +3646,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=10080:10087
+MAGICK_SVN_REVISION=10080:10088M
 
 
 
@@ -21007,7 +21007,7 @@ _ACEOF
 # define a lib suffix for abi purpose
 ABI_SUFFIX="Q${QUANTUM_DEPTH}"
 if test "$enable_hdri" = 'yes'; then
-  ABI_SUFFIX="Q${QUANTUM_DEPTH}-${MAGICK_HDRI}"
+  ABI_SUFFIX="Q${QUANTUM_DEPTH}${MAGICK_HDRI}"
 fi
 
 
@@ -32012,13 +32012,13 @@ _ACEOF
 
 
 if test "x$MODULES_DIRNAME" = "x"; then
-   MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${ABI_SUFFIX}
-else
 
 cat >>confdefs.h <<_ACEOF
 #define MODULES_DIRNAME "$MODULES_DIRNAME"
 _ACEOF
 
+else
+  MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${ABI_SUFFIX}
 fi
 
 

diff --git a/configure.ac b/configure.ac
index 607a7cea5f9719a8f8b049ebc55abee559d4b9b8..b81027e65cd3cc26ec9f481c50ce955a2fd1576c 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -716,7 +716,7 @@ AC_SUBST(QUANTUM_DEPTH)dnl
 # define a lib suffix for abi purpose
 ABI_SUFFIX="Q${QUANTUM_DEPTH}"
 if test "$enable_hdri" = 'yes'; then
-  ABI_SUFFIX="Q${QUANTUM_DEPTH}-${MAGICK_HDRI}"
+  ABI_SUFFIX="Q${QUANTUM_DEPTH}${MAGICK_HDRI}"
 fi
 AC_SUBST(ABI_SUFFIX)
 
@@ -1289,7 +1289,7 @@ case "${build_os}" in
     X11ConfigurePath=`$WinPathScript "$X11ConfigurePath=" 1`
   ;;
 esac
-AC_DEFINE_UNQUOTED(X11_CONFIGURE_PATH,"$X11ConfigurePath",Location of X11 configure files)
+AC_DEFINE_UNQUOTED(X11_CONFIGURE_PATH,"$X11ConfigurePath",[Location of X11 configure files])
 
 #
 # Find OpenMP library
@@ -2060,7 +2060,7 @@ AC_ARG_WITH([fontpath],
 if test "$with_fontpath" != "yes" && test -z "$with_fontpath"; then
     with_fontpath=''
 else
-    AC_DEFINE_UNQUOTED(MAGICK_FONT_PATH,"$with_fontpath",Define to prepend to default font search path.)
+    AC_DEFINE_UNQUOTED(MAGICK_FONT_PATH,"$with_fontpath",[Define to prepend to default font search path.])
 fi
 if test "$with_fontpath=" != ''; then
     DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-fontpath=$with_fontpath "
@@ -2970,12 +2970,12 @@ case "${build_os}" in
     DEFINE_INCLUDE_PATH=`$WinPathScript "$DEFINE_INCLUDE_PATH" 1`
     ;;
 esac
-AC_DEFINE_UNQUOTED(INCLUDE_PATH,"$DEFINE_INCLUDE_PATH",Directory where ImageMagick headers live.)
+AC_DEFINE_UNQUOTED(INCLUDE_PATH,"$DEFINE_INCLUDE_PATH",[Directory where ImageMagick headers live.])
 AC_SUBST(INCLUDE_PATH)
 
 # Subdirectory under lib to place ImageMagick lib files
 LIBRARY_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
-AC_DEFINE_UNQUOTED(LIBRARY_RELATIVE_PATH,"$LIBRARY_RELATIVE_PATH",Subdirectory of lib where ImageMagick architecture dependent files are installed)
+AC_DEFINE_UNQUOTED(LIBRARY_RELATIVE_PATH,"$LIBRARY_RELATIVE_PATH",[Subdirectory of lib where ImageMagick architecture dependent files are installed.])
 
 # Path to ImageMagick bin directory
 EXECUTABLE_PATH="${BIN_DIR}"
@@ -2985,7 +2985,7 @@ case "${build_os}" in
     DEFINE_EXECUTABLE_PATH=`$WinPathScript "$DEFINE_EXECUTABLE_PATH" 1`
     ;;
 esac
-AC_DEFINE_UNQUOTED(EXECUTABLE_PATH,"$DEFINE_EXECUTABLE_PATH",Directory where executables are installed.)
+AC_DEFINE_UNQUOTED(EXECUTABLE_PATH,"$DEFINE_EXECUTABLE_PATH",[Directory where executables are installed.])
 AC_SUBST(EXECUTABLE_PATH)
 
 # Path to ImageMagick lib
@@ -2996,7 +2996,7 @@ case "${build_os}" in
     DEFINE_LIBRARY_PATH=`$WinPathScript "$DEFINE_LIBRARY_PATH" 1`
     ;;
 esac
-AC_DEFINE_UNQUOTED(LIBRARY_PATH,"$DEFINE_LIBRARY_PATH",Directory where architecture-dependent files live.)
+AC_DEFINE_UNQUOTED(LIBRARY_PATH,"$DEFINE_LIBRARY_PATH",[Directory where architecture-dependent files live.])
 AC_SUBST(LIBRARY_PATH)
 
 #
@@ -3004,13 +3004,13 @@ AC_SUBST(LIBRARY_PATH)
 if test "x$MODULES_BASEDIRNAME" = "x"; then
    MODULES_BASEDIRNAME="modules"
 fi
-AC_DEFINE_UNQUOTED(MODULES_BASEDIRNAME,"$MODULES_BASEDIRNAME",Module directory name without ABI part.)
+AC_DEFINE_UNQUOTED(MODULES_BASEDIRNAME,"$MODULES_BASEDIRNAME",[Module directory name without ABI part.])
 AC_SUBST(MODULES_BASEDIRNAME)
 
 if test "x$MODULES_DIRNAME" = "x"; then
-   MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${ABI_SUFFIX}
+  AC_DEFINE_UNQUOTED(MODULES_DIRNAME,"$MODULES_DIRNAME",[Module directory dirname])
 else
-  AC_DEFINE_UNQUOTED(MODULES_DIRNAME,"$MODULES_DIRNAME",Module directory dirname)
+  MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${ABI_SUFFIX}
 fi
 AC_SUBST(MODULES_DIRNAME)
 
@@ -3024,7 +3024,7 @@ AC_SUBST(MODULES_PATH)
 if test "x$CODER_DIRNAME" = "x"; then
    CODER_DIRNAME="coders"
 fi
-AC_DEFINE_UNQUOTED(CODER_DIRNAME,"$CODER_DIRNAME","coders subdirectory".)
+AC_DEFINE_UNQUOTED(CODER_DIRNAME,"$CODER_DIRNAME",[coders subdirectory.])
 AC_SUBST(CODER_DIRNAME)
 
 CODER_RELATIVE_PATH="${CODER_DIRNAME}"
@@ -3038,7 +3038,7 @@ AC_SUBST(CODER_PATH)
 if test "x$FILTER_DIRNAME" = "x"; then
    FILTER_DIRNAME="filters"
 fi
-AC_DEFINE_UNQUOTED(FILTER_DIRNAME,"$FILTER_DIRNAME","filter subdirectory".)
+AC_DEFINE_UNQUOTED(FILTER_DIRNAME,"$FILTER_DIRNAME",[filter subdirectory.])
 AC_SUBST(FILTER_DIRNAME)
 
 FILTER_RELATIVE_PATH="${FILTER_DIRNAME}"
@@ -3055,12 +3055,12 @@ case "${build_os}" in
     DEFINE_DOCUMENTATION_PATH=`$WinPathScript "$DEFINE_DOCUMENTATION_PATH" 1`
     ;;
 esac
-AC_DEFINE_UNQUOTED(DOCUMENTATION_PATH,"$DEFINE_DOCUMENTATION_PATH",Directory where ImageMagick documents live.)
+AC_DEFINE_UNQUOTED(DOCUMENTATION_PATH,"$DEFINE_DOCUMENTATION_PATH",[Directory where ImageMagick documents live.])
 AC_SUBST(DOCUMENTATION_PATH)
 
 # Subdirectory to place architecture-dependent configuration files
 CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}"
-AC_DEFINE_UNQUOTED(CONFIGURE_RELATIVE_PATH,"$CONFIGURE_RELATIVE_PATH",Subdirectory of lib where architecture-dependent configuration files live.)
+AC_DEFINE_UNQUOTED(CONFIGURE_RELATIVE_PATH,"$CONFIGURE_RELATIVE_PATH",[Subdirectory of lib where architecture-dependent configuration files live.])
 CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
 DEFINE_CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
 case "${build_os}" in
@@ -3068,12 +3068,12 @@ case "${build_os}" in
     DEFINE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_CONFIGURE_PATH" 1`
     ;;
 esac
-AC_DEFINE_UNQUOTED(CONFIGURE_PATH,"$DEFINE_CONFIGURE_PATH",Directory where architecture-dependent configuration files live.)
+AC_DEFINE_UNQUOTED(CONFIGURE_PATH,"$DEFINE_CONFIGURE_PATH",[Directory where architecture-dependent configuration files live.])
 AC_SUBST(CONFIGURE_PATH)
 
 # Subdirectory to place architecture-independent configuration files
 SHARE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}"
-AC_DEFINE_UNQUOTED(SHARE_RELATIVE_PATH,"$SHARE_RELATIVE_PATH",Subdirectory of lib where architecture-independent configuration files live.)
+AC_DEFINE_UNQUOTED(SHARE_RELATIVE_PATH,"$SHARE_RELATIVE_PATH",[Subdirectory of lib where architecture-independent configuration files live.])
 SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}"
 DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/"
 case "${build_os}" in
@@ -3081,12 +3081,12 @@ case "${build_os}" in
     DEFINE_SHARE_PATH=`$WinPathScript "$DEFINE_SHARE_PATH" 1`
     ;;
 esac
-AC_DEFINE_UNQUOTED(SHARE_PATH,"$DEFINE_SHARE_PATH",Directory where architecture-independent configuration files live.)
+AC_DEFINE_UNQUOTED(SHARE_PATH,"$DEFINE_SHARE_PATH",[Directory where architecture-independent configuration files live.])
 AC_SUBST(SHARE_PATH)
 
 # Subdirectory to place architecture-dependent configuration files
 SHAREARCH_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/config"
-AC_DEFINE_UNQUOTED(SHAREARCH_RELATIVE_PATH,"$SHAREARCH_RELATIVE_PATH",Subdirectory of lib where architecture-independent configuration files live.)
+AC_DEFINE_UNQUOTED(SHAREARCH_RELATIVE_PATH,"$SHAREARCH_RELATIVE_PATH",[Subdirectory of lib where architecture-independent configuration files live.])
 SHAREARCH_PATH="${SHAREARCH_DIR}/${SHAREARCH_RELATIVE_PATH}"
 DEFINE_SHAREARCH_PATH="${SHAREARCH_DIR}/${SHAREARCH_RELATIVE_PATH}/"
 case "${build_os}" in
@@ -3094,7 +3094,7 @@ case "${build_os}" in
     DEFINE_SHAREARCH_PATH=`$WinPathScript "$DEFINE_SHAREARCH_PATH" 1`
     ;;
 esac
-AC_DEFINE_UNQUOTED(SHAREARCH_PATH,"$DEFINE_SHAREARCH_PATH",Directory where architecture-independent configuration files live.)
+AC_DEFINE_UNQUOTED(SHAREARCH_PATH,"$DEFINE_SHAREARCH_PATH",[Directory where architecture-independent configuration files live.])
 AC_SUBST(SHAREARCH_PATH)
 
 #