From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 2 Jan 2017 12:41:13 +0000 (-0500)
Subject: ...
X-Git-Tag: 7.0.4-2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ef15c076433a6f9dc1d835fd55dce6d4a0b195f;p=imagemagick

...
---

diff --git a/Makefile.in b/Makefile.in
index cda60865b..01c69b3a6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2601,6 +2601,7 @@ LCMS_CFLAGS = @LCMS_CFLAGS@
 LCMS_LIBS = @LCMS_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LEPDelegate = @LEPDelegate@
 LFS_CPPFLAGS = @LFS_CPPFLAGS@
 LIBEXEC_DIR = @LIBEXEC_DIR@
 LIBOBJS = @LIBOBJS@
diff --git a/config/delegates.xml.in b/config/delegates.xml.in
index a834c5e33..d110cb846 100644
--- a/config/delegates.xml.in
+++ b/config/delegates.xml.in
@@ -83,7 +83,9 @@
   <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="ilbm" command="&quot;@ILBMDecodeDelegate@&quot; &quot;%i&quot; &gt; &quot;%o&quot;"/>
+  <delegate decode="jpg" encode="lep" mode="encode" command="&quot;@LEPDelegate@&quot; &quot;%i&quot; &quot;%o&quot;"/>
   <delegate decode="jxr" command="@MVDelegate@ &quot;%i&quot; &quot;%i.jxr&quot;; &quot;@JXRDecodeDelegate@&quot; -i &quot;%i.jxr&quot; -o &quot;%o.pnm&quot;; @MVDelegate@ &quot;%i.jxr&quot; &quot;%i&quot;; @MVDelegate@ &quot;%o.pnm&quot; &quot;%o&quot;"/>
+  <delegate decode="lep" encode="jpg" mode="encode" command="&quot;@LEPDelegate@&quot; &quot;%i&quot; &quot;%o&quot;"/>
   <delegate decode="miff" encode="show" spawn="True" command="&quot;@DisplayDelegate@&quot; display -immutable -delay 0 -title &quot;%M&quot; &quot;%i&quot;"/>
   <delegate decode="miff" encode="win" stealth="True" spawn="True" command="&quot;@DisplayDelegate@&quot; display -immutable -delay 0 -title &quot;%M&quot; &quot;%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;"/>
diff --git a/configure b/configure
index c893a363a..55c4a1ced 100755
--- a/configure
+++ b/configure
@@ -707,6 +707,7 @@ MogrifyDelegate
 LaunchDelegate
 LPRDelegate
 LPDelegate
+LEPDelegate
 JXREncodeDelegate
 JXRDecodeDelegate
 ILBMEncodeDelegate
@@ -4518,7 +4519,7 @@ MAGICK_PATCHLEVEL_VERSION=2
 
 MAGICK_VERSION=7.0.4-2
 
-MAGICK_GIT_REVISION=19304:801954a:20161231
+MAGICK_GIT_REVISION=19306:e84a165:20170102
 
 
 # Substitute library versioning
@@ -34668,6 +34669,7 @@ ILBMDecodeDelegateDefault='ilbmtoppm'
 ILBMEncodeDelegateDefault='ppmtoilbm'
 JXRDecodeDelegateDefault='JxrDecApp'
 JXREncodeDelegateDefault='JxrEncApp'
+LEPDelegateDefault='lepton'
 LPDelegateDefault='lp'
 LPRDelegateDefault='lpr'
 LaunchDelegateDefault='gimp'
@@ -35395,6 +35397,47 @@ $as_echo "no" >&6; }
 fi
 
 
+# Extract the first word of ""$LEPDelegateDefault"", so it can be a program name with args.
+set dummy "$LEPDelegateDefault"; 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_LEPDelegate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $LEPDelegate in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_LEPDelegate="$LEPDelegate" # 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_LEPDelegate="$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_LEPDelegate" && ac_cv_path_LEPDelegate=""$LEPDelegateDefault""
+  ;;
+esac
+fi
+LEPDelegate=$ac_cv_path_LEPDelegate
+if test -n "$LEPDelegate"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEPDelegate" >&5
+$as_echo "$LEPDelegate" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 # Extract the first word of ""$LPDelegateDefault"", so it can be a program name with args.
 set dummy "$LPDelegateDefault"; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -36399,6 +36442,7 @@ if test "$with_frozenpaths" != 'yes'; then
   ILBMEncodeDelegate="$ILBMEncodeDelegateDefault"
   JXRDecodeDelegate="$JXRDecodeDelegateDefault"
   JXREncodeDelegate="$JXREncodeDelegateDefault"
+  LEPDelegate="$LEPDelegateDefault"
   LPDelegate="$LPDelegateDefault"
   LaunchDelegate="$LaunchDelegateDefault"
   MPEGDecodeDelegate="$MPEGDecodeDelegateDefault"
@@ -36445,6 +36489,7 @@ fi
 
 
 
+
 
 
 #
diff --git a/configure.ac b/configure.ac
index aba3b8184..dbdd9d710 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3053,6 +3053,7 @@ ILBMDecodeDelegateDefault='ilbmtoppm'
 ILBMEncodeDelegateDefault='ppmtoilbm'
 JXRDecodeDelegateDefault='JxrDecApp'
 JXREncodeDelegateDefault='JxrEncApp'
+LEPDelegateDefault='lepton'
 LPDelegateDefault='lp'
 LPRDelegateDefault='lpr'
 LaunchDelegateDefault='gimp'
@@ -3095,6 +3096,7 @@ AC_PATH_PROG(ILBMDecodeDelegate, "$ILBMDecodeDelegateDefault", "$ILBMDecodeDeleg
 AC_PATH_PROG(ILBMEncodeDelegate, "$ILBMEncodeDelegateDefault", "$ILBMEncodeDelegateDefault")
 AC_PATH_PROG(JXRDecodeDelegate, "$JXRDecodeDelegateDefault", "$JXRDecodeDelegateDefault")
 AC_PATH_PROG(JXREncodeDelegate, "$JXREncodeDelegateDefault", "$JXREncodeDelegateDefault")
+AC_PATH_PROG(LEPDelegate, "$LEPDelegateDefault", "$LEPDelegateDefault")
 AC_PATH_PROG(LPDelegate, "$LPDelegateDefault", no)
 AC_PATH_PROG(LPRDelegate, "$LPRDelegateDefault", "$LPRDelegateDefault")
 AC_PATH_PROG(LaunchDelegate, "$LaunchDelegateDefault", "$LaunchDelegateDefault")
@@ -3282,6 +3284,7 @@ if test "$with_frozenpaths" != 'yes'; then
   ILBMEncodeDelegate="$ILBMEncodeDelegateDefault"
   JXRDecodeDelegate="$JXRDecodeDelegateDefault"
   JXREncodeDelegate="$JXREncodeDelegateDefault"
+  LEPDelegate="$LEPDelegateDefault"
   LPDelegate="$LPDelegateDefault"
   LaunchDelegate="$LaunchDelegateDefault"
   MPEGDecodeDelegate="$MPEGDecodeDelegateDefault"
@@ -3315,6 +3318,7 @@ AC_SUBST(ILBMDecodeDelegate)
 AC_SUBST(ILBMEncodeDelegate)
 AC_SUBST(JXRDecodeDelegate)
 AC_SUBST(JXREncodeDelegate)
+AC_SUBST(LEPDelegate)
 AC_SUBST(LPDelegate)
 AC_SUBST(LaunchDelegate)
 AC_SUBST(MPEGDecodeDelegate)