fixes some of the windows issue with text2image, see #380

tesseract-ocr · Aug 21, 2016 · f1ab331 · f1ab331
1 parent 526e3f4
commit f1ab331
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/training/pango_font_info.cpp b/training/pango_font_info.cpp
@@ -32,12 +32,19 @@
 // needed for strcasestr in string.h
 #define _GNU_SOURCE
 #endif
+
+#elif defined(_MSC_VER)
+#include "strcasestr.h"
+#define strncasecmp _strnicmp
+#define strcasecmp _stricmp
 #endif
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#ifndef _MSC_VER
 #include <sys/param.h>
+#endif
 #include <algorithm>
 
 #include "pango_font_info.h"
@@ -425,8 +432,12 @@ bool PangoFontInfo::CanRenderString(const char* utf8_word, int len,
     }
     PangoGlyph dotted_circle_glyph;
     PangoFont* font = run->item->analysis.font;
-    dotted_circle_glyph = pango_fc_font_get_glyph(
-        reinterpret_cast<PangoFcFont*>(font), kDottedCircleGlyph);
+
+    PangoGlyphString * glyphs = pango_glyph_string_new();
+    char s[] = "\xc2\xa7";
+    pango_shape(s, sizeof(s), &(run->item->analysis), glyphs);
+    dotted_circle_glyph = glyphs->glyphs[0].glyph;
+
     if (TLOG_IS_ON(2)) {
       PangoFontDescription* desc = pango_font_describe(font);
       char* desc_str = pango_font_description_to_string(desc);

diff --git a/training/tlog.h b/training/tlog.h
@@ -38,7 +38,7 @@ DECLARE_INT_PARAM_FLAG(tlog_level);
 
 #define TLOG_IS_ON(level) (FLAGS_tlog_level >= level)
 
-#define TLOG_FATAL(msg...)                                              \
+#define TLOG_FATAL(msg, ...)                                              \
   {                                                                     \
     tprintf(msg);                                                       \
     ASSERT_FAILED.error("", ABORT, "in file %s, line %d",               \