Thread

2011.12.22 14:46 "[Tiff] [PATCH] Win64 warnings in tif_win32.c", by Edward Lam

2011.12.22 17:08 "Re: [Tiff] [PATCH] Win64 warnings in tif_win32.c", by Bob Friesenhahn

2011.12.22 14:46 "[Tiff] [PATCH] Win64 warnings in tif_win32.c", by Edward Lam

Hi,

Please see the attached patch for fixing some minor 64-bit warnings in
tif_win32.c.

Thanks,

-Edward

Index: tif_win32.c
===================================================================
RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_win32.c,v
retrieving revision 1.38
diff -u -8 -p -r1.38 tif_win32.c
--- tif_win32.c 9 Feb 2011 18:05:00 -0000 1.38
+++ tif_win32.c 22 Dec 2011 14:41:20 -0000
@@ -372,17 +372,17 @@ static void
Win32WarningHandler(const char* module, const char* fmt, va_list ap)
{
#ifndef TIF_PLATFORM_CONSOLE
        LPTSTR szTitle;
        LPTSTR szTmp;
        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)
return;

sprintf(szTitle, szTitleText, szTmpModule); szTmp = szTitle + (strlen(szTitle)+2)*sizeof(char); vsnprintf(szTmp, nBufSize-(strlen(szTitle)+2)*sizeof(char), fmt, ap); MessageBoxA(GetFocus(), szTmp, szTitle, MB_OK | MB_ICONINFORMATION);

@@ -403,17 +403,17 @@ static void
Win32ErrorHandler(const char* module, const char* fmt, va_list ap)
{
#ifndef TIF_PLATFORM_CONSOLE
        LPTSTR szTitle;
        LPTSTR szTmp;
        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)
return;