*** empty log message ***
This commit is contained in:
Andrey Kiselev
parent
95edc39bc1
commit
68acdfcb37
124
configure
vendored
124
configure
vendored
@ -1055,6 +1055,18 @@ Optional Features:
|
||||
contrib/ojpeg/README first! Compilation fails with
|
||||
unpatched IJG JPEG library)
|
||||
--disable-opengl disable building OpenGL viewer (enabled by default)
|
||||
--disable-strip-chopping
|
||||
disable support for strip chopping (whether or not
|
||||
to convert single-strip uncompressed images to
|
||||
mutiple strips of ~8Kb to reduce memory usage)
|
||||
--disable-extrasample-as-alpha
|
||||
the RGBA interface will treat a fourth sample with
|
||||
no EXTRASAMPLE_ value as being ASSOCALPHA. Many
|
||||
packages produce RGBA files but don't mark the alpha
|
||||
properly
|
||||
--disable-check-ycbcr-subsampling
|
||||
disable picking up YCbCr subsampling info from the
|
||||
JPEG data stream to support files lacking the tag
|
||||
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
@ -3702,7 +3714,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 3705 "configure"' > conftest.$ac_ext
|
||||
echo '#line 3717 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -5261,7 +5273,7 @@ fi
|
||||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:5264:" \
|
||||
echo "$as_me:5276:" \
|
||||
"checking for Fortran 77 compiler version" >&5
|
||||
ac_compiler=`set X $ac_compile; echo $2`
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
||||
@ -6293,11 +6305,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:6296: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6308: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:6300: \$? = $ac_status" >&5
|
||||
echo "$as_me:6312: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -6526,11 +6538,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:6529: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6541: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:6533: \$? = $ac_status" >&5
|
||||
echo "$as_me:6545: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -6586,11 +6598,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:6589: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6601: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:6593: \$? = $ac_status" >&5
|
||||
echo "$as_me:6605: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -8761,7 +8773,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8764 "configure"
|
||||
#line 8776 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -8859,7 +8871,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8862 "configure"
|
||||
#line 8874 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -11036,11 +11048,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:11039: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11051: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:11043: \$? = $ac_status" >&5
|
||||
echo "$as_me:11055: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -11096,11 +11108,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:11099: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11111: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:11103: \$? = $ac_status" >&5
|
||||
echo "$as_me:11115: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -12450,7 +12462,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12453 "configure"
|
||||
#line 12465 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12548,7 +12560,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12551 "configure"
|
||||
#line 12563 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -13375,11 +13387,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13378: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13390: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13382: \$? = $ac_status" >&5
|
||||
echo "$as_me:13394: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -13435,11 +13447,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13438: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13450: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:13442: \$? = $ac_status" >&5
|
||||
echo "$as_me:13454: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -15467,11 +15479,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15470: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15482: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15474: \$? = $ac_status" >&5
|
||||
echo "$as_me:15486: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -15700,11 +15712,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15703: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15715: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15707: \$? = $ac_status" >&5
|
||||
echo "$as_me:15719: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -15760,11 +15772,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15763: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15775: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:15767: \$? = $ac_status" >&5
|
||||
echo "$as_me:15779: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -17935,7 +17947,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17938 "configure"
|
||||
#line 17950 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -18033,7 +18045,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18036 "configure"
|
||||
#line 18048 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -21338,8 +21350,7 @@ fi
|
||||
|
||||
|
||||
|
||||
|
||||
for ac_func in floor gettimeofday isascii memmove memset munmap pow sqrt strcasecmp strchr strncasecmp strrchr strstr strtol
|
||||
for ac_func in floor isascii memmove memset mmap pow sqrt strcasecmp strchr strncasecmp strrchr strstr strtol
|
||||
do
|
||||
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||||
echo "$as_me:$LINENO: checking for $ac_func" >&5
|
||||
@ -22153,6 +22164,13 @@ cat >>confdefs.h <<_ACEOF
|
||||
_ACEOF
|
||||
|
||||
|
||||
HAVE_IEEEFP=1
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_IEEEFP $HAVE_IEEEFP
|
||||
_ACEOF
|
||||
|
||||
|
||||
|
||||
HAVE_CCITT=yes
|
||||
|
||||
@ -23313,6 +23331,52 @@ fi
|
||||
|
||||
|
||||
|
||||
|
||||
HAVE_STRIPCHOP=yes
|
||||
|
||||
# Check whether --enable-strip-chopping or --disable-strip-chopping was given.
|
||||
if test "${enable_strip_chopping+set}" = set; then
|
||||
enableval="$enable_strip_chopping"
|
||||
HAVE_STRIPCHOP=no
|
||||
else
|
||||
HAVE_STRIPCHOP=yes
|
||||
fi;
|
||||
|
||||
if test "$HAVE_STRIPCHOP" = "yes" ; then
|
||||
CPPFLAGS="-DSTRIPCHOP_DEFAULT=TIFF_STRIPCHOP $CPPFLAGS"
|
||||
fi
|
||||
|
||||
|
||||
HAVE_EXTRASAMPLE_AS_ALPHA=yes
|
||||
|
||||
# Check whether --enable-extrasample-as-alpha or --disable-extrasample-as-alpha was given.
|
||||
if test "${enable_extrasample_as_alpha+set}" = set; then
|
||||
enableval="$enable_extrasample_as_alpha"
|
||||
HAVE_EXTRASAMPLE_AS_ALPHA=no
|
||||
else
|
||||
HAVE_EXTRASAMPLE_AS_ALPHA=yes
|
||||
fi;
|
||||
|
||||
if test "$HAVE_EXTRASAMPLE_AS_ALPHA" = "yes" ; then
|
||||
CPPFLAGS="-DDEFAULT_EXTRASAMPLE_AS_ALPHA $CPPFLAGS"
|
||||
fi
|
||||
|
||||
|
||||
CHECK_JPEG_YCBCR_SUBSAMPLING=yes
|
||||
|
||||
# Check whether --enable-check-ycbcr-subsampling or --disable-check-ycbcr-subsampling was given.
|
||||
if test "${enable_check_ycbcr_subsampling+set}" = set; then
|
||||
enableval="$enable_check_ycbcr_subsampling"
|
||||
CHECK_JPEG_YCBCR_SUBSAMPLING=no
|
||||
else
|
||||
CHECK_JPEG_YCBCR_SUBSAMPLING=yes
|
||||
fi;
|
||||
|
||||
if test "$CHECK_JPEG_YCBCR_SUBSAMPLING" = "yes" ; then
|
||||
CPPFLAGS="-DCHECK_JPEG_YCBCR_SUBSAMPLING $CPPFLAGS"
|
||||
fi
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/acorn/Makefile contrib/addtiffo/Makefile html/Makefile html/images/Makefile html/man/Makefile libtiff/Makefile man/Makefile port/Makefile tools/Makefile"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
|
||||
52
configure.ac
52
configure.ac
@ -79,7 +79,7 @@ AC_HEADER_TIME
|
||||
AC_STRUCT_TM
|
||||
|
||||
dnl Checks for library functions.
|
||||
AC_CHECK_FUNCS([floor gettimeofday isascii memmove memset munmap pow sqrt strcasecmp strchr strncasecmp strrchr strstr strtol])
|
||||
AC_CHECK_FUNCS([floor isascii memmove memset mmap pow sqrt strcasecmp strchr strncasecmp strrchr strstr strtol])
|
||||
|
||||
dnl Will use local replacements for unavailable functions
|
||||
AC_REPLACE_FUNCS(getopt)
|
||||
@ -89,7 +89,7 @@ AC_REPLACE_FUNCS(strtoul)
|
||||
AC_SYS_LARGEFILE
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Check the native cpu bit order
|
||||
dnl Check the native cpu bit order.
|
||||
dnl ---------------------------------------------------------------------------
|
||||
AC_MSG_CHECKING([native cpu bit order])
|
||||
case "$target_cpu" in
|
||||
@ -104,6 +104,13 @@ case "$target_cpu" in
|
||||
esac
|
||||
AC_DEFINE_UNQUOTED(HOST_FILLORDER, $HOST_FILLORDER, [Set the native cpu bit order])
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Set the floating point format.
|
||||
dnl FIXME: write appropriate test.
|
||||
dnl ---------------------------------------------------------------------------
|
||||
HAVE_IEEEFP=1
|
||||
AC_DEFINE_UNQUOTED(HAVE_IEEEFP, $HAVE_IEEEFP, [Define as 0 or 1 according to the floating point format suported by the machine])
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Switch on/off internal codecs.
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@ -316,6 +323,47 @@ fi
|
||||
AM_CONDITIONAL(HAVE_OPENGL, test "$HAVE_OPENGL" = "yes")
|
||||
AC_SUBST(OPENGL_LIBS)
|
||||
|
||||
dnl ===========================================================================
|
||||
dnl ``Orthogonal Features''
|
||||
dnl ===========================================================================
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Default handling of strip chopping support.
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
HAVE_STRIPCHOP=yes
|
||||
|
||||
AC_ARG_ENABLE(strip-chopping, AS_HELP_STRING([--disable-strip-chopping], [disable support for strip chopping (whether or not to convert single-strip uncompressed images to mutiple strips of ~8Kb to reduce memory usage)]), [HAVE_STRIPCHOP=no], [HAVE_STRIPCHOP=yes])
|
||||
|
||||
if test "$HAVE_STRIPCHOP" = "yes" ; then
|
||||
CPPFLAGS="-DSTRIPCHOP_DEFAULT=TIFF_STRIPCHOP $CPPFLAGS"
|
||||
fi
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Default handling of ASSOCALPHA support.
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
HAVE_EXTRASAMPLE_AS_ALPHA=yes
|
||||
|
||||
AC_ARG_ENABLE(extrasample-as-alpha, AS_HELP_STRING([--disable-extrasample-as-alpha], [the RGBA interface will treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many packages produce RGBA files but don't mark the alpha properly]), [HAVE_EXTRASAMPLE_AS_ALPHA=no], [HAVE_EXTRASAMPLE_AS_ALPHA=yes])
|
||||
|
||||
if test "$HAVE_EXTRASAMPLE_AS_ALPHA" = "yes" ; then
|
||||
CPPFLAGS="-DDEFAULT_EXTRASAMPLE_AS_ALPHA $CPPFLAGS"
|
||||
fi
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Default handling of YCbCr subsampling support.
|
||||
dnl See Bug 168 in Bugzilla, and JPEGFixupTestSubsampling() for details.
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
CHECK_JPEG_YCBCR_SUBSAMPLING=yes
|
||||
|
||||
AC_ARG_ENABLE(check-ycbcr-subsampling, AS_HELP_STRING([--disable-check-ycbcr-subsampling], [disable picking up YCbCr subsampling info from the JPEG data stream to support files lacking the tag]), [CHECK_JPEG_YCBCR_SUBSAMPLING=no], [CHECK_JPEG_YCBCR_SUBSAMPLING=yes])
|
||||
|
||||
if test "$CHECK_JPEG_YCBCR_SUBSAMPLING" = "yes" ; then
|
||||
CPPFLAGS="-DCHECK_JPEG_YCBCR_SUBSAMPLING $CPPFLAGS"
|
||||
fi
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
AC_CONFIG_FILES([Makefile \
|
||||
|
||||
@ -12,8 +12,9 @@
|
||||
/* Define to 1 if you have the `getopt' function. */
|
||||
#undef HAVE_GETOPT
|
||||
|
||||
/* Define to 1 if you have the `gettimeofday' function. */
|
||||
#undef HAVE_GETTIMEOFDAY
|
||||
/* Define as 0 or 1 according to the floating point format suported by the
|
||||
machine */
|
||||
#undef HAVE_IEEEFP
|
||||
|
||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
#undef HAVE_INTTYPES_H
|
||||
@ -42,8 +43,8 @@
|
||||
/* Define to 1 if you have the `memset' function. */
|
||||
#undef HAVE_MEMSET
|
||||
|
||||
/* Define to 1 if you have the `munmap' function. */
|
||||
#undef HAVE_MUNMAP
|
||||
/* Define to 1 if you have the `mmap' function. */
|
||||
#undef HAVE_MMAP
|
||||
|
||||
/* Define to 1 if you have the `pow' function. */
|
||||
#undef HAVE_POW
|
||||
|
||||
@ -1,10 +1,27 @@
|
||||
/* Define to 1 if you have the <unistd.h> header file. */
|
||||
/* #undef HAVE_UNISTD_H */
|
||||
|
||||
/* Define to 1 if you have the <fcntl.h> header file. */
|
||||
#define HAVE_FCNTL_H 1
|
||||
|
||||
/* Define as 0 or 1 according to the floating point format suported by the
|
||||
machine */
|
||||
#define HAVE_IEEEFP 1
|
||||
|
||||
/* Define to 1 if you have the <sys/types.h> header file. */
|
||||
#define HAVE_SYS_TYPES_H 1
|
||||
|
||||
/* Define to 1 if you have the <io.h> header file. */
|
||||
#define HAVE_IO_H 1
|
||||
|
||||
/* Redefine functions from the <io.h> as normal ones */
|
||||
#define lseek _lseek
|
||||
#define open _open
|
||||
#define close _close
|
||||
#define read _read
|
||||
|
||||
/* Set the native cpu bit order */
|
||||
#define HOST_FILLORDER FILLORDER_LSB2MSB
|
||||
|
||||
/* Define to 1 if your processor stores words with the most significant byte
|
||||
first (like Motorola and SPARC, unlike Intel and VAX). */
|
||||
/* #undef WORDS_BIGENDIAN */
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_getimage.c,v 1.36 2003-12-21 22:13:14 dron Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_getimage.c,v 1.37 2004-04-20 14:22:21 dron Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991-1997 Sam Leffler
|
||||
@ -262,7 +262,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int stop, char emsg[1024])
|
||||
}
|
||||
}
|
||||
|
||||
#if DEFAULT_EXTRASAMPLE_AS_ALPHA == 1
|
||||
#ifdef DEFAULT_EXTRASAMPLE_AS_ALPHA
|
||||
if( !TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &img->photometric))
|
||||
img->photometric = PHOTOMETRIC_MINISWHITE;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_jpeg.c,v 1.19 2004-04-06 08:42:30 dron Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_jpeg.c,v 1.20 2004-04-20 14:21:58 dron Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994-1997 Sam Leffler
|
||||
@ -1446,7 +1446,7 @@ JPEGVSetField(TIFF* tif, ttag_t tag, va_list ap)
|
||||
static void
|
||||
JPEGFixupTestSubsampling( TIFF * tif )
|
||||
{
|
||||
#if CHECK_JPEG_YCBCR_SUBSAMPLING == 1
|
||||
#ifdef CHECK_JPEG_YCBCR_SUBSAMPLING
|
||||
JPEGState *sp = JState(tif);
|
||||
TIFFDirectory *td = &tif->tif_dir;
|
||||
|
||||
@ -1477,7 +1477,7 @@ JPEGFixupTestSubsampling( TIFF * tif )
|
||||
|
||||
TIFFSetField( tif, TIFFTAG_YCBCRSUBSAMPLING,
|
||||
(uint16) sp->h_sampling, (uint16) sp->v_sampling );
|
||||
#endif /* CHECK_JPEG_YCBCR_SUBSAMPLING == 1 */
|
||||
#endif /* CHECK_JPEG_YCBCR_SUBSAMPLING */
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
@ -1,91 +0,0 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/tiffconf.h,v 1.12 2004-04-16 08:13:44 dron Exp $ */
|
||||
/*
|
||||
* Copyright (c) 1988-1997 Sam Leffler
|
||||
* Copyright (c) 1991-1997 Silicon Graphics, Inc.
|
||||
*
|
||||
* Permission to use, copy, modify, distribute, and sell this software and
|
||||
* its documentation for any purpose is hereby granted without fee, provided
|
||||
* that (i) the above copyright notices and this permission notice appear in
|
||||
* all copies of the software and related documentation, and (ii) the names of
|
||||
* Sam Leffler and Silicon Graphics may not be used in any advertising or
|
||||
* publicity relating to the software without the specific, prior written
|
||||
* permission of Sam Leffler and Silicon Graphics.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
|
||||
* WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*
|
||||
* IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
|
||||
* ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
|
||||
* OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
|
||||
* WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
|
||||
* LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
|
||||
* OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef _TIFFCONF_
|
||||
#define _TIFFCONF_
|
||||
/*
|
||||
* Library Configuration Definitions.
|
||||
*
|
||||
* This file defines the default configuration for the library.
|
||||
* If the target system does not have make or a way to specify
|
||||
* #defines on the command line, this file can be edited to
|
||||
* configure the library. Otherwise, one can override portability
|
||||
* and configuration-related definitions from a Makefile or command
|
||||
* line by defining COMPRESSION_SUPPORT (see below).
|
||||
*/
|
||||
|
||||
/*
|
||||
* General portability-related defines:
|
||||
*
|
||||
* HAVE_IEEEFP define as 0 or 1 according to the floating point
|
||||
* format suported by the machine
|
||||
* HAVE_MMAP enable support for memory mapping read-only files;
|
||||
* this is typically deduced by the configure script
|
||||
*/
|
||||
#ifndef HAVE_IEEEFP
|
||||
#define HAVE_IEEEFP 1
|
||||
#endif
|
||||
|
||||
/*
|
||||
* ``Orthogonal Features''
|
||||
*
|
||||
* STRIPCHOP_DEFAULT default handling of strip chopping support (whether
|
||||
* or not to convert single-strip uncompressed images
|
||||
* to mutiple strips of ~8Kb--to reduce memory use)
|
||||
* DEFAULT_EXTRASAMPLE_AS_ALPHA
|
||||
* The RGBA interface will treat a fourth sample with
|
||||
* no EXTRASAMPLE_ value as being ASSOCALPHA. Many
|
||||
* packages produce RGBA files but don't mark the alpha
|
||||
* properly.
|
||||
* CHECK_JPEG_YCBCR_SUBSAMPLING
|
||||
* Enable picking up YCbCr subsampling info from the
|
||||
* JPEG data stream to support files lacking the tag.
|
||||
* See Bug 168 in Bugzilla, and JPEGFixupTestSubsampling()
|
||||
* for details.
|
||||
*/
|
||||
#ifndef STRIPCHOP_DEFAULT
|
||||
#define STRIPCHOP_DEFAULT TIFF_STRIPCHOP /* default is to enable */
|
||||
#endif
|
||||
#ifndef DEFAULT_EXTRASAMPLE_AS_ALPHA
|
||||
#define DEFAULT_EXTRASAMPLE_AS_ALPHA 1
|
||||
#endif
|
||||
#ifndef CHECK_JPEG_YCBCR_SUBSAMPLING
|
||||
#define CHECK_JPEG_YCBCR_SUBSAMPLING 1
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Feature support definitions.
|
||||
* XXX: These macros are obsoleted. Don't use them in your apps!
|
||||
* Macros stays here for backward compatibility and should be always defined.
|
||||
*/
|
||||
#define SUBIFD_SUPPORT
|
||||
#define COLORIMETRY_SUPPORT
|
||||
#define YCBCR_SUPPORT
|
||||
#define CMYK_SUPPORT
|
||||
#define ICC_SUPPORT
|
||||
#define PHOTOSHOP_SUPPORT
|
||||
#define IPTC_SUPPORT
|
||||
|
||||
#endif /* _TIFFCONF_ */
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Id: tiffiop.h,v 1.14 2004-04-20 11:04:14 dron Exp $ */
|
||||
/* $Id: tiffiop.h,v 1.15 2004-04-20 14:25:21 dron Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988-1997 Sam Leffler
|
||||
@ -37,11 +37,9 @@
|
||||
*/
|
||||
#if defined(_MSC_VER)
|
||||
# include "config.h.vc"
|
||||
# include "tiffconf.h"
|
||||
# include "tiffcomp.h"
|
||||
#else
|
||||
# include "config.h"
|
||||
# include "tiffconf.h"
|
||||
#endif
|
||||
|
||||
#if HAVE_FCNTL_H
|
||||
|
||||
55
nmake.opt
55
nmake.opt
@ -1,4 +1,4 @@
|
||||
# $Id: nmake.opt,v 1.2 2004-04-16 08:12:54 dron Exp $
|
||||
# $Id: nmake.opt,v 1.3 2004-04-20 14:23:10 dron Exp $
|
||||
#
|
||||
# Copyright (C) 2004, Andrey Kiselev <dron@remotesensing.org>
|
||||
#
|
||||
@ -74,6 +74,25 @@ LOGLUV_SUPPORT = 1
|
||||
#
|
||||
#PIXARLOG_SUPPORT = 1
|
||||
|
||||
#
|
||||
# Comment out the following lines to disable strip chopping
|
||||
# (whether or not to convert single-strip uncompressed images to mutiple
|
||||
# strips of ~8Kb to reduce memory usage)
|
||||
#
|
||||
STRIPCHOP_SUPPORT = 1
|
||||
|
||||
#
|
||||
# Comment out the following lines to disable treating the fourth sample with
|
||||
# no EXTRASAMPLE_ value as being ASSOCALPHA. Many packages produce RGBA
|
||||
# files but don't mark the alpha properly.
|
||||
EXTRASAMPLE_AS_ALPHA_SUPPORT = 1
|
||||
|
||||
#
|
||||
# Comment out the following lines to disable picking up YCbCr subsampling
|
||||
# info from the JPEG data stream to support files lacking the tag.
|
||||
# See Bug 168 in Bugzilla, and JPEGFixupTestSubsampling() for details.
|
||||
CHECK_JPEG_YCBCR_SUBSAMPLING = 1
|
||||
|
||||
#
|
||||
########### There is nothing to edit below this line normally. ###########
|
||||
#
|
||||
@ -86,46 +105,58 @@ EXTRAFLAGS =
|
||||
LIBS =
|
||||
|
||||
# Set the native cpu bit order
|
||||
EXTRAFLAGS = $(EXTRAFLAGS) -DFILLODER_LSB2MSB
|
||||
EXTRAFLAGS = -DFILLODER_LSB2MSB $(EXTRAFLAGS)
|
||||
|
||||
# Codec stuff
|
||||
!IFDEF CCITT_SUPPORT
|
||||
EXTRAFLAGS = $(EXTRAFLAGS) -DCCITT_SUPPORT
|
||||
EXTRAFLAGS = -DCCITT_SUPPORT $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF PACKBITS_SUPPORT
|
||||
EXTRAFLAGS = $(EXTRAFLAGS) -DPACKBITS_SUPPORT
|
||||
EXTRAFLAGS = -DPACKBITS_SUPPORT $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF LZW_SUPPORT
|
||||
EXTRAFLAGS = $(EXTRAFLAGS) -DLZW_SUPPORT
|
||||
EXTRAFLAGS = -DLZW_SUPPORT $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF THUNDER_SUPPORT
|
||||
EXTRAFLAGS = $(EXTRAFLAGS) -DTHUNDER_SUPPORT
|
||||
EXTRAFLAGS = -DTHUNDER_SUPPORT $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF NEXT_SUPPORT
|
||||
EXTRAFLAGS = $(EXTRAFLAGS) -DNEXT_SUPPORT
|
||||
EXTRAFLAGS = -DNEXT_SUPPORT $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF LOGLUV_SUPPORT
|
||||
EXTRAFLAGS = $(EXTRAFLAGS) -DLOGLUV_SUPPORT
|
||||
EXTRAFLAGS = -DLOGLUV_SUPPORT $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF JPEG_SUPPORT
|
||||
LIBS = $(LIBS) $(JPEG_LIB)
|
||||
EXTRAFLAGS = $(EXTRAFLAGS) -DJPEG_SUPPORT
|
||||
EXTRAFLAGS = -DJPEG_SUPPORT $(EXTRAFLAGS)
|
||||
!IFDEF OJPEG_SUPPORT
|
||||
EXTRAFLAGS = $(EXTRAFLAGS) -DOJPEG_SUPPORT
|
||||
EXTRAFLAGS = -DOJPEG_SUPPORT $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
!IFDEF ZIP_SUPPORT
|
||||
LIBS = $(LIBS) $(ZLIB_LIB)
|
||||
EXTRAFLAGS = $(EXTRAFLAGS) -DZIP_SUPPORT
|
||||
EXTRAFLAGS = -DZIP_SUPPORT $(EXTRAFLAGS)
|
||||
!IFDEF PIXARLOG_SUPPORT
|
||||
EXTRAFLAGS = $(EXTRAFLAGS) -DPIXARLOG_SUPPORT
|
||||
EXTRAFLAGS = -DPIXARLOG_SUPPORT $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
!IFDEF STRIPCHOP_SUPPORT
|
||||
EXTRAFLAGS = -DSTRIPCHOP_DEFAULT=TIFF_STRIPCHOP $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF EXTRASAMPLE_AS_ALPHA_SUPPORT
|
||||
EXTRAFLAGS = -DDEFAULT_EXTRASAMPLE_AS_ALPHA $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IFDEF CHECK_JPEG_YCBCR_SUBSAMPLING
|
||||
EXTRAFLAGS = -DCHECK_JPEG_YCBCR_SUBSAMPLING $(EXTRAFLAGS)
|
||||
!ENDIF
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user