(no commit message)

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index a3dafee3ae4ba9bcfb60887c5593bc470197290f..9df57932b9830642868a9293b9403cdbfb14319f 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -979,6 +979,11 @@
 #define MAGICKCORE_HAVE_TIFFCONF_H 1
 #endif
 
+/* Define to 1 if you have the `TIFFIsBigEndian' function. */
+#ifndef MAGICKCORE_HAVE_TIFFISBIGENDIAN
+#define MAGICKCORE_HAVE_TIFFISBIGENDIAN 1
+#endif
+
 /* Define to 1 if you have the `TIFFIsCODECConfigured' function. */
 #ifndef MAGICKCORE_HAVE_TIFFISCODECCONFIGURED
 #define MAGICKCORE_HAVE_TIFFISCODECCONFIGURED 1
@@ -1252,7 +1257,7 @@
 #define MAGICKCORE_LT_OBJDIR ".libs/"
 #endif
 
-/* Define if you have lzma compression library */
+/* Define if you have LZMA library */
 #ifndef MAGICKCORE_LZMA_DELEGATE
 #define MAGICKCORE_LZMA_DELEGATE 1
 #endif

diff --git a/Makefile.in b/Makefile.in
index 9a7305730b51c01b86a7106c5f13bc60219aee80..0241a3e68d69e5601a64781eadda3339f5db7e97 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2427,6 +2427,7 @@ LTLIBOBJS = @LTLIBOBJS@
 LT_CONFIG_H = @LT_CONFIG_H@
 LT_DLLOADERS = @LT_DLLOADERS@
 LT_DLPREOPEN = @LT_DLPREOPEN@
+LZMA_CFLAGS = @LZMA_CFLAGS@
 LZMA_LIBS = @LZMA_LIBS@
 LZWDecodeDelegate = @LZWDecodeDelegate@
 LZWEncodeDelegate = @LZWEncodeDelegate@

diff --git a/coders/tiff.c b/coders/tiff.c
index 3969fc42d68d3080e2520035c31893b5700f0238..f5dc094143ec214adc387c798e16a6a89ed1b6bc 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -922,8 +922,10 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
     TIFFGetEXIFProperties(tiff,image,exception);
     TIFFGetProfiles(tiff,image,exception);
     TIFFGetProperties(tiff,image,exception);
+#if defined(MAGICKCORE_HAVE_TIFFISBIGENDIAN)
     (void) SetImageProperty(image,"tiff:endian",TIFFIsBigEndian(tiff) == 0 ?
       "lsb" : "msb",exception);
+#endif
     (void) TIFFGetFieldDefaulted(tiff,TIFFTAG_COMPRESSION,&compress_tag);
     (void) TIFFGetFieldDefaulted(tiff,TIFFTAG_ORIENTATION,&orientation);
     (void) TIFFGetFieldDefaulted(tiff,TIFFTAG_IMAGEWIDTH,&width);

diff --git a/config/config.h.in b/config/config.h.in
index 96bea8d0be562b1d73fc43be96b3950f8b445cf3..3d0cca245a4a8230884d415c08f585cdfefcd42a 100644 (file)
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -636,6 +636,9 @@
 /* Define to 1 if you have the <tiffconf.h> header file. */
 #undef HAVE_TIFFCONF_H
 
+/* Define to 1 if you have the `TIFFIsBigEndian' function. */
+#undef HAVE_TIFFISBIGENDIAN
+
 /* Define to 1 if you have the `TIFFIsCODECConfigured' function. */
 #undef HAVE_TIFFISCODECCONFIGURED
 
@@ -821,7 +824,7 @@
    */
 #undef LT_OBJDIR
 
-/* Define if you have lzma compression library */
+/* Define if you have LZMA library */
 #undef LZMA_DELEGATE
 
 /* Define to prepend to default font search path. */

diff --git a/configure b/configure
index e07cee488216a58781eebd3ae083c66edf7ea8b4..1800c598af2c8b7c4ec8b3e93a23e74249fbec9a 100755 (executable)
--- a/configure
+++ b/configure
@@ -31187,48 +31187,6 @@ else
   failed=`expr $failed + 1`
 fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFIsBigEndian in -ltiff" >&5
-$as_echo_n "checking for TIFFIsBigEndian in -ltiff... " >&6; }
-if ${ac_cv_lib_tiff_TIFFIsBigEndian+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltiff  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char TIFFIsBigEndian ();
-int
-main ()
-{
-return TIFFIsBigEndian ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_tiff_TIFFIsBigEndian=yes
-else
-  ac_cv_lib_tiff_TIFFIsBigEndian=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFIsBigEndian" >&5
-$as_echo "$ac_cv_lib_tiff_TIFFIsBigEndian" >&6; }
-if test "x$ac_cv_lib_tiff_TIFFIsBigEndian" = xyes; then :
-  passed=`expr $passed + 1`
-else
-  failed=`expr $failed + 1`
-fi
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFIsByteSwapped in -ltiff" >&5
 $as_echo_n "checking for TIFFIsByteSwapped in -ltiff... " >&6; }
 if ${ac_cv_lib_tiff_TIFFIsByteSwapped+:} false; then :
@@ -31384,8 +31342,9 @@ fi
 done
 
             for ac_func in TIFFIsCODECConfigured TIFFMergeFieldInfo \
-              TIFFReadEXIFDirectory TIFFSetErrorHandlerExt TIFFSetTagExtender \
-              TIFFSetWarningHandlerExt TIFFSwabArrayOfTriples
+              TIFFIsBigEndian TIFFReadEXIFDirectory TIFFSetErrorHandlerExt \
+              TIFFSetTagExtender TIFFSetWarningHandlerExt \
+              TIFFSwabArrayOfTriples
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

diff --git a/configure.ac b/configure.ac
index 0326464cfd65655643f6f61ae87c7d284b049d39..0be5ac5b4951321c5b48f0c5f128b5870f175cfb 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -2653,7 +2653,6 @@ if test "$with_tiff" != 'no'; then
     AC_CHECK_HEADER(tiffio.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
     AC_CHECK_LIB(tiff,TIFFOpen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
     AC_CHECK_LIB(tiff,TIFFClientOpen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
-    AC_CHECK_LIB(tiff,TIFFIsBigEndian,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
     AC_CHECK_LIB(tiff,TIFFIsByteSwapped,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
     AC_CHECK_LIB(tiff,TIFFReadRGBATile,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
     AC_CHECK_LIB(tiff,TIFFReadRGBAStrip,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
@@ -2670,8 +2669,9 @@ if test "$with_tiff" != 'no'; then
             have_tiff='yes'
             AC_CHECK_HEADERS(tiffconf.h)
             AC_CHECK_FUNCS([TIFFIsCODECConfigured TIFFMergeFieldInfo \
-              TIFFReadEXIFDirectory TIFFSetErrorHandlerExt TIFFSetTagExtender \
-              TIFFSetWarningHandlerExt TIFFSwabArrayOfTriples])
+              TIFFIsBigEndian TIFFReadEXIFDirectory TIFFSetErrorHandlerExt \
+              TIFFSetTagExtender TIFFSetWarningHandlerExt \
+              TIFFSwabArrayOfTriples])
         fi
     else
         AC_MSG_NOTICE([no])