From 95edc39bc1391441bfc46212c1e119d65a181694 Mon Sep 17 00:00:00 2001 From: Andrey Kiselev Date: Tue, 20 Apr 2004 11:04:14 +0000 Subject: [PATCH] *** empty log message *** --- configure | 72 +++++++++++++++++++++++++++++++++++++++++- configure.ac | 3 +- libtiff/config.h.in | 2 +- libtiff/tif_dirwrite.c | 29 ++++------------- libtiff/tif_fax3.c | 6 ++-- libtiff/tiffiop.h | 21 ++---------- 6 files changed, 86 insertions(+), 47 deletions(-) diff --git a/configure b/configure index 7a8451df..c5d2d8a4 100755 --- a/configure +++ b/configure @@ -20771,6 +20771,76 @@ _ACEOF fi +echo "$as_me:$LINENO: checking for inline" >&5 +echo $ECHO_N "checking for inline... $ECHO_C" >&6 +if test "${ac_cv_c_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifndef __cplusplus +typedef int foo_t; +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } +#endif + +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_inline=$ac_kw; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done + +fi +echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 +echo "${ECHO_T}$ac_cv_c_inline" >&6 + + +case $ac_cv_c_inline in + inline | yes) ;; + *) + case $ac_cv_c_inline in + no) ac_val=;; + *) ac_val=$ac_cv_c_inline;; + esac + cat >>confdefs.h <<_ACEOF +#ifndef __cplusplus +#define inline $ac_val +#endif +_ACEOF + ;; +esac + echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 if test "${ac_cv_c_bigendian+set}" = set; then @@ -22067,7 +22137,7 @@ echo "$as_me:$LINENO: checking native cpu bit order" >&5 echo $ECHO_N "checking native cpu bit order... $ECHO_C" >&6 case "$target_cpu" in i*86*) - HOST_FILLORDER=FILLODER_LSB2MSB + HOST_FILLORDER=FILLORDER_LSB2MSB echo "$as_me:$LINENO: result: lsb2msb" >&5 echo "${ECHO_T}lsb2msb" >&6 ;; diff --git a/configure.ac b/configure.ac index 42f2c57b..04486c60 100644 --- a/configure.ac +++ b/configure.ac @@ -71,6 +71,7 @@ AC_CHECK_HEADERS([fcntl.h limits.h malloc.h memory.h stdlib.h string.h sys/time. dnl Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL AC_C_CONST +AC_C_INLINE AC_C_BIGENDIAN AC_TYPE_OFF_T AC_TYPE_SIZE_T @@ -93,7 +94,7 @@ dnl --------------------------------------------------------------------------- AC_MSG_CHECKING([native cpu bit order]) case "$target_cpu" in i*86*) - HOST_FILLORDER=FILLODER_LSB2MSB + HOST_FILLORDER=FILLORDER_LSB2MSB AC_MSG_RESULT([lsb2msb]) ;; *) diff --git a/libtiff/config.h.in b/libtiff/config.h.in index 471e330c..652834dc 100644 --- a/libtiff/config.h.in +++ b/libtiff/config.h.in @@ -102,7 +102,7 @@ /* Define to 1 if the system has the type `_Bool'. */ #undef HAVE__BOOL -/* Set the native cpu bit order (possible values are msb2lsb and lsb2msb) */ +/* Set the native cpu bit order */ #undef HOST_FILLORDER /* Name of package */ diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c index 3856f673..dd289f67 100644 --- a/libtiff/tif_dirwrite.c +++ b/libtiff/tif_dirwrite.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dirwrite.c,v 1.20 2004-01-21 14:20:53 warmerda Exp $ */ +/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dirwrite.c,v 1.21 2004-04-20 11:04:15 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -59,12 +59,8 @@ static int TIFFWriteDoubleArray(TIFF *, static int TIFFWriteByteArray(TIFF*, TIFFDirEntry*, char*); static int TIFFWriteAnyArray(TIFF*, TIFFDataType, ttag_t, TIFFDirEntry*, uint32, double*); -#ifdef COLORIMETRY_SUPPORT static int TIFFWriteTransferFunction(TIFF*, TIFFDirEntry*); -#endif -#ifdef CMYK_SUPPORT static int TIFFWriteInkNames(TIFF*, TIFFDirEntry*); -#endif static int TIFFWriteData(TIFF*, TIFFDirEntry*, char*); static int TIFFLinkDirectory(TIFF*); @@ -296,28 +292,19 @@ _TIFFWriteDirectory(TIFF* tif, int done) break; case FIELD_PAGENUMBER: case FIELD_HALFTONEHINTS: -#ifdef YCBCR_SUPPORT case FIELD_YCBCRSUBSAMPLING: -#endif -#ifdef CMYK_SUPPORT case FIELD_DOTRANGE: -#endif if (!TIFFSetupShortPair(tif, fip->field_tag, dir)) goto bad; break; -#ifdef CMYK_SUPPORT case FIELD_INKNAMES: if (!TIFFWriteInkNames(tif, dir)) goto bad; break; -#endif -#ifdef COLORIMETRY_SUPPORT case FIELD_TRANSFERFUNCTION: if (!TIFFWriteTransferFunction(tif, dir)) goto bad; break; -#endif -#if SUBIFD_SUPPORT case FIELD_SUBIFD: if (!TIFFWriteNormalTag(tif, dir, fip)) goto bad; @@ -341,7 +328,6 @@ _TIFFWriteDirectory(TIFF* tif, int done) + ((char*)&dir->tdir_offset-data)); } break; -#endif default: if (!TIFFWriteNormalTag(tif, dir, fip)) goto bad; @@ -997,7 +983,6 @@ TIFFWriteAnyArray(TIFF* tif, return (status); } -#ifdef COLORIMETRY_SUPPORT static int TIFFWriteTransferFunction(TIFF* tif, TIFFDirEntry* dir) { @@ -1020,9 +1005,7 @@ TIFFWriteTransferFunction(TIFF* tif, TIFFDirEntry* dir) return (TIFFWriteShortTable(tif, TIFFTAG_TRANSFERFUNCTION, dir, ncols, tf)); } -#endif -#ifdef CMYK_SUPPORT static int TIFFWriteInkNames(TIFF* tif, TIFFDirEntry* dir) { @@ -1033,7 +1016,6 @@ TIFFWriteInkNames(TIFF* tif, TIFFDirEntry* dir) dir->tdir_count = td->td_inknameslen; return (TIFFWriteByteArray(tif, dir, td->td_inknames)); } -#endif /* * Write a contiguous directory item. @@ -1171,8 +1153,11 @@ TIFFLinkDirectory(TIFF* tif) diroff = tif->tif_diroff; if (tif->tif_flags & TIFF_SWAB) TIFFSwabLong(&diroff); -#if SUBIFD_SUPPORT - if (tif->tif_flags & TIFF_INSUBIFD) { + + /* + * Handle SubIFDs + */ + if (tif->tif_flags & TIFF_INSUBIFD) { (void) TIFFSeekFile(tif, tif->tif_subifdoff, SEEK_SET); if (!WriteOK(tif, &diroff, sizeof (diroff))) { TIFFError(module, @@ -1191,7 +1176,7 @@ TIFFLinkDirectory(TIFF* tif) tif->tif_flags &= ~TIFF_INSUBIFD; return (1); } -#endif + if (tif->tif_header.tiff_diroff == 0) { /* * First directory, overwrite offset in header. diff --git a/libtiff/tif_fax3.c b/libtiff/tif_fax3.c index 4182d9cf..45d14a36 100644 --- a/libtiff/tif_fax3.c +++ b/libtiff/tif_fax3.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_fax3.c,v 1.22 2004-02-05 09:53:39 dron Exp $ */ +/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_fax3.c,v 1.23 2004-04-20 11:04:14 dron Exp $ */ /* * Copyright (c) 1990-1997 Sam Leffler @@ -763,7 +763,7 @@ static int32 find1span(u_char*, int32, int32); * table. The ``base'' of the bit string is supplied * along with the start+end bit indices. */ -INLINE static int32 +inline static int32 find0span(u_char* bp, int32 bs, int32 be) { int32 bits = be - bs; @@ -822,7 +822,7 @@ find0span(u_char* bp, int32 bs, int32 be) return (span); } -INLINE static int32 +inline static int32 find1span(u_char* bp, int32 bs, int32 be) { int32 bits = be - bs; diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h index 4ca1b2c1..872d954e 100644 --- a/libtiff/tiffiop.h +++ b/libtiff/tiffiop.h @@ -1,4 +1,4 @@ -/* $Id: tiffiop.h,v 1.13 2004-03-26 14:58:44 dron Exp $ */ +/* $Id: tiffiop.h,v 1.14 2004-04-20 11:04:14 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -51,23 +51,7 @@ #include "tiffio.h" #include "tif_dir.h" -#define HOST_FILLORDER FILLORDER_MSB2LSB - typedef double dblparam_t; -/* - * If your compiler supports inline functions, then - * set INLINE appropriately to get the known hotspots - * in the library expanded inline. - */ -#if defined(__GNUC__) -# ifdef __STRICT_ANSI__ -# define INLINE __inline__ -# else -# define INLINE inline -# endif -#else -# define INLINE -#endif #define GLOBALDATA(TYPE,NAME) extern TYPE NAME @@ -131,10 +115,9 @@ struct tiff { tstrip_t tif_curstrip; /* current strip for read/write */ toff_t tif_curoff; /* current offset for read/write */ toff_t tif_dataoff; /* current offset for writing dir */ -#if SUBIFD_SUPPORT +/* SubIFD support */ uint16 tif_nsubifd; /* remaining subifds to write */ toff_t tif_subifdoff; /* offset for patching SubIFD link */ -#endif /* tiling support */ uint32 tif_col; /* current column (offset by row too) */ ttile_t tif_curtile; /* current tile for read/write */