diff options
Diffstat (limited to 'libtiff/tif_win32.c')
| -rw-r--r-- | libtiff/tif_win32.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/libtiff/tif_win32.c b/libtiff/tif_win32.c index b88495e0..9e141af7 100644 --- a/libtiff/tif_win32.c +++ b/libtiff/tif_win32.c @@ -1,4 +1,4 @@ -/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_win32.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */ +/* $Header: /cvsroot/osrs/libtiff/libtiff/tif_win32.c,v 1.3 1999/09/15 01:28:47 warmerda Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -83,7 +83,6 @@ _tiffSizeProc(thandle_t fd) return ((toff_t)GetFileSize(fd, NULL)); } -#pragma argsused static int _tiffDummyMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize) { @@ -120,7 +119,6 @@ _tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize) return(1); } -#pragma argsused static void _tiffDummyUnmapProc(thandle_t fd, tdata_t base, toff_t size) { @@ -176,7 +174,7 @@ TIFFOpen(const char* name, const char* mode) dwMode = OPEN_ALWAYS; break; case O_RDWR|O_CREAT: - dwMode = CREATE_NEW; + dwMode = OPEN_ALWAYS; break; case O_RDWR|O_TRUNC: dwMode = CREATE_ALWAYS; @@ -250,6 +248,7 @@ _TIFFmemcmp(const tdata_t p1, const tdata_t p2, tsize_t c) static void Win32WarningHandler(const char* module, const char* fmt, va_list ap) { +#ifndef TIF_PLATFORM_CONSOLE LPTSTR szTitle; LPTSTR szTmp; LPCTSTR szTitleText = "%s Warning"; @@ -264,12 +263,20 @@ Win32WarningHandler(const char* module, const char* fmt, va_list ap) MessageBox(GetFocus(), szTmp, szTitle, MB_OK | MB_ICONINFORMATION); LocalFree(szTitle); return; +#else + if (module != NULL) + fprintf(stderr, "%s: ", module); + fprintf(stderr, "Warning, "); + vfprintf(stderr, fmt, ap); + fprintf(stderr, ".\n"); +#endif } TIFFErrorHandler _TIFFwarningHandler = Win32WarningHandler; static void Win32ErrorHandler(const char* module, const char* fmt, va_list ap) { +#ifndef TIF_PLATFORM_CONSOLE LPTSTR szTitle; LPTSTR szTmp; LPCTSTR szTitleText = "%s Error"; @@ -284,5 +291,11 @@ Win32ErrorHandler(const char* module, const char* fmt, va_list ap) MessageBox(GetFocus(), szTmp, szTitle, MB_OK | MB_ICONEXCLAMATION); LocalFree(szTitle); return; +#else + if (module != NULL) + fprintf(stderr, "%s: ", module); + vfprintf(stderr, fmt, ap); + fprintf(stderr, ".\n"); +#endif } TIFFErrorHandler _TIFFerrorHandler = Win32ErrorHandler; |