Add https delegate back, but comment it out
diff --git a/config/delegates.xml.in b/config/delegates.xml.in
index 2820a79..753e901 100644
--- a/config/delegates.xml.in
+++ b/config/delegates.xml.in
@@ -71,6 +71,9 @@
<delegate decode="browse" stealth="True" spawn="True" command=""@BrowseDelegate@" http://www.imagemagick.org/; @RMDelegate@ "%i""/>
<delegate decode="cdr" command=""@UniconvertorDelegate@" "%i" "%o.svg"; @MVDelegate@ "%o.svg" "%o""/>
<delegate decode="cgm" command=""@UniconvertorDelegate@" "%i" "%o.svg"; @MVDelegate@ "%o.svg" "%o""/>
+ <!--
+ <delegate decode="https" command=""@WWWDecodeDelegate@" -s -k -L -o "%o" "https:%F""/>
+ -->
<delegate decode="doc" command=""@DOCDecodeDelegate@" --convert-to pdf -outdir `dirname "%i"` "%i" 2> "%u"; @MVDelegate@ "%i.pdf" "%o""/>
<delegate decode="docx" command=""@DOCDecodeDelegate@" --convert-to pdf -outdir `dirname "%i"` "%i" 2> "%u"; @MVDelegate@ "%i.pdf" "%o""/>
<delegate decode="dng:decode" command=""@DNGDecodeDelegate@" --silent --create-id=also --out-type=png --out-depth=16 "--output=%u.png" "%i""/>
diff --git a/configure b/configure
index 416286b..57c1858 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.1-4.
+# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.1-3.
#
# Report bugs to <https://github.com/ImageMagick/ImageMagick/issues>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='ImageMagick'
PACKAGE_TARNAME='ImageMagick'
-PACKAGE_VERSION='7.0.1-4'
-PACKAGE_STRING='ImageMagick 7.0.1-4'
+PACKAGE_VERSION='7.0.1-3'
+PACKAGE_STRING='ImageMagick 7.0.1-3'
PACKAGE_BUGREPORT='https://github.com/ImageMagick/ImageMagick/issues'
PACKAGE_URL='http://www.imagemagick.org'
@@ -690,6 +690,7 @@
apple_font_dir
PrintDelegate
XPSDelegate
+WWWDecodeDelegate
WebPEncodeDelegate
WebPDecodeDelegate
UniconvertorDelegate
@@ -720,7 +721,6 @@
DOCDecodeDelegate
DNGDecodeDelegate
BrowseDelegate
-BZIPDelegate
BlenderDecodeDelegate
BPGEncodeDelegate
BPGDecodeDelegate
@@ -1816,7 +1816,7 @@
# 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 7.0.1-4 to adapt to many kinds of systems.
+\`configure' configures ImageMagick 7.0.1-3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1891,7 +1891,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ImageMagick 7.0.1-4:";;
+ short | recursive ) echo "Configuration of ImageMagick 7.0.1-3:";;
esac
cat <<\_ACEOF
@@ -2164,7 +2164,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ImageMagick configure 7.0.1-4
+ImageMagick configure 7.0.1-3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3215,7 +3215,7 @@
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 7.0.1-4, which was
+It was created by ImageMagick $as_me 7.0.1-3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4201,7 +4201,7 @@
# Define the identity of the package.
PACKAGE='ImageMagick'
- VERSION='7.0.1-4'
+ VERSION='7.0.1-3'
cat >>confdefs.h <<_ACEOF
@@ -4511,11 +4511,11 @@
MAGICK_MICRO_VERSION=1
-MAGICK_PATCHLEVEL_VERSION=4
+MAGICK_PATCHLEVEL_VERSION=3
-MAGICK_VERSION=7.0.1-4
+MAGICK_VERSION=7.0.1-3
-MAGICK_GIT_REVISION=18144:1a5fed6:20160509
+MAGICK_GIT_REVISION=18145:f3b5747:20160509
# Substitute library versioning
@@ -34587,7 +34587,6 @@
BPGDecodeDelegateDefault='bpgdec'
BPGEncodeDelegateDefault='bpgenc'
BlenderDecodeDelegateDefault='blender'
-BZIPDelegateDefault='bzip2'
BrowseDelegateDefault='xdg-open'
DNGDecodeDelegateDefault='ufraw-batch'
DOCDecodeDelegateDefault='soffice'
@@ -34624,6 +34623,7 @@
UniconvertorDelegateDefault='uniconvertor'
WebPDecodeDelegateDefault='dwebp'
WebPEncodeDelegateDefault='cwebp'
+WWWDecodeDelegateDefault='curl'
XPSDelegateDefault='gxps'
# Search for delegates
@@ -34750,47 +34750,6 @@
fi
-# Extract the first word of ""$BZIPDelegateDefault"", so it can be a program name with args.
-set dummy "$BZIPDelegateDefault"; 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_BZIPDelegate+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $BZIPDelegate in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_BZIPDelegate="$BZIPDelegate" # 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_BZIPDelegate="$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_BZIPDelegate" && ac_cv_path_BZIPDelegate=""$BZIPDelegateDefault""
- ;;
-esac
-fi
-BZIPDelegate=$ac_cv_path_BZIPDelegate
-if test -n "$BZIPDelegate"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZIPDelegate" >&5
-$as_echo "$BZIPDelegate" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
for ac_prog in "$BrowseDelegateDefault" google-chrome firefox konqueror mozilla lynx
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -36119,6 +36078,47 @@
fi
+# Extract the first word of ""$WWWDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$WWWDecodeDelegateDefault"; 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_WWWDecodeDelegate+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $WWWDecodeDelegate in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_WWWDecodeDelegate="$WWWDecodeDelegate" # 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_WWWDecodeDelegate="$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_WWWDecodeDelegate" && ac_cv_path_WWWDecodeDelegate=""$WWWDecodeDelegateDelegateDefault""
+ ;;
+esac
+fi
+WWWDecodeDelegate=$ac_cv_path_WWWDecodeDelegate
+if test -n "$WWWDecodeDelegate"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WWWDecodeDelegate" >&5
+$as_echo "$WWWDecodeDelegate" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
# Extract the first word of ""$XPSDelegateDefault"", so it can be a program name with args.
set dummy "$XPSDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -36319,7 +36319,6 @@
BPGDecodeDelegate="$BPGDecodeDelegateDefault"
BPGEncodeDelegate="$BPGEncodeDelegateDefault"
BlenderDecodeDelegate="$BlenderDecodeDelegateDefault"
- BZIPDelegate="$BZIPDelegateDefault"
BrowseDelegate="$BrowseDelegateDefault"
ConvertDelegate="$ConvertDelegateDefault"
DisplayDelegate="$DisplayDelegateDefault"
@@ -36340,16 +36339,15 @@
MPEGEncodeDelegate="$MPEGEncodeDelegateDefault"
MogrifyDelegate="$MogrifyDelegateDefault"
MrSIDDecodeDelegate="$MrSIDDecodeDelegateDefault"
- MVDelegate="$MVDelegateDefault"
PCLDelegate="$PCLDelegateDefault"
PSDelegate="$PSDelegateDefault"
- RMDelegate="$RMDelegateDefault"
RSVGDecodeDelegate="$RSVGDecodeDelegateDefault"
SVGDecodeDelegate="$SVGDecodeDelegateDefault"
ShowImageDelegate="$ShowImageDelegateDefault"
UniconvertorDelegate="$UniconvertorDelegateDefault"
WebPDecodeDelegate="$WebPDecodeDelegateDefault"
WebPEncodeDelegate="$WebPEncodeDelegateDefault"
+ WWWDecodeDelegate="$WWWDecodeDelegateDefault"
XPSDelegate="$XPSDelegateDefault"
fi
@@ -36383,8 +36381,6 @@
-
-
#
# RPM support.
#
@@ -38142,7 +38138,7 @@
# 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 7.0.1-4, which was
+This file was extended by ImageMagick $as_me 7.0.1-3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -38209,7 +38205,7 @@
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 7.0.1-4
+ImageMagick config.status 7.0.1-3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index abc4d1f..620409c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@
m4_define([magick_major_version], [7])
m4_define([magick_minor_version], [0])
m4_define([magick_micro_version], [1])
-m4_define([magick_patchlevel_version], [4])
+m4_define([magick_patchlevel_version], [3])
m4_define([magick_version],
[magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version])
m4_define([magick_git_revision], esyscmd([sh -c "(gitversion .) | tr -d '\n'"]))
@@ -3018,7 +3018,6 @@
BPGDecodeDelegateDefault='bpgdec'
BPGEncodeDelegateDefault='bpgenc'
BlenderDecodeDelegateDefault='blender'
-BZIPDelegateDefault='bzip2'
BrowseDelegateDefault='xdg-open'
DNGDecodeDelegateDefault='ufraw-batch'
DOCDecodeDelegateDefault='soffice'
@@ -3055,13 +3054,13 @@
UniconvertorDelegateDefault='uniconvertor'
WebPDecodeDelegateDefault='dwebp'
WebPEncodeDelegateDefault='cwebp'
+WWWDecodeDelegateDefault='curl'
XPSDelegateDefault='gxps'
# Search for delegates
AC_PATH_PROG(BPGDecodeDelegate, "$BPGDecodeDelegateDefault", "$BPGDecodeDelegateDefault")
AC_PATH_PROG(BPGEncodeDelegate, "$BPGEncodeDelegateDefault", "$BPGEncodeDelegateDefault")
AC_PATH_PROG(BlenderDecodeDelegate, "$BlenderDecodeDelegateDefault", "$BlenderDecodeDelegateDefault")
-AC_PATH_PROG(BZIPDelegate, "$BZIPDelegateDefault", "$BZIPDelegateDefault")
AC_PATH_PROGS(BrowseDelegate, "$BrowseDelegateDefault" google-chrome firefox konqueror mozilla lynx, "$BrowseDelegateDefault")
AC_PATH_PROG(DNGDecodeDelegate, "$DNGDecodeDelegateDefault", "$DNGDecodeDelegateDefault")
AC_PATH_PROG(DOCDecodeDelegate, "$DOCDecodeDelegateDefault", "$DOCDecodeDelegateDefault")
@@ -3100,6 +3099,7 @@
AC_PATH_PROG(UniconvertorDelegate, "$UniconvertorDelegateDefault", "$UniconvertorDelegateDefault")
AC_PATH_PROG(WebPDecodeDelegate, "$WebPDecodeDelegateDefault", "$WebPDecodeDelegateDefault")
AC_PATH_PROG(WebPEncodeDelegate, "$WebPEncodeDelegateDefault", "$WebPEncodeDelegateDefault")
+AC_PATH_PROG(WWWDecodeDelegate, "$WWWDecodeDelegateDefault", "$WWWDecodeDelegateDelegateDefault")
AC_PATH_PROG(XPSDelegate, "$XPSDelegateDefault", "$XPSDelegateDefault")
# Prefer lpr to lp; lp needs options tacked on.
@@ -3248,7 +3248,6 @@
BPGDecodeDelegate="$BPGDecodeDelegateDefault"
BPGEncodeDelegate="$BPGEncodeDelegateDefault"
BlenderDecodeDelegate="$BlenderDecodeDelegateDefault"
- BZIPDelegate="$BZIPDelegateDefault"
BrowseDelegate="$BrowseDelegateDefault"
ConvertDelegate="$ConvertDelegateDefault"
DisplayDelegate="$DisplayDelegateDefault"
@@ -3269,16 +3268,15 @@
MPEGEncodeDelegate="$MPEGEncodeDelegateDefault"
MogrifyDelegate="$MogrifyDelegateDefault"
MrSIDDecodeDelegate="$MrSIDDecodeDelegateDefault"
- MVDelegate="$MVDelegateDefault"
PCLDelegate="$PCLDelegateDefault"
PSDelegate="$PSDelegateDefault"
- RMDelegate="$RMDelegateDefault"
RSVGDecodeDelegate="$RSVGDecodeDelegateDefault"
SVGDecodeDelegate="$SVGDecodeDelegateDefault"
ShowImageDelegate="$ShowImageDelegateDefault"
UniconvertorDelegate="$UniconvertorDelegateDefault"
WebPDecodeDelegate="$WebPDecodeDelegateDefault"
WebPEncodeDelegate="$WebPEncodeDelegateDefault"
+ WWWDecodeDelegate="$WWWDecodeDelegateDefault"
XPSDelegate="$XPSDelegateDefault"
fi
@@ -3286,7 +3284,6 @@
AC_SUBST(BPGDecodeDelegate)
AC_SUBST(BPGEncodeDelegate)
AC_SUBST(BlenderDecodeDelegate)
-AC_SUBST(BZIPDelegate)
AC_SUBST(BrowseDelegate)
AC_SUBST(ConvertDelegate)
AC_SUBST(GVCDecodeDelegate)
@@ -3304,14 +3301,13 @@
AC_SUBST(MPEGEncodeDelegate)
AC_SUBST(MogrifyDelegate)
AC_SUBST(MrSIDDecodeDelegate)
-AC_SUBST(MVDelegate)
AC_SUBST(PCLDelegate)
AC_SUBST(PSDelegate)
-AC_SUBST(RMDelegate)
AC_SUBST(ShowImageDelegate)
AC_SUBST(UniconvertorDelegate)
AC_SUBST(WebPDecodeDelegate)
AC_SUBST(WebPEncodeDelegate)
+AC_SUBST(WWWDecodeDelegate)
AC_SUBST(XPSDelegate)
#
diff --git a/version.sh b/version.sh
index d30add2..c701e02 100644
--- a/version.sh
+++ b/version.sh
@@ -18,7 +18,7 @@
PACKAGE_VERSION='7.0.1'
PACKAGE_PERL_VERSION='7.01'
PACKAGE_LIB_VERSION="0x701"
-PACKAGE_RELEASE="4"
+PACKAGE_RELEASE="3"
PACKAGE_LIB_VERSION_NUMBER="7,0,1,${PACKAGE_RELEASE}"
PACKAGE_RELEASE_DATE_RAW=`date +%F`
PACKAGE_RELEASE_DATE_REPRODUCIBLE="${PACKAGE_CHANGE_DATE}"