Support configure script --enable-indirect-reads option to enable indirect reads...

diff --git a/ChangeLog b/ChangeLog
index ca1e56201316c650ee43835813e94e4bcaad8238..4c7349419fe57cac7303036f2934fa445177eaee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2016-05-31  7.0.1-8 Cristy  <quetzlzacatenango@image...>
   * Support configure script --enable-pipes option to enable pipes (|) in
     filenames.
+  * Support configure script --enable-indirect-reads option to enable
+    indirect reads (@) in filenames.
 
 2016-05-30  7.0.1-7 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.1-7, GIT revision 18321:5511ef5:20160530.

diff --git a/MagickCore/property.c b/MagickCore/property.c
index b84c342ebba39adb17ce463574691cd79bbe6a2c..3e3716ba867c521238969492ab5aa6ffcb647cc0 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -3313,6 +3313,7 @@ RestoreMSCWarning
     p++;
   if (*p == '\0')
     return(ConstantString(""));
+#if defined(INDIRECT_READS_SUPPORT)
   if ((*p == '@') && (IsPathAccessible(p+1) != MagickFalse))
     {
       /*
@@ -3329,7 +3330,7 @@ RestoreMSCWarning
       if (interpret_text != (char *) NULL)
         return(interpret_text);
     }
-
+#endif
   /*
     Translate any embedded format characters.
   */

diff --git a/configure b/configure
index 9b30547c63f01809aaf0e4e3c6a15e5e7d9068e0..0b23d9a3c0b369edd57c1cdea2be5429a0461cdf 100755 (executable)
--- a/configure
+++ b/configure
@@ -1168,6 +1168,7 @@ enable_cipher
 enable_zero_configuration
 enable_hdri
 enable_pipes
+enable_indirect_reads
 enable_assert
 enable_maintainer_mode
 enable_hugepages
@@ -1937,6 +1938,7 @@ Optional Features:
   --enable-hdri           accurately represent the wide range of intensity
                           levels found in real scenes
   --enable-pipes          enable pipes (|) in filenames
+  --enable-indirect-reads enable indirect reads (@) in filenames
   --disable-assert        disable assert() statements in build
   --enable-maintainer-mode
                           enable make rules and dependencies not useful (and
@@ -4517,7 +4519,7 @@ MAGICK_PATCHLEVEL_VERSION=8
 
 MAGICK_VERSION=7.0.1-8
 
-MAGICK_GIT_REVISION=18325:28587c2:20160531
+MAGICK_GIT_REVISION=18331:697159d:20160531
 
 
 # Substitute library versioning
@@ -23840,6 +23842,22 @@ $as_echo "#define PIPES_SUPPORT 1" >>confdefs.h
     MAGICK_FEATURES="Pipes $MAGICK_FEATURES"
 fi
 
+# Enable indirect reads (@) in filenames.
+# Check whether --enable-indirect-reads was given.
+if test "${enable_indirect_reads+set}" = set; then :
+  enableval=$enable_indirect_reads; enable_indirect_reads=$enableval
+else
+  enable_indirect_reads='no'
+fi
+
+
+if test "$enable_indirect-reads" = 'yes'; then
+
+$as_echo "#define INDIRECT_READS_SUPPORT 1" >>confdefs.h
+
+    MAGICK_FEATURES="IndirectReads $MAGICK_FEATURES"
+fi
+
 # Build a version of ImageMagick with assert statements.
 # Check whether --enable-assert was given.
 if test "${enable_assert+set}" = set; then :

diff --git a/configure.ac b/configure.ac
index c86cc630cebeae45ba3e128e619b4caa1b9b3761..520f180970fd8e95409dee461a730826aded8964 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -696,6 +696,18 @@ if test "$enable_pipes" = 'yes'; then
     MAGICK_FEATURES="Pipes $MAGICK_FEATURES"
 fi
 
+# Enable indirect reads (@) in filenames.
+AC_ARG_ENABLE([indirect-reads],
+    [AC_HELP_STRING([--enable-indirect-reads],
+                    [enable indirect reads (@) in filenames])],
+    [enable_indirect_reads=$enableval],
+    [enable_indirect_reads='no'])
+
+if test "$enable_indirect-reads" = 'yes'; then
+    AC_DEFINE(INDIRECT_READS_SUPPORT,1,[enable indirect reads (@) in filenames])
+    MAGICK_FEATURES="IndirectReads $MAGICK_FEATURES"
+fi
+
 # Build a version of ImageMagick with assert statements.
 AC_ARG_ENABLE([assert],
     [AC_HELP_STRING([--disable-assert],