(no commit message)

diff --git a/ImageMagick.spec.in b/ImageMagick.spec.in
index 99bdd6d9c3c0a498568c93c99e0293c4c9de0459..12b4bcadffb633210d0554edbe9120d292e270ed 100644 (file)
--- a/ImageMagick.spec.in
+++ b/ImageMagick.spec.in
@@ -1,5 +1,6 @@
 %global VERSION  @PACKAGE_VERSION@
 %global MAJOR_VERSION  @MAGICK_MAJOR_VERSION@
+%global MINOR_VERSION  @MAGICK_MINOR_VERSION@
 %global Patchlevel  @PACKAGE_RELEASE@
 
 Name:           @PACKAGE_NAME@
@@ -211,10 +212,10 @@ fi
 %define wordsize 32
 %endif
 
-mv %{buildroot}%{_includedir}/%{name}-%{MAJOR_VERSION}/magick/magick-config.h \
-   %{buildroot}%{_includedir}/%{name}-%{MAJOR_VERSION}/magick/magick-config-%{wordsize}.h
+mv %{buildroot}%{_includedir}/%{name}-%{MAJOR_VERSION}.%{MINOR_VERSION}/magick/magick-config.h \
+   %{buildroot}%{_includedir}/%{name}-%{MAJOR_VERSION}.%{MINOR_VERSION}/magick/magick-config-%{wordsize}.h
 
-cat >%{buildroot}%{_includedir}/%{name}-%{MAJOR_VERSION}/magick/magick-config.h <<EOF
+cat >%{buildroot}%{_includedir}/%{name}-%{MAJOR_VERSION}.%{MINOR_VERSION}/magick/magick-config.h <<EOF
 #ifndef IMAGEMAGICK_MULTILIB
 #define IMAGEMAGICK_MULTILIB
 
@@ -250,11 +251,11 @@ rm -rf %{buildroot}
 %{_libdir}/libMagickWand*so*
 %{_bindir}/[a-z]*
 %{_libdir}/%{name}-%{VERSION}
-%{_datadir}/%{name}-%{VERSION}
+%{_datadir}/%{name}-%{MAJOR_VERSION}.%{MINOR_VERSION}
 %{_mandir}/man[145]/[a-z]*
 %{_mandir}/man1/%{name}.*
 %exclude %{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.*
-%{_sysconfdir}/%{name}-%{MAJOR_VERSION}
+%{_sysconfdir}/%{name}-%{MAJOR_VERSION}.%{MINOR_VERSION}
 
 
 %files devel
@@ -266,9 +267,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/MagickCore*.pc
 %{_libdir}/pkgconfig/ImageMagick*.pc
 %{_libdir}/pkgconfig/MagickWand*.pc
-%dir %{_includedir}/%{name}-%{MAJOR_VERSION}
-%{_includedir}/%{name}-%{MAJOR_VERSION}/MagickCore
-%{_includedir}/%{name}-%{MAJOR_VERSION}/MagickWand
+%dir %{_includedir}/%{name}-%{MAJOR_VERSION}.%{MINOR_VERSION}
+%{_includedir}/%{name}-%{MAJOR_VERSION}.%{MINOR_VERSION}/MagickCore
+%{_includedir}/%{name}-%{MAJOR_VERSION}.%{MINOR_VERSION}/MagickWand
 %{_mandir}/man1/MagickCore-config.*
 %{_mandir}/man1/MagickWand-config.*
 
@@ -291,8 +292,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc Magick++/examples
 %{_bindir}/Magick++-config
-%{_includedir}/%{name}-%{MAJOR_VERSION}/Magick++
-%{_includedir}/%{name}-%{MAJOR_VERSION}/Magick++.h
+%{_includedir}/%{name}-%{MAJOR_VERSION}.%{MINOR_VERSION}/Magick++
+%{_includedir}/%{name}-%{MAJOR_VERSION}.%{MINOR_VERSION}/Magick++.h
 %{_libdir}/libMagick++*so*
 %{_libdir}/pkgconfig/Magick++*.pc
 %{_libdir}/pkgconfig/ImageMagick++*.pc

diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index 1be80049ec1006ab73994b64464aff285b88eb3d..447855539b559f49f6ab360e5fe98507a4f1c95e 100644 (file)
--- a/MagickCore/magick-baseconfig.h
+++ b/MagickCore/magick-baseconfig.h
@@ -37,13 +37,13 @@
 
 /* Directory where architecture-dependent configuration files live. */
 #ifndef MAGICKCORE_CONFIGURE_PATH
-#define MAGICKCORE_CONFIGURE_PATH "/usr/local/etc/ImageMagick-7/"
+#define MAGICKCORE_CONFIGURE_PATH "/usr/local/etc/ImageMagick-7.0/"
 #endif
 
 /* Subdirectory of lib where architecture-dependent configuration files live.
    */
 #ifndef MAGICKCORE_CONFIGURE_RELATIVE_PATH
-#define MAGICKCORE_CONFIGURE_RELATIVE_PATH "ImageMagick-7"
+#define MAGICKCORE_CONFIGURE_RELATIVE_PATH "ImageMagick-7.0"
 #endif
 
 /* Define if you have DJVU library */
@@ -1082,12 +1082,12 @@
 
 /* Directory where ImageMagick architecture headers live. */
 #ifndef MAGICKCORE_INCLUDEARCH_PATH
-#define MAGICKCORE_INCLUDEARCH_PATH "/usr/local/include/ImageMagick-7/"
+#define MAGICKCORE_INCLUDEARCH_PATH "/usr/local/include/ImageMagick-7.0/"
 #endif
 
 /* Directory where ImageMagick headers live. */
 #ifndef MAGICKCORE_INCLUDE_PATH
-#define MAGICKCORE_INCLUDE_PATH "/usr/local/include/ImageMagick-7/"
+#define MAGICKCORE_INCLUDE_PATH "/usr/local/include/ImageMagick-7.0/"
 #endif
 
 /* ImageMagick is formally installed under prefix */
@@ -1274,13 +1274,13 @@
 
 /* Directory where architecture-independent configuration files live. */
 #ifndef MAGICKCORE_SHARE_PATH
-#define MAGICKCORE_SHARE_PATH "/usr/local/share/ImageMagick-7.0.0/"
+#define MAGICKCORE_SHARE_PATH "/usr/local/share/ImageMagick-7.0/"
 #endif
 
 /* Subdirectory of lib where architecture-independent configuration files
    live. */
 #ifndef MAGICKCORE_SHARE_RELATIVE_PATH
-#define MAGICKCORE_SHARE_RELATIVE_PATH "ImageMagick-7.0.0"
+#define MAGICKCORE_SHARE_RELATIVE_PATH "ImageMagick-7.0"
 #endif
 
 /* The size of `double', as computed by sizeof. */

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 3a9260f81f5c39d725863cffce43794aa5af17ef..b1722a7fb670ecdfaa8de3dbb3896b29b1c0a2bb 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision  "11115:11187M"
+#define MagickSVNRevision  "11115:11190M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0

diff --git a/coders/svg.c b/coders/svg.c
index a88614710bbb2f84156191948a014c0298d47a9d..2ef76e51cfc26ce8dbc97d5bac4010f420bd8be5 100644 (file)
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -2744,7 +2744,7 @@ static void SVGExternalSubset(void *context,const xmlChar *name,
   Static declarations.
 */
 static char
-  SVGDensityGeometry[] = "90.0x90.0";
+  SVGDensityGeometry[] = "72.0x72.0";
 \f
 
 static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception)

diff --git a/configure b/configure
index 1b71e2aca5d2649293ffb4730f6b262af849d62e..4e99e325aba5f69329c822f14dbb213deb7acdf7 100755 (executable)
--- a/configure
+++ b/configure
@@ -3671,7 +3671,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=11115:11187M
+MAGICK_SVN_REVISION=11115:11190M
 
 
 # Substitute library versioning
@@ -25986,7 +25986,7 @@ fi
 
 # Assume that delegate headers reside under same directory as ImageMagick
 # installation prefix.
-MAGICK_CPPFLAGS="-I$INCLUDE_DIR/${PACKAGE_NAME}-$MAGICK_MAJOR_VERSION $MAGICK_CPPFLAGS"
+MAGICK_CPPFLAGS="-I$INCLUDE_DIR/${PACKAGE_NAME}-$MAGICK_MAJOR_VERSION.MAGICK_MINOR_VERSION $MAGICK_CPPFLAGS"
 
 #
 # Find the X11 RGB database
@@ -32276,7 +32276,7 @@ fi
 #
 
 # Path to ImageMagick header files
-INCLUDE_RELATIVE_PATH="ImageMagick-${MAGICK_MAJOR_VERSION}"
+INCLUDE_RELATIVE_PATH="ImageMagick-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}"
 INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}"
 DEFINE_INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}/"
 case "${build_os}" in
@@ -32424,7 +32424,7 @@ _ACEOF
 
 
 # Subdirectory to place architecture-dependent configuration files
-CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}"
+CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}"
 
 cat >>confdefs.h <<_ACEOF
 #define CONFIGURE_RELATIVE_PATH "$CONFIGURE_RELATIVE_PATH"
@@ -32445,7 +32445,7 @@ _ACEOF
 
 
 # Subdirectory to place architecture-independent configuration files
-SHARE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}"
+SHARE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}"
 
 cat >>confdefs.h <<_ACEOF
 #define SHARE_RELATIVE_PATH "$SHARE_RELATIVE_PATH"

diff --git a/configure.ac b/configure.ac
index abc1ea6127be57df3cb95e53d3a14df14ba6b918..9f63855b53bcfe377e247b5c56fedb9e0a4750a6 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1268,7 +1268,7 @@ fi
 
 # Assume that delegate headers reside under same directory as ImageMagick
 # installation prefix.
-MAGICK_CPPFLAGS="-I$INCLUDE_DIR/${PACKAGE_NAME}-$MAGICK_MAJOR_VERSION $MAGICK_CPPFLAGS"
+MAGICK_CPPFLAGS="-I$INCLUDE_DIR/${PACKAGE_NAME}-$MAGICK_MAJOR_VERSION.MAGICK_MINOR_VERSION $MAGICK_CPPFLAGS"
 
 #
 # Find the X11 RGB database
@@ -2777,7 +2777,7 @@ if test "$with_webp" != 'no'; then
     failed=0
     passed=0
     AC_CHECK_HEADER(webp/decode.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
-    AC_CHECK_LIB(webp,WebPDecodeRGB,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+    AC_CHECK_LIB(webp,WebPPictureInit,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
     AC_MSG_CHECKING([if WEBP package is complete])
     if test $passed -gt 0; then
         if test $failed -gt 0; then
@@ -2955,7 +2955,7 @@ AC_SUBST(PERLMAINCC)
 #
 
 # Path to ImageMagick header files
-INCLUDE_RELATIVE_PATH="ImageMagick-${MAGICK_MAJOR_VERSION}"
+INCLUDE_RELATIVE_PATH="ImageMagick-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}"
 INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}"
 DEFINE_INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}/"
 case "${build_os}" in
@@ -3063,7 +3063,7 @@ AC_DEFINE_UNQUOTED(DOCUMENTATION_PATH,"$DEFINE_DOCUMENTATION_PATH",[Directory wh
 AC_SUBST(DOCUMENTATION_PATH)
 
 # Subdirectory to place architecture-dependent configuration files
-CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}"
+CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}"
 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}/"
@@ -3076,7 +3076,7 @@ AC_DEFINE_UNQUOTED(CONFIGURE_PATH,"$DEFINE_CONFIGURE_PATH",[Directory where arch
 AC_SUBST(CONFIGURE_PATH)
 
 # Subdirectory to place architecture-independent configuration files
-SHARE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}"
+SHARE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}.${MAGICK_MINOR_VERSION}"
 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}/"