tiff-3.6.1-gnuwin32.diffs

tiff文件开发库

diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'tiff-3.6.1-orig*' tiff-3.6.1-orig/config.site tiff-3.6.1/config.site
*** tiff-3.6.1-orig/config.site	Sat Oct 12 15:52:46 2002
--- tiff-3.6.1/config.site	Sat Jan  3 15:22:31 2004
***************
*** 41,62 ****
  # Package controls.
  #
  #DSO="auto"			# auto|IRIX|IRIX52 enable DSO support for system
! #JPEG="yes"			# yes|no configure JPEG support (see below)
! #ZIP="yes"			# yes|no configure Deflate support (see below)
  #LIBGL="auto"			# yes|no|auto configure IRIS GL-based tools
  #LIBIMAGE="auto"		# yes|no|auto configure SGI RGB image tools
! #HTML="yes"			# yes|no install HTML documentation
  
  #NONINTERACTIVE=yes		# yes|no Don't ask for confirmation on console
  
  #
  # Directory parameters.
  #
! #DIR_BIN="/usr/local/bin"		# directory for tools
! #DIR_LIB="/usr/local/lib"		# directory for libraries
! #DIR_INC="/usr/local/include"		# directory for include files
! #DIR_MAN="/usr/local/man"		# directory for manual pages
! #DIR_HTML="/var/httpd/htdocs/tiff"	# directory for HTML documentation
  
  #
  # Configuring supporting libraries.
--- 41,62 ----
  # Package controls.
  #
  #DSO="auto"			# auto|IRIX|IRIX52 enable DSO support for system
! JPEG="yes"			# yes|no configure JPEG support (see below)
! ZIP="yes"			# yes|no configure Deflate support (see below)
  #LIBGL="auto"			# yes|no|auto configure IRIS GL-based tools
  #LIBIMAGE="auto"		# yes|no|auto configure SGI RGB image tools
! HTML="yes"			# yes|no install HTML documentation
  
  #NONINTERACTIVE=yes		# yes|no Don't ask for confirmation on console
  
  #
  # Directory parameters.
  #
! DIR_BIN="c:/progra~1/Tiff/bin"		# directory for tools
! DIR_LIB="c:/progra~1/Tiff/lib"		# directory for libraries
! DIR_INC="c:/progra~1/Tiff/include"		# directory for include files
! DIR_MAN="c:/progra~1/Tiff/man"		# directory for manual pages
! DIR_HTML="c:/progra~1/Tiff/doc"	# directory for HTML documentation
  
  #
  # Configuring supporting libraries.
***************
*** 124,131 ****
  # Miscellaneous parameters.
  #
  #FILLORDER="MS2LSB"			# bit order of cpu (MSB2LSB/LSB2MSB)
! #MANSCHEME="sysv-source-cat-strip"	# manual page installation scheme
! #LARGEFILE="yes"			# support for large (>2GiB) files
  
  #
  # Parameters used when building the software.
--- 124,131 ----
  # Miscellaneous parameters.
  #
  #FILLORDER="MS2LSB"			# bit order of cpu (MSB2LSB/LSB2MSB)
! MANSCHEME="sysv-source-cat-strip"	# manual page installation scheme
! LARGEFILE="yes"			# support for large (>2GiB) files
  
  #
  # Parameters used when building the software.
***************
*** 145,151 ****
  #OPTIMIZER="-O"				# Optimization options for compiler
  #LDFLAGS="-Wl,-O"                       # Special linker flags.
  #LIBPORT='${PORT}/libport.a'		# library with emulation code
! #MACHDEPLIBS="-lm"			# extra libraries for linking
  #PORTFUNCS=""				# non-standard functions to emulate
  #RANLIB=":"				# pathname of suitable ranlib program
  #DSOSUF="so"				# DSO filename suffix
--- 145,151 ----
  #OPTIMIZER="-O"				# Optimization options for compiler
  #LDFLAGS="-Wl,-O"                       # Special linker flags.
  #LIBPORT='${PORT}/libport.a'		# library with emulation code
! MACHDEPLIBS="-lstdbin -lbinmode -lgw32c -lole32 -luuid"			# extra libraries for linking
  #PORTFUNCS=""				# non-standard functions to emulate
  #RANLIB=":"				# pathname of suitable ranlib program
  #DSOSUF="so"				# DSO filename suffix
***************
*** 164,174 ****
  #
  # General system stuff used by the distribution.
  #
! #CHMOD="/etc/chmod"			# pathname of suitable chmod program
! #INSTALL='${SHELL} ${PORT}/install.sh'	# SGI install program/emulator
! #LN="/bin/ln"				# pathname of suitable ln program
! #LN_S="-s"				# option to ${LN} to create symlink
! #MV_F="-f"				# option to ${MV} to force operation
! #SED="/bin/sed"				# pathname of suitable sed program
! #SCRIPT_SH="/bin/sh"			# pathname of suitable shell
! #STRIP="/bin/strip"			# strip program used by install.sh
--- 164,174 ----
  #
  # General system stuff used by the distribution.
  #
! CHMOD="chmod"			# pathname of suitable chmod program
! #INSTALL='${SHELL} ${PORT}/install.sh'  # SGI install program/emulator
! LN="cp -fp"				# pathname of suitable ln program
! LN_S=""				# option to ${LN} to create symlink
! MV_F="-f"				# option to ${MV} to force operation
! SED="/bin/sed.exe"				# pathname of suitable sed program
! SCRIPT_SH="/bin/sh.exe"			# pathname of suitable shell
! STRIP="strip"			# strip program used by install.sh
diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'tiff-3.6.1-orig*' tiff-3.6.1-orig/libtiff/tiffcomp.h tiff-3.6.1/libtiff/tiffcomp.h
*** tiff-3.6.1-orig/libtiff/tiffcomp.h	Tue Oct 14 14:06:22 2003
--- tiff-3.6.1/libtiff/tiffcomp.h	Sun Dec 28 19:06:21 2003
***************
*** 83,89 ****
  #include <stdlib.h>
  #define	BSDTYPES
  #define	HAVE_UNISTD_H	0
! #elif (defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows) || defined(_WIN32)) && !defined(unix)
  #define	BSDTYPES
  #elif defined(OS2_16) || defined(OS2_32)
  #define	BSDTYPES
--- 83,89 ----
  #include <stdlib.h>
  #define	BSDTYPES
  #define	HAVE_UNISTD_H	0
! #elif (defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows) || defined(_WIN32)) && !defined(unix) && !defined(__GW32__)
  #define	BSDTYPES
  #elif defined(OS2_16) || defined(OS2_32)
  #define	BSDTYPES
diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'tiff-3.6.1-orig*' tiff-3.6.1-orig/libtiff/tiffio.h tiff-3.6.1/libtiff/tiffio.h
*** tiff-3.6.1-orig/libtiff/tiffio.h	Tue Dec 23 10:19:22 2003
--- tiff-3.6.1/libtiff/tiffio.h	Sat Jan  3 15:21:13 2004
***************
*** 80,85 ****
--- 80,86 ----
   */
  
  #if defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)
+ #  define BINMODE "b"
  #  if !defined(__CYGWIN) && !defined(AVOID_WIN32_FILEIO) && !defined(USE_WIN32_FILIO)
  #    define USE_WIN32_FILEIO
  #  endif
diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'tiff-3.6.1-orig*' tiff-3.6.1-orig/port/install.sh.in tiff-3.6.1/port/install.sh.in
*** tiff-3.6.1-orig/port/install.sh.in	Mon Nov  3 13:37:00 2003
--- tiff-3.6.1/port/install.sh.in	Sun Dec 28 19:06:21 2003
***************
*** 79,85 ****
  Suggested=no
  Updated=no
  
! CMD=cp
  SRC=
  FILES=
  DESTDIR=
--- 79,85 ----
  Suggested=no
  Updated=no
  
! CMD="cp -fp"
  SRC=
  FILES=
  DESTDIR=
diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'tiff-3.6.1-orig*' tiff-3.6.1-orig/tools/fax2ps.c tiff-3.6.1/tools/fax2ps.c
*** tiff-3.6.1-orig/tools/fax2ps.c	Sat Oct  4 14:43:18 2003
--- tiff-3.6.1/tools/fax2ps.c	Sun Dec 28 19:06:21 2003
***************
*** 375,383 ****
  	FILE* fd;
  	char temp[1024], buf[16*1024];
  
! 	strcpy(temp, "/tmp/fax2psXXXXXX");
! 	(void) mktemp(temp);
! 	fd = fopen(temp, "w");
  	if (fd == NULL) {
  	    fprintf(stderr, "Could not create temp file \"%s\"\n", temp);
  	    exit(-2);
--- 375,383 ----
  	FILE* fd;
  	char temp[1024], buf[16*1024];
  
! 	strcpy(temp, "fax2psXXXXXX");
! 	n = mkstemp(temp);
! 	fd = fdopen(n, "w");
  	if (fd == NULL) {
  	    fprintf(stderr, "Could not create temp file \"%s\"\n", temp);
  	    exit(-2);
diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'tiff-3.6.1-orig*' tiff-3.6.1-orig/tools/fax2tiff.c tiff-3.6.1/tools/fax2tiff.c
*** tiff-3.6.1-orig/tools/fax2tiff.c	Thu May 29 11:10:36 2003
--- tiff-3.6.1/tools/fax2tiff.c	Sat Jan  3 13:17:25 2004
***************
*** 194,200 ****
  	rowbuf = _TIFFmalloc(TIFFhowmany(xsize,8));
  	refbuf = _TIFFmalloc(TIFFhowmany(xsize,8));
  	if (rowbuf == NULL || refbuf == NULL) {
! 		fprintf(stderr, "%s: Not enough memory\n", argv[0]);
  		return (EXIT_FAILURE);
  	}
  
--- 194,200 ----
  	rowbuf = _TIFFmalloc(TIFFhowmany(xsize,8));
  	refbuf = _TIFFmalloc(TIFFhowmany(xsize,8));
  	if (rowbuf == NULL || refbuf == NULL) {
! 		fprintf(stderr, "%s: Not enough memory (main)\n", argv[0]);
  		return (EXIT_FAILURE);
  	}
  
***************
*** 243,248 ****
--- 243,251 ----
  			continue;
  		}
  		faxTIFF->tif_fd = fileno(in);
+ #ifdef USE_WIN32_FILEIO
+ 		faxTIFF->tif_fd = _get_osfhandle(faxTIFF->tif_fd);
+ #endif /* USE_WIN32_FILEIO */
  		faxTIFF->tif_clientdata = (thandle_t) faxTIFF->tif_fd;
  		faxTIFF->tif_name = argv[optind];
  		TIFFSetField(out, TIFFTAG_IMAGEWIDTH, xsize);
***************
*** 323,329 ****
  	tifin->tif_rawdatasize = TIFFGetFileSize(tifin);
  	tifin->tif_rawdata = _TIFFmalloc(tifin->tif_rawdatasize);
  	if (tifin->tif_rawdata == NULL) {
! 		TIFFError(tifin->tif_name, "%s: Not enough memory");
  		return (0);
  	}
  	if (!ReadOK(tifin, tifin->tif_rawdata, tifin->tif_rawdatasize)) {
--- 326,333 ----
  	tifin->tif_rawdatasize = TIFFGetFileSize(tifin);
  	tifin->tif_rawdata = _TIFFmalloc(tifin->tif_rawdatasize);
  	if (tifin->tif_rawdata == NULL) {
! 		printf ("tifin->tif_rawdatasize: %ld\n", tifin->tif_rawdatasize);
! 		TIFFError(tifin->tif_name, "%s: Not enough memory (copyFaxFile)");
  		return (0);
  	}
  	if (!ReadOK(tifin, tifin->tif_rawdata, tifin->tif_rawdatasize)) {
diff -cr -x config.log -x config.status -x config.cache -x '*.Po' -x '*.pot' -I 'tiff-3.6.1-orig*' tiff-3.6.1-orig/tools/tiff2pdf.c tiff-3.6.1/tools/tiff2pdf.c
*** tiff-3.6.1-orig/tools/tiff2pdf.c	Tue Dec  2 14:06:42 2003
--- tiff-3.6.1/tools/tiff2pdf.c	Sun Dec 28 19:18:03 2003
***************
*** 695,701 ****
  			TCHAR temppath[MAX_PATH];
  			TCHAR tempfile[MAX_PATH];
  			GetTempPath((DWORD)MAX_PATH, (LPTSTR)temppath);
! 			GetTempFileName((LPCTSTR)temppath, (LPTSTR) __T("t2p"), 0, (LPTSTR)tempfile);
  			output = TIFFFdOpen( (int)CreateFile(
  				(LPCTSTR)tempfile, 
  				GENERIC_WRITE, 
--- 695,701 ----
  			TCHAR temppath[MAX_PATH];
  			TCHAR tempfile[MAX_PATH];
  			GetTempPath((DWORD)MAX_PATH, (LPTSTR)temppath);
! 			GetTempFileName((LPCTSTR)temppath, (LPTSTR) _T("t2p"), 0, (LPTSTR)tempfile);
  			output = TIFFFdOpen( (int)CreateFile(
  				(LPCTSTR)tempfile, 
  				GENERIC_WRITE,