diff options
| author | bfriesen <bfriesen> | 2011-12-22 17:07:57 +0000 |
|---|---|---|
| committer | bfriesen <bfriesen> | 2011-12-22 17:07:57 +0000 |
| commit | f56e4c4f68a590def16e71b828d50f172dbcc336 (patch) | |
| tree | aab8f0a8c92528bece4f45907285bff8531daa99 | |
| parent | 65c45c0f1ec5354b6748bc5286decab43a6680f2 (diff) | |
| download | libtiff-f56e4c4f68a590def16e71b828d50f172dbcc336.tar.gz | |
* libtiff/tif_win32.c: Eliminate some minor 64-bit warnings in
tif_win32.c. Patch by Edward Lam.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | libtiff/tif_win32.c | 6 |
2 files changed, 6 insertions, 3 deletions
@@ -1,5 +1,8 @@ 2011-12-22 Bob Friesenhahn <bfriesen@simple.dallas.tx.us> + * libtiff/tif_win32.c: Eliminate some minor 64-bit warnings in + tif_win32.c. Patch by Edward Lam. + * configure.ac: Add libtiff private dependency on -llzma for pkg-config. Patch by Mark Brand. Updated Automake to 1.11.2. diff --git a/libtiff/tif_win32.c b/libtiff/tif_win32.c index 804456e6..2cf1de93 100644 --- a/libtiff/tif_win32.c +++ b/libtiff/tif_win32.c @@ -1,4 +1,4 @@ -/* $Id: tif_win32.c,v 1.38 2011-02-09 18:05:00 fwarmerdam Exp $ */ +/* $Id: tif_win32.c,v 1.39 2011-12-22 17:07:57 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -377,7 +377,7 @@ Win32WarningHandler(const char* module, const char* fmt, va_list ap) LPCTSTR szTitleText = "%s Warning"; LPCTSTR szDefaultModule = "LIBTIFF"; LPCTSTR szTmpModule = (module == NULL) ? szDefaultModule : module; - int nBufSize = (strlen(szTmpModule) + + SIZE_T nBufSize = (strlen(szTmpModule) + strlen(szTitleText) + strlen(fmt) + 256)*sizeof(char); if ((szTitle = (LPTSTR)LocalAlloc(LMEM_FIXED, nBufSize)) == NULL) @@ -408,7 +408,7 @@ Win32ErrorHandler(const char* module, const char* fmt, va_list ap) LPCTSTR szTitleText = "%s Error"; LPCTSTR szDefaultModule = "LIBTIFF"; LPCTSTR szTmpModule = (module == NULL) ? szDefaultModule : module; - int nBufSize = (strlen(szTmpModule) + + SIZE_T nBufSize = (strlen(szTmpModule) + strlen(szTitleText) + strlen(fmt) + 256)*sizeof(char); if ((szTitle = (LPTSTR)LocalAlloc(LMEM_FIXED, nBufSize)) == NULL) |