Output the extracted number from wxString::ToXXX() even if it returns false.

[wxWidgets.git] / src / tiff / libtiff / tif_win32.c

diff --git a/src/tiff/libtiff/tif_win32.c b/src/tiff/libtiff/tif_win32.c
index 09360040fa642d7f31b10a34cd2dbd4cb94a3da8..4fb5b7650f4e3ddecacea526398af75d4a2ec2c1 100644 (file)
--- a/src/tiff/libtiff/tif_win32.c
+++ b/src/tiff/libtiff/tif_win32.c
@@ -340,12 +340,12 @@ 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;
-       if ((szTitle = (LPTSTR)LocalAlloc(LMEM_FIXED, (strlen(szTmpModule) +
+       char *szTitle;
+       char *szTmp;
+       const char *szTitleText = "%s Warning";
+       const char *szDefaultModule = "LIBTIFF";
+       const char *szTmpModule = (module == NULL) ? szDefaultModule : module;
+       if ((szTitle = (char *)LocalAlloc(LMEM_FIXED, (strlen(szTmpModule) +
                strlen(szTitleText) + strlen(fmt) + 128)*sizeof(char))) == NULL)
                return;
        sprintf(szTitle, szTitleText, szTmpModule);
@@ -368,12 +368,12 @@ 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;
-       if ((szTitle = (LPTSTR)LocalAlloc(LMEM_FIXED, (strlen(szTmpModule) +
+       char *szTitle;
+       char *szTmp;
+       const char *szTitleText = "%s Error";
+       const char *szDefaultModule = "LIBTIFF";
+       const char *szTmpModule = (module == NULL) ? szDefaultModule : module;
+       if ((szTitle = (char *)LocalAlloc(LMEM_FIXED, (strlen(szTmpModule) +
                strlen(szTitleText) + strlen(fmt) + 128)*sizeof(char))) == NULL)
                return;
        sprintf(szTitle, szTitleText, szTmpModule);