X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85272533a2bfac2b766569db45d23f9a7965d4e5..3131207f4ef0e4e5c8b6bdedb74bc66271ae3787:/src/common/imagtiff.cpp?ds=sidebyside

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index 749f744de0..e1cfedc795 100644
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -140,16 +140,28 @@ static void
 TIFFwxWarningHandler(const char* module, const char* fmt, va_list ap)
 {
     if (module != NULL)
-            wxLogWarning(_("tiff module: %s"), module);
-    wxVLogWarning((wxChar *) fmt, ap);
+        wxLogWarning(_("tiff module: %s"), wxString::FromAscii(module).c_str());
+
+    // FIXME: this is not terrible informative but better than crashing!
+#if wxUSE_UNICODE
+    wxLogWarning(_("TIFF library warning."));
+#else
+    wxVLogWarning(fmt, ap);
+#endif
 }
 
 static void
 TIFFwxErrorHandler(const char* module, const char* fmt, va_list ap)
 {
     if (module != NULL)
-            wxLogError(_("tiff module: %s"), module);
-    wxVLogError((wxChar *) fmt, ap);
+        wxLogError(_("tiff module: %s"), wxString::FromAscii(module).c_str());
+
+    // FIXME: as above
+#if wxUSE_UNICODE
+    wxLogError(_("TIFF library error."));
+#else
+    wxVLogError(fmt, ap);
+#endif
 }
 
 } // extern "C"