Merge pull request tesseract-ocr#367 from stweil/windows

win32: Show TIFF warnings on console
vidiecan · Jul 17, 2016 · d5b7f68 · d5b7f68
2 parents 5199957 + 75fdc08
commit d5b7f68
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/api/tesseractmain.cpp b/api/tesseractmain.cpp
@@ -33,6 +33,23 @@
 #include "openclwrapper.h"
 #include "osdetect.h"
 
+#if defined(HAVE_TIFFIO_H) && defined(_WIN32)
+
+#include <tiffio.h>
+#include <windows.h>
+
+static void Win32WarningHandler(const char* module, const char* fmt,
+                                va_list ap) {
+    if (module != NULL) {
+        fprintf(stderr, "%s: ", module);
+    }
+    fprintf(stderr, "Warning, ");
+    vfprintf(stderr, fmt, ap);
+    fprintf(stderr, ".\n");
+}
+
+#endif /* HAVE_TIFFIO_H &&  _WIN32 */
+
 void PrintVersionInfo() {
     char *versionStrP;
 
@@ -352,6 +369,11 @@ int main(int argc, char **argv) {
   int arg_i = 1;
   tesseract::PageSegMode pagesegmode = tesseract::PSM_AUTO;
 
+#if defined(HAVE_TIFFIO_H) && defined(_WIN32)
+  /* Show libtiff warnings on console (not in GUI). */
+  TIFFSetWarningHandler(Win32WarningHandler);
+#endif /* HAVE_TIFFIO_H &&  _WIN32 */
+
   ParseArgs(argc, argv,
           &lang, &image, &outputbase, &datapath,
           &list_langs, &print_parameters,