(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index c7e35ac78c4e2bd1fbed627b00ac845ca52b1e83..cef8da0065247396fcf6f77d2d0423fad65bd15d 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  "12854:12879"
+#define MagickSVNRevision  "12854:12892M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
@@ -39,7 +39,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  2
 #define MagickppLibMinInterface  2
-#define MagickReleaseDate  "2013-08-03"
+#define MagickReleaseDate  "2013-08-04"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/Makefile.in b/Makefile.in
index 90083c115a8559c0951bc7f88ba3d321f6159cca..8b9a705ee76b565acaff85f5b857a94eef7619a9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2821,6 +2821,8 @@ WMFDecodeDelegate = @WMFDecodeDelegate@
 WMF_LIBS = @WMF_LIBS@
 WMF_LIBS_DEPS = @WMF_LIBS_DEPS@
 WWWDecodeDelegate = @WWWDecodeDelegate@
+WebPDecodeDelegate = @WebPDecodeDelegate@
+WebPEncodeDelegate = @WebPEncodeDelegate@
 WinPathScript = @WinPathScript@
 X11_LIBS = @X11_LIBS@
 XEXT_LIBS = @XEXT_LIBS@

diff --git a/configure b/configure
index bc482c534e529430c6d9bc05acb973052a0992f9..54e5fb78ff16fabe45a9899a568dbbd9320ca63a 100755 (executable)
--- a/configure
+++ b/configure
@@ -692,6 +692,8 @@ ZipDelegate
 XPSDelegate
 WWWDecodeDelegate
 WMFDecodeDelegate
+WebPEncodeDelegate
+WebPDecodeDelegate
 UniconvertorDelegate
 TXTDelegate
 SVGDecodeDelegate
@@ -3686,7 +3688,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=12854:12879
+MAGICK_SVN_REVISION=12854:12892M
 
 
 # Substitute library versioning
@@ -32449,6 +32451,8 @@ SCANDecodeDelegateDefault='scanimage'
 SVGDecodeDelegateDefault='inkscape'
 TXTDelegateDefault='enscript'
 UniconvertorDelegateDefault='uniconvertor'
+WebPDecodeDelegateDefault='dwebp'
+WebPEncodeDelegateDefault='cwebp'
 WMFDecodeDelegateDefault='wmf2eps'
 WWWDecodeDelegateDefault='curl'
 XPSDelegateDefault='gxps'
@@ -34146,6 +34150,88 @@ $as_echo "no" >&6; }
 fi
 
 
+# Extract the first word of ""$WebPDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$WebPDecodeDelegateDefault"; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_WebPDecodeDelegate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $WebPDecodeDelegate in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_WebPDecodeDelegate="$WebPDecodeDelegate" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_WebPDecodeDelegate="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_WebPDecodeDelegate" && ac_cv_path_WebPDecodeDelegate=""$WebPDecodeDelegateDefault""
+  ;;
+esac
+fi
+WebPDecodeDelegate=$ac_cv_path_WebPDecodeDelegate
+if test -n "$WebPDecodeDelegate"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WebPDecodeDelegate" >&5
+$as_echo "$WebPDecodeDelegate" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of ""$WebPEncodeDelegateDefault"", so it can be a program name with args.
+set dummy "$WebPEncodeDelegateDefault"; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_WebPEncodeDelegate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $WebPEncodeDelegate in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_WebPEncodeDelegate="$WebPEncodeDelegate" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_WebPEncodeDelegate="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_WebPEncodeDelegate" && ac_cv_path_WebPEncodeDelegate=""$WebPEncodeDelegateDefault""
+  ;;
+esac
+fi
+WebPEncodeDelegate=$ac_cv_path_WebPEncodeDelegate
+if test -n "$WebPEncodeDelegate"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WebPEncodeDelegate" >&5
+$as_echo "$WebPEncodeDelegate" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 # Extract the first word of ""$WMFDecodeDelegateDefault"", so it can be a program name with args.
 set dummy "$WMFDecodeDelegateDefault"; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -34482,6 +34568,8 @@ if test "$with_frozenpaths" != 'yes'; then
   ShowImageDelegate="$ShowImageDelegateDefault"
   TXTDelegate="$TXTDelegateDefault"
   UniconvertorDelegate="$UniconvertorDelegateDefault"
+  WebPDecodeDelegate="$WebPDecodeDelegateDefault"
+  WebPEncodeDelegate="$WebPEncodeDelegateDefault"
   WMFDecodeDelegate="$WMFDecodeDelegateDefault"
   WWWDecodeDelegate="$WWWDecodeDelegateDefault"
   XPSDelegate="$XPSDelegateDefault"
@@ -34528,6 +34616,8 @@ fi
 
 
 
+
+
 
 
 

diff --git a/configure.ac b/configure.ac
index 18ccbbe18a6739e39ee7f9e2ab4fd5723175f6b6..22d0ef8270db30571b18fb914a26090597606a12 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -3214,6 +3214,8 @@ SCANDecodeDelegateDefault='scanimage'
 SVGDecodeDelegateDefault='inkscape'
 TXTDelegateDefault='enscript'
 UniconvertorDelegateDefault='uniconvertor'
+WebPDecodeDelegateDefault='dwebp'
+WebPEncodeDelegateDefault='cwebp'
 WMFDecodeDelegateDefault='wmf2eps'
 WWWDecodeDelegateDefault='curl'
 XPSDelegateDefault='gxps'
@@ -3261,6 +3263,8 @@ AC_PATH_PROG(SCANDecodeDelegate, "$SCANDecodeDelegateDefault", "$SCANDecodeDeleg
 AC_PATH_PROG(SVGDecodeDelegate, "$SVGDecodeDelegateDefault", "$SVGDecodeDelegateDefault")
 AC_PATH_PROG(TXTDelegate, "$TXTDelegateDefault", "$TXTDelegateDefault")
 AC_PATH_PROG(UniconvertorDelegate, "$UniconvertorDelegateDefault", "$UniconvertorDelegateDefault")
+AC_PATH_PROG(WebPDecodeDelegate, "$WebPDecodeDelegateDefault", "$WebPDecodeDelegateDefault")
+AC_PATH_PROG(WebPEncodeDelegate, "$WebPEncodeDelegateDefault", "$WebPEncodeDelegateDefault")
 AC_PATH_PROG(WMFDecodeDelegate, "$WMFDecodeDelegateDefault", "$WMFDecodeDelegateDefault")
 AC_PATH_PROG(WWWDecodeDelegate, "$WWWDecodeDelegateDefault", "$WWWDecodeDelegateDefault")
 AC_PATH_PROG(XPSDelegate, "$XPSDelegateDefault", "$XPSDelegateDefault")
@@ -3431,6 +3435,8 @@ if test "$with_frozenpaths" != 'yes'; then
   ShowImageDelegate="$ShowImageDelegateDefault"
   TXTDelegate="$TXTDelegateDefault"
   UniconvertorDelegate="$UniconvertorDelegateDefault"
+  WebPDecodeDelegate="$WebPDecodeDelegateDefault"
+  WebPEncodeDelegate="$WebPEncodeDelegateDefault"
   WMFDecodeDelegate="$WMFDecodeDelegateDefault"
   WWWDecodeDelegate="$WWWDecodeDelegateDefault"
   XPSDelegate="$XPSDelegateDefault"
@@ -3476,6 +3482,8 @@ AC_SUBST(ShowImageDelegate)
 AC_SUBST(TXTDelegate)
 AC_SUBST(UniconvertorDelegate)
 AC_SUBST(WMFDecodeDelegate)
+AC_SUBST(WebPDecodeDelegate)
+AC_SUBST(WebPEncodeDelegate)
 AC_SUBST(WWWDecodeDelegate)
 AC_SUBST(XPSDelegate)
 AC_SUBST(ZipDelegate)