From ab000523ed98b5bc14beb1dfbbfbfc85119b6cf0 Mon Sep 17 00:00:00 2001 From: Andrey Kiselev Date: Fri, 7 Oct 2005 17:27:09 +0000 Subject: [PATCH] Make the default strip size configurable via the --with-default-strip-size and STRIP_SIZE_DEFAULT options --- configure | 91 ++++++++++++++++++++++++++++++++-------------------- configure.ac | 14 ++++++-- nmake.opt | 8 +++-- 3 files changed, 73 insertions(+), 40 deletions(-) diff --git a/configure b/configure index 042094dc..f5f2c0a0 100755 --- a/configure +++ b/configure @@ -1065,7 +1065,8 @@ Optional Features: --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) + mutiple strips of specified size to reduce memory + usage) --disable-extrasample-as-alpha the RGBA interface will treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many @@ -1093,6 +1094,9 @@ Optional Packages: --with-x use the X Window System --with-apple-opengl-framework use Apple OpenGL framework (Mac OS X only) + --with-default-strip-size=SIZE + default size of the strip in bytes (when strip + chopping enabled) [default=8192] Some influential environment variables: CC C compiler command @@ -4084,7 +4088,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4087 "configure"' > conftest.$ac_ext + echo '#line 4091 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5655,7 +5659,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5658:" \ +echo "$as_me:5662:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6755,11 +6759,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6758: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6762: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6762: \$? = $ac_status" >&5 + echo "$as_me:6766: \$? = $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 other than the usual output. @@ -7017,11 +7021,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7020: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7024: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7024: \$? = $ac_status" >&5 + echo "$as_me:7028: \$? = $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 other than the usual output. @@ -7079,11 +7083,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7082: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7086: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7086: \$? = $ac_status" >&5 + echo "$as_me:7090: \$? = $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 @@ -9318,7 +9322,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11680: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11680: \$? = $ac_status" >&5 + echo "$as_me:11684: \$? = $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 other than the usual output. @@ -11735,11 +11739,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11738: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11742: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11742: \$? = $ac_status" >&5 + echo "$as_me:11746: \$? = $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 @@ -13105,7 +13109,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:14095: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14095: \$? = $ac_status" >&5 + echo "$as_me:14099: \$? = $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 other than the usual output. @@ -14150,11 +14154,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14153: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14157: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14157: \$? = $ac_status" >&5 + echo "$as_me:14161: \$? = $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 @@ -16282,11 +16286,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16285: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16289: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16289: \$? = $ac_status" >&5 + echo "$as_me:16293: \$? = $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 other than the usual output. @@ -16544,11 +16548,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16547: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16551: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16551: \$? = $ac_status" >&5 + echo "$as_me:16555: \$? = $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 other than the usual output. @@ -16606,11 +16610,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16609: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16613: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16613: \$? = $ac_status" >&5 + echo "$as_me:16617: \$? = $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 @@ -18845,7 +18849,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -23813,7 +23817,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi @@ -23827,18 +23831,18 @@ if test "$ac_x_libraries" = no; then # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" + LIBS="-lX11 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } @@ -23876,7 +23880,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do - if test -r $ac_dir/libXt.$ac_extension; then + if test -r $ac_dir/libX11.$ac_extension; then ac_x_libraries=$ac_dir break 2 fi @@ -26085,12 +26089,29 @@ else HAVE_STRIPCHOP=yes fi; +# Check whether --with-default-strip-size or --without-default-strip-size was given. +if test "${with_default_strip_size+set}" = set; then + withval="$with_default_strip_size" + +fi; + if test "$HAVE_STRIPCHOP" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define STRIPCHOP_DEFAULT TIFF_STRIPCHOP _ACEOF + + if test "x$with_default_strip_size" == "x" ; then + with_default_strip_size="8192" + fi + + +cat >>confdefs.h <<_ACEOF +#define STRIP_SIZE_DEFAULT $with_default_strip_size +_ACEOF + + fi diff --git a/configure.ac b/configure.ac index 6055594f..f930ebf3 100644 --- a/configure.ac +++ b/configure.ac @@ -432,11 +432,21 @@ dnl --------------------------------------------------------------------------- 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)]), + [disable support for strip chopping (whether or not to convert single-strip uncompressed images to mutiple strips of specified size to reduce memory usage)]), [HAVE_STRIPCHOP=$enableval], [HAVE_STRIPCHOP=yes]) +AC_ARG_WITH(default-strip-size, + AS_HELP_STRING([--with-default-strip-size=SIZE], + [default size of the strip in bytes (when strip chopping enabled) [[default=8192]]]),,) if test "$HAVE_STRIPCHOP" = "yes" ; then - AC_DEFINE(STRIPCHOP_DEFAULT,TIFF_STRIPCHOP,[Support strip chopping (whether or not to convert single-strip uncompressed images to mutiple strips of ~8Kb to reduce memory usage)]) + AC_DEFINE(STRIPCHOP_DEFAULT,TIFF_STRIPCHOP,[Support strip chopping (whether or not to convert single-strip uncompressed images to mutiple strips of specified size to reduce memory usage)]) + + if test "x$with_default_strip_size" == "x" ; then + with_default_strip_size="8192" + fi + + AC_DEFINE_UNQUOTED(STRIP_SIZE_DEFAULT,$with_default_strip_size,[Default size of the strip in bytes (when strip chopping enabled)]) + fi dnl --------------------------------------------------------------------------- diff --git a/nmake.opt b/nmake.opt index 93bb5b99..73bd3316 100644 --- a/nmake.opt +++ b/nmake.opt @@ -1,4 +1,4 @@ -# $Id: nmake.opt,v 1.13 2005-03-17 14:38:54 dron Exp $ +# $Id: nmake.opt,v 1.14 2005-10-07 17:27:10 dron Exp $ # # Copyright (C) 2004, Andrey Kiselev # @@ -83,9 +83,11 @@ LOGLUV_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) +# strips of specified size to reduce memory usage). Default strip size +# is 8192 bytes, it can be configured via the STRIP_SIZE_DEFAULT parameter # STRIPCHOP_SUPPORT = 1 +STRIP_SIZE_DEFAULT = 8192 # # Comment out the following lines to disable treating the fourth sample with @@ -194,7 +196,7 @@ EXTRAFLAGS = -DPIXARLOG_SUPPORT $(EXTRAFLAGS) !ENDIF !IFDEF STRIPCHOP_SUPPORT -EXTRAFLAGS = -DSTRIPCHOP_DEFAULT=TIFF_STRIPCHOP $(EXTRAFLAGS) +EXTRAFLAGS = -DSTRIPCHOP_DEFAULT=TIFF_STRIPCHOP -DSTRIP_SIZE_DEFAULT=$(STRIP_SIZE_DEFAULT) $(EXTRAFLAGS) !ENDIF !IFDEF EXTRASAMPLE_AS_ALPHA_SUPPORT