Sanitize input filename for http / https delegates

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 0325c2a05c3f03ebe856d38f042036413b53e511..58635959442327a3eb0001c5bf17a07773656b42 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -2382,7 +2382,7 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info,
     case 'i': /* Filename last used for an image (read or write) */
     {
       WarnNoImageReturn("\"%%%c\"",letter);
-      string=image->magick_filename;
+      string=image->filename;
       break;
     }
     case 'k': /* Number of unique colors  */
@@ -2529,6 +2529,27 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info,
         (ssize_t) image->dispose);
       break;
     }
+    case 'F': /* Magick filename (sanitized) - filename given incl. coder & read mods */
+    {
+      const char
+        *q;
+
+      register char
+        *p;
+
+      static char
+        whitelist[] =
+          "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_- "
+          ".@&;<>()/\\\'\":%=~`";
+
+      WarnNoImageReturn("\"%%%c\"",letter);
+      (void) CopyMagickString(value,image->magick_filename,MagickPathExtent);
+      p=value;
+      q=value+strlen(value);
+      for (p+=strspn(p,whitelist); p != q; p+=strspn(p,whitelist))
+        *p='_';
+      break;
+    }
     case 'G': /* Image size as geometry = "%wx%h" */
     {
       WarnNoImageReturn("\"%%%c\"",letter);

diff --git a/Makefile.in b/Makefile.in
index dc288171c0a97f397bca47cecf93293f17f11dca..7132eb487237d4f8b29a389d751336dbbb7d0eb0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2493,9 +2493,9 @@ AUTOTRACE_CFLAGS = @AUTOTRACE_CFLAGS@
 AUTOTRACE_LIBS = @AUTOTRACE_LIBS@
 AWK = @AWK@
 AutotraceDecodeDelegate = @AutotraceDecodeDelegate@
-BGPDecodeDelegate = @BGPDecodeDelegate@
-BGPEncodeDelegate = @BGPEncodeDelegate@
 BIN_DIR = @BIN_DIR@
+BPGDecodeDelegate = @BPGDecodeDelegate@
+BPGEncodeDelegate = @BPGEncodeDelegate@
 BZIPDelegate = @BZIPDelegate@
 BZLIB_LIBS = @BZLIB_LIBS@
 BlenderDecodeDelegate = @BlenderDecodeDelegate@

diff --git a/PerlMagick/quantum/quantum.pm b/PerlMagick/quantum/quantum.pm
index 4e9aa935cce699fcc17ff1ed53c2dadeb8b2df1a..6d7ce290052574a95e0a389d830974c368637f16 100644 (file)
--- a/PerlMagick/quantum/quantum.pm
+++ b/PerlMagick/quantum/quantum.pm
@@ -43,7 +43,7 @@ require AutoLoader;
       ConfigureError FatalErrorException
     );
 
-$VERSION = '7.00';
+$VERSION = '7.01';
 
 sub AUTOLOAD {
     # This AUTOLOAD is used to 'autoload' constants from the constant()

diff --git a/config/delegates.xml.in b/config/delegates.xml.in
index 1745704df3157421254251c94f6e8d9145d33bf3..ecf0a5eb828bad9ba1b9e33e43479fea5843a796 100644 (file)
--- a/config/delegates.xml.in
+++ b/config/delegates.xml.in
@@ -55,6 +55,7 @@
     %w  image columns (width)
     %x  input image x resolution
     %y  input image y resolution
+    %F  sanitized original input filename
 
   Set option delegate:bimodal=true to process bimodal delegates otherwise they
   are ignored.
@@ -75,8 +76,8 @@
   <delegate decode="browse" stealth="True" spawn="True" command="&quot;@BrowseDelegate@&quot; http://www.imagemagick.org/; rm &quot;%i&quot;"/>
   <delegate decode="cdr" command="&quot;@UniconvertorDelegate@&quot; &quot;%i&quot; &quot;%o.svg&quot;; mv &quot;%o.svg&quot; &quot;%o&quot;"/>
   <delegate decode="cgm" command="&quot;@UniconvertorDelegate@&quot; &quot;%i&quot; &quot;%o.svg&quot;; mv &quot;%o.svg&quot; &quot;%o&quot;"/>
-  <delegate decode="doc" command="&quot;@DOCDecodeDelegate@&quot; --headless --convert-to pdf &quot;%i&quot; 2&gt; &quot;%u&quot;; mv `basename &quot;%i&quot; doc`pdf &quot;%o&quot;"/>
-  <delegate decode="docx" command="&quot;@DOCDecodeDelegate@&quot; --headless --convert-to pdf &quot;%i&quot; 2&gt; &quot;%u&quot;; mv `basename &quot;%i&quot; docx`pdf &quot;%o&quot;"/>
+  <delegate decode="doc" command="&quot;@DOCDecodeDelegate@&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
+  <delegate decode="docx" command="&quot;@DOCDecodeDelegate@&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
   <delegate decode="dng:decode" command="&quot;@DNGDecodeDelegate@&quot; --silent --create-id=also --out-type=png --out-depth=16 &quot;--output=%u.png&quot; &quot;%i&quot;"/>
   <delegate decode="dot" command='&quot;@GVCDecodeDelegate@&quot; -Tsvg &quot;%i&quot; -o &quot;%o&quot;' />
   <delegate decode="dvi" command="&quot;@DVIDecodeDelegate@&quot; -q -o &quot;%o&quot; &quot;%i&quot;"/>
@@ -89,14 +90,14 @@
   <delegate decode="hpgl" command="&quot;@HPGLDecodeDelegate@&quot; -q -m eps -f `basename &quot;%o&quot;` &quot;%i&quot;;     mv -f `basename &quot;%o&quot;` &quot;%o&quot;"/>
   <delegate decode="htm" command="&quot;@HTMLDecodeDelegate@&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
   <delegate decode="html" command="&quot;@HTMLDecodeDelegate@&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
-  <delegate decode="https" command="&quot;@WWWDecodeDelegate@&quot; -s -k -L -o &quot;%o&quot; &quot;https:%M&quot;"/>
+  <delegate decode="https" command="&quot;@WWWDecodeDelegate@&quot; -s -k -L -o &quot;%o&quot; &quot;https:%F&quot;"/>
   <delegate decode="ilbm" command="&quot;@ILBMDecodeDelegate@&quot; &quot;%i&quot; &gt; &quot;%o&quot;"/>
   <delegate decode="jxr" command="mv &quot;%i&quot; &quot;%i.jxr&quot;; &quot;@JXRDecodeDelegate@&quot; -i &quot;%i.jxr&quot; -o &quot;%o.pnm&quot;; mv &quot;%i.jxr&quot; &quot;%i&quot;; mv &quot;%o.pnm&quot; &quot;%o&quot;"/>
   <delegate decode="man" command="&quot;@MANDelegate@&quot; -man -Tps &quot;%i&quot; &gt; &quot;%o&quot;"/>
-  <delegate decode="miff" encode="show" spawn="True" command="&quot;@DisplayDelegate@&quot; -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
+  <delegate decode="miff" encode="show" spawn="True" command="&quot;@DisplayDelegate@&quot; -delay 0 -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
   <delegate decode="miff" encode="win" stealth="True" spawn="True" command="&quot;@DisplayDelegate@&quot; -immutable -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
   <delegate decode="mpeg:decode" command="&quot;@MPEGDecodeDelegate@&quot; -nostdin -v -1 -i &quot;%i&quot; -vframes %S -vcodec pam -an -f rawvideo -y &quot;%u.pam&quot; 2&gt; &quot;%u&quot;"/>
-  <delegate decode="odt" command="&quot;@DOCDecodeDelegate@&quot; --headless --convert-to pdf &quot;%i&quot; 2&gt; &quot;%u&quot;; mv `basename &quot;%i&quot; odt`pdf &quot;%o&quot;"/>
+  <delegate decode="odt" command="&quot;@DOCDecodeDelegate@&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
   <delegate decode="pcl:cmyk" stealth="True" command="&quot;@PCLDelegate@&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=@PCLCMYKDevice@&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
   <delegate decode="pcl:color" stealth="True" command="&quot;@PCLDelegate@&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=@PCLColorDevice@&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
   <delegate decode="pcl:mono" stealth="True" command="&quot;@PCLDelegate@&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=@PCLMonoDevice@&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
@@ -108,8 +109,8 @@
   <delegate decode="bmp" encode="jxr" command="mv &quot;%i&quot; &quot;%i.bmp&quot;; &quot;@JXREncodeDelegate@&quot; -i &quot;%i.bmp&quot; -o &quot;%o.jxr&quot;; mv &quot;%i.bmp&quot; &quot;%i&quot;; mv &quot;%o.jxr&quot; &quot;%o&quot;"/>
   <delegate decode="bmp" encode="wdp" command="mv &quot;%i&quot; &quot;%i.bmp&quot;; &quot;@JXREncodeDelegate@&quot; -i &quot;%i.bmp&quot; -o &quot;%o.jxr&quot;; mv &quot;%i.bmp&quot; &quot;%i&quot;; mv &quot;%o.jxr&quot; &quot;%o&quot;"/>
   <delegate decode="pov" command="&quot;@POVDelegate@&quot; &quot;+i%i&quot; -D0 &quot;+o%o&quot; +fn%q +w%w +h%h +a -q9 &quot;-kfi%s&quot; &quot;-kff%n&quot;;&quot;@ConvertDelegate@&quot; -concatenate &quot;%o*.png&quot; &quot;%o&quot;"/>
-  <delegate decode="ppt" command="&quot;@DOCDecodeDelegate@&quot; --headless --convert-to pdf &quot;%i&quot; 2&gt; &quot;%u&quot;; mv `basename &quot;%i&quot; ppt`pdf &quot;%o&quot;"/>
-  <delegate decode="pptx" command="&quot;@DOCDecodeDelegate@&quot; --headless --convert-to pdf &quot;%i&quot; 2&gt; &quot;%u&quot;; mv `basename &quot;%i&quot; pptx`pdf &quot;%o&quot;"/>
+  <delegate decode="ppt" command="&quot;@DOCDecodeDelegate@&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
+  <delegate decode="pptx" command="&quot;@DOCDecodeDelegate@&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
   <delegate decode="ps:alpha" stealth="True" command="&quot;@PSDelegate@&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=@GSAlphaDevice@&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;-f%s&quot; &quot;-f%s&quot;"/>
   <delegate decode="ps:cmyk" stealth="True" command="&quot;@PSDelegate@&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=@GSCMYKDevice@&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;-f%s&quot; &quot;-f%s&quot;"/>
   <delegate decode="ps:color" stealth="True" command="&quot;@PSDelegate@&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=@GSColorDevice@&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;-f%s&quot; &quot;-f%s&quot;"/>
@@ -129,10 +130,10 @@
   <delegate decode="wdp" command="mv &quot;%i&quot; &quot;%i.jxr&quot;; &quot;@JXRDecodeDelegate@&quot; -i &quot;%i.jxr&quot; -o &quot;%o.bmp&quot;; mv &quot;%i.jxr&quot; &quot;%i&quot;; mv &quot;%o.bmp&quot; &quot;%o&quot;"/>
   <delegate decode="webp" command="&quot;@WebPDecodeDelegate@&quot; -pam &quot;%i&quot; -o &quot;%o&quot;"/>
   <delegate decode="wmf" command="&quot;@WMFDecodeDelegate@&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
-  <delegate decode="xls" command="&quot;@DOCDecodeDelegate@&quot; --headless --convert-to pdf &quot;%i&quot; 2&gt; &quot;%u&quot;; mv `basename &quot;%i&quot; xls`pdf &quot;%o&quot;"/>
-  <delegate decode="xlsx" command="&quot;@DOCDecodeDelegate@&quot; --headless --convert-to pdf &quot;%i&quot; 2&gt; &quot;%u&quot;; mv `basename &quot;%i&quot; xlsx`pdf &quot;%o&quot;"/>
+  <delegate decode="xls" command="&quot;@DOCDecodeDelegate@&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
+  <delegate decode="xlsx" command="&quot;@DOCDecodeDelegate@&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
   <delegate decode="xps:cmyk" stealth="True" command="&quot;@XPSDelegate@&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=@XPSCMYKDevice@&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
   <delegate decode="xps:color" stealth="True" command="&quot;@XPSDelegate@&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=@XPSColorDevice@&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
   <delegate decode="xps:mono" stealth="True" command="&quot;@XPSDelegate@&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=@XPSMonoDevice@&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
-  <delegate encode="mpeg:encode" stealth="True" command="&quot;@MPEGEncodeDelegate@&quot; -nostdin -v -1 -i &quot;%M%%d.jpg&quot; &quot;%u.%m&quot; 2&gt; &quot;%u&quot;"/>
+  <delegate encode="mpeg:encode" stealth="True" command="&quot;@MPEGEncodeDelegate@&quot; -nostdin -v -1 -i &quot;%F%%d.jpg&quot; &quot;%u.%m&quot; 2&gt; &quot;%u&quot;"/>
 </delegatemap>

diff --git a/configure b/configure
index f0744c30e7eaf1c362bea407d99a0f0c62dad25c..77fbd2a406624fd127e4fc113faa31a29a98f0c2 100755 (executable)
--- a/configure
+++ b/configure
@@ -734,8 +734,8 @@ CatDelegate
 BrowseDelegate
 BZIPDelegate
 BlenderDecodeDelegate
-BGPEncodeDelegate
-BGPDecodeDelegate
+BPGEncodeDelegate
+BPGDecodeDelegate
 AutotraceDecodeDelegate
 SHAREARCH_PATH
 SHAREARCH_RELATIVE_PATH
@@ -4528,7 +4528,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.1-0
 
-MAGICK_GIT_REVISION=18063:8528847:20160427
+MAGICK_GIT_REVISION=18074:524db0c:20160430
 
 
 # Substitute library versioning
@@ -34694,16 +34694,16 @@ $as_echo "no" >&6; }
 fi
 
 
-# Extract the first word of ""$BGPDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$BGPDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of ""$BPGDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$BPGDecodeDelegateDefault"; 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_BGPDecodeDelegate+:} false; then :
+if ${ac_cv_path_BPGDecodeDelegate+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $BGPDecodeDelegate in
+  case $BPGDecodeDelegate in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_BGPDecodeDelegate="$BGPDecodeDelegate" # Let the user override the test with a path.
+  ac_cv_path_BPGDecodeDelegate="$BPGDecodeDelegate" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -34713,7 +34713,7 @@ do
   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_BGPDecodeDelegate="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_BPGDecodeDelegate="$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
@@ -34721,30 +34721,30 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_BGPDecodeDelegate" && ac_cv_path_BGPDecodeDelegate=""$BGPDecodeDelegateDefault""
+  test -z "$ac_cv_path_BPGDecodeDelegate" && ac_cv_path_BPGDecodeDelegate=""$BPGDecodeDelegateDefault""
   ;;
 esac
 fi
-BGPDecodeDelegate=$ac_cv_path_BGPDecodeDelegate
-if test -n "$BGPDecodeDelegate"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BGPDecodeDelegate" >&5
-$as_echo "$BGPDecodeDelegate" >&6; }
+BPGDecodeDelegate=$ac_cv_path_BPGDecodeDelegate
+if test -n "$BPGDecodeDelegate"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BPGDecodeDelegate" >&5
+$as_echo "$BPGDecodeDelegate" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-# Extract the first word of ""$BGPEncodeDelegateDefault"", so it can be a program name with args.
-set dummy "$BGPEncodeDelegateDefault"; ac_word=$2
+# Extract the first word of ""$BPGEncodeDelegateDefault"", so it can be a program name with args.
+set dummy "$BPGEncodeDelegateDefault"; 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_BGPEncodeDelegate+:} false; then :
+if ${ac_cv_path_BPGEncodeDelegate+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $BGPEncodeDelegate in
+  case $BPGEncodeDelegate in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_BGPEncodeDelegate="$BGPEncodeDelegate" # Let the user override the test with a path.
+  ac_cv_path_BPGEncodeDelegate="$BPGEncodeDelegate" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -34754,7 +34754,7 @@ do
   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_BGPEncodeDelegate="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_BPGEncodeDelegate="$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
@@ -34762,14 +34762,14 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_BGPEncodeDelegate" && ac_cv_path_BGPEncodeDelegate=""$BGPEncodeDelegateDefault""
+  test -z "$ac_cv_path_BPGEncodeDelegate" && ac_cv_path_BPGEncodeDelegate=""$BPGEncodeDelegateDefault""
   ;;
 esac
 fi
-BGPEncodeDelegate=$ac_cv_path_BGPEncodeDelegate
-if test -n "$BGPEncodeDelegate"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BGPEncodeDelegate" >&5
-$as_echo "$BGPEncodeDelegate" >&6; }
+BPGEncodeDelegate=$ac_cv_path_BPGEncodeDelegate
+if test -n "$BPGEncodeDelegate"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BPGEncodeDelegate" >&5
+$as_echo "$BPGEncodeDelegate" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -36876,8 +36876,8 @@ fi
 if test "$with_frozenpaths" != 'yes'; then
   # Re-set delegate definitions to default (no paths)
   AutotraceDecodeDelegate="$AutotraceDecodeDelegateDefault"
-  BGPDecodeDelegate="$BGPDecodeDelegateDefault"
-  BGPEncodeDelegate="$BGPEncodeDelegateDefault"
+  BPGDecodeDelegate="$BPGDecodeDelegateDefault"
+  BPGEncodeDelegate="$BPGEncodeDelegateDefault"
   BlenderDecodeDelegate="$BlenderDecodeDelegateDefault"
   BZIPDelegate="$BZIPDelegateDefault"
   BrowseDelegate="$BrowseDelegateDefault"

diff --git a/configure.ac b/configure.ac
index 80ae0aec29b98c9bb8366dfa74e8ba6be1f4cf23..7aafc86c5d990ae6f5efb84f7d9e1c0a6fb08a68 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3072,8 +3072,8 @@ ZipDelegateDefault='gzip'
 
 # Search for delegates
 AC_PATH_PROG(AutotraceDecodeDelegate, "$AutotraceDecodeDelegateDefault", "$AutotraceDecodeDelegateDefault")
-AC_PATH_PROG(BGPDecodeDelegate, "$BGPDecodeDelegateDefault", "$BGPDecodeDelegateDefault")
-AC_PATH_PROG(BGPEncodeDelegate, "$BGPEncodeDelegateDefault", "$BGPEncodeDelegateDefault")
+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")
@@ -3272,8 +3272,8 @@ AC_SUBST(type_include_files)
 if test "$with_frozenpaths" != 'yes'; then
   # Re-set delegate definitions to default (no paths)
   AutotraceDecodeDelegate="$AutotraceDecodeDelegateDefault"
-  BGPDecodeDelegate="$BGPDecodeDelegateDefault"
-  BGPEncodeDelegate="$BGPEncodeDelegateDefault"
+  BPGDecodeDelegate="$BPGDecodeDelegateDefault"
+  BPGEncodeDelegate="$BPGEncodeDelegateDefault"
   BlenderDecodeDelegate="$BlenderDecodeDelegateDefault"
   BZIPDelegate="$BZIPDelegateDefault"
   BrowseDelegate="$BrowseDelegateDefault"
@@ -3323,8 +3323,8 @@ fi
 
 # Delegate substitutions
 AC_SUBST(AutotraceDecodeDelegate)
-AC_SUBST(BGPDecodeDelegate)
-AC_SUBST(BGPEncodeDelegate)
+AC_SUBST(BPGDecodeDelegate)
+AC_SUBST(BPGEncodeDelegate)
 AC_SUBST(BlenderDecodeDelegate)
 AC_SUBST(BZIPDelegate)
 AC_SUBST(BrowseDelegate)