diff --git a/libtiff/config.h.in b/libtiff/config.h.in index ab289d1c..9f2cacee 100644 --- a/libtiff/config.h.in +++ b/libtiff/config.h.in @@ -27,12 +27,6 @@ /* Define to 1 if you have the `c' library (-lc). */ #undef HAVE_LIBC -/* Define to 1 if you have the `gl' library (-lgl). */ -#undef HAVE_LIBGL - -/* Define to 1 if you have the `glut' library (-lglut). */ -#undef HAVE_LIBGLUT - /* Define to 1 if you have the `m' library (-lm). */ #undef HAVE_LIBM @@ -159,6 +153,12 @@ first (like Motorola and SPARC, unlike Intel and VAX). */ #undef WORDS_BIGENDIAN +/* Number of bits in a file offset, on hosts where this is settable. */ +#undef _FILE_OFFSET_BITS + +/* Define for large files, on AIX-style hosts. */ +#undef _LARGE_FILES + /* Define to empty if `const' does not conform to ANSI C. */ #undef const diff --git a/libtiff/makefile.vc b/libtiff/makefile.vc deleted file mode 100644 index d2a54b11..00000000 --- a/libtiff/makefile.vc +++ /dev/null @@ -1,101 +0,0 @@ -# -# Simple MS VC++ Makefile -# -# To build: -# C:\libtiff\libtiff> nmake /f makefile.vc all -# - -# -# Select _CONSOLE to build a library which reports errors to stderr, or -# _WINDOWED to build such that errors are reported via MessageBox(). -# -WINMODE = -DTIF_PLATFORM_CONSOLE -#WINMODE = -DTIF_PLATFORM_WINDOWED - -# Uncomment and edit following lines to enable JPEG support -#JPEG_SUPPORT = 1 -#JPEGDIR = d:/projects/jpeg-6b -#JPEG_LIB = $(JPEGDIR)/Release/jpeg.lib - -# Uncomment and edit following lines to enable ZIP support -# (required for Deflate compression) -#ZIP_SUPPORT = 1 -#ZLIBDIR = d:/projects/zlib-1.2.1 -#ZLIB_LIB = $(ZLIBDIR)/zlib.lib - -CC = cl -INCL = -I. -LIBS = -EXTRAFLAGS = - -!IFDEF JPEG_SUPPORT -INCL = $(INCL) -I$(JPEGDIR) -LIBS = $(LIBS) $(JPEG_LIB) -EXTRAFLAGS = $(EXTRAFLAGS) -DJPEG_SUPPORT -!ENDIF - -CFLAGS = /nologo /W3 $(INCL) $(WINMODE) $(EXTRAFLAGS) - -OBJ = \ - tif_aux.obj \ - tif_close.obj \ - tif_codec.obj \ - tif_color.obj \ - tif_compress.obj \ - tif_dir.obj \ - tif_dirinfo.obj \ - tif_dirread.obj \ - tif_dirwrite.obj \ - tif_dumpmode.obj \ - tif_error.obj \ - tif_extension.obj \ - tif_fax3.obj \ - fax3sm_winnt.obj \ - tif_getimage.obj \ - tif_jpeg.obj \ - tif_ojpeg.obj \ - tif_flush.obj \ - tif_luv.obj \ - tif_lzw.obj \ - tif_next.obj \ - tif_open.obj \ - tif_packbits.obj \ - tif_pixarlog.obj \ - tif_predict.obj \ - tif_print.obj \ - tif_read.obj \ - tif_swab.obj \ - tif_strip.obj \ - tif_thunder.obj \ - tif_tile.obj \ - tif_win32.obj \ - tif_version.obj \ - tif_warning.obj \ - tif_write.obj \ - tif_zip.obj - -VERSION = ..\VERSION -ALPHA = ..\dist\tiff.alpha - -default: libtiff.lib - -all: libtiff.lib libtiff.dll - -libtiff.lib: tiffvers.h $(OBJ) - lib /out:libtiff.lib $(OBJ) - -libtiff.dll: $(OBJ) - link /dll /def:libtiff.def /out:libtiff.dll /implib:libtiff_i.lib \ - $(OBJ) $(LIBS) - -tiffvers.h: $(VERSION) mkversion.c - $(CC) mkversion.c - if exist tiffvers.h del tiffvers.h - .\mkversion.exe -v $(VERSION) tiffvers.h - -clean: - del *.obj *.lib libtiff.dll - -tif_version.obj: tiffvers.h - - diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c index a1bca1b7..a422ec96 100644 --- a/libtiff/tif_print.c +++ b/libtiff/tif_print.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_print.c,v 1.12 2003-08-07 16:42:55 dron Exp $ */ +/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_print.c,v 1.13 2004-03-30 14:28:17 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -252,7 +252,6 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) fprintf(fd, " Sample to Nits conversion factor: %.4e\n", td->td_stonits); } -#ifdef CMYK_SUPPORT if (TIFFFieldSet(tif,FIELD_INKSET)) { fprintf(fd, " Ink Set: "); switch (td->td_inkset) { @@ -283,7 +282,6 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) td->td_dotrange[0], td->td_dotrange[1]); if (TIFFFieldSet(tif,FIELD_TARGETPRINTER)) _TIFFprintAsciiTag(fd, "Target Printer", td->td_targetprinter); -#endif if (TIFFFieldSet(tif,FIELD_THRESHHOLDING)) { fprintf(fd, " Thresholding: "); switch (td->td_threshholding) { @@ -317,7 +315,6 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) break; } } -#ifdef YCBCR_SUPPORT if (TIFFFieldSet(tif,FIELD_YCBCRSUBSAMPLING)) { /* @@ -352,7 +349,6 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) td->td_ycbcrcoeffs[0], td->td_ycbcrcoeffs[1], td->td_ycbcrcoeffs[2]); -#endif if (TIFFFieldSet(tif,FIELD_HALFTONEHINTS)) fprintf(fd, " Halftone Hints: light %u dark %u\n", td->td_halftonehints[0], td->td_halftonehints[1]); @@ -433,7 +429,6 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) } else fprintf(fd, "(present)\n"); } -#ifdef COLORIMETRY_SUPPORT if (TIFFFieldSet(tif,FIELD_WHITEPOINT)) fprintf(fd, " White Point: %g-%g\n", td->td_whitepoint[0], td->td_whitepoint[1]); @@ -466,30 +461,21 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) } else fprintf(fd, "(present)\n"); } -#endif -#ifdef ICC_SUPPORT if (TIFFFieldSet(tif,FIELD_ICCPROFILE)) fprintf(fd, " ICC Profile: , %lu bytes\n", (u_long) td->td_profileLength); -#endif -#ifdef PHOTOSHOP_SUPPORT if (TIFFFieldSet(tif,FIELD_PHOTOSHOP)) fprintf(fd, " Photoshop Data: , %lu bytes\n", (u_long) td->td_photoshopLength); -#endif -#ifdef IPTC_SUPPORT if (TIFFFieldSet(tif,FIELD_RICHTIFFIPTC)) fprintf(fd, " RichTIFFIPTC Data: , %lu bytes\n", (u_long) td->td_richtiffiptcLength); -#endif -#if SUBIFD_SUPPORT if (TIFFFieldSet(tif, FIELD_SUBIFD)) { fprintf(fd, " SubIFD Offsets:"); for (i = 0; i < td->td_nsubifd; i++) fprintf(fd, " %5lu", (long) td->td_subifd[i]); fputc('\n', fd); } -#endif /* ** Custom tag support. */