From 282f9cace3b810941e50fb1be01ece6d330a8e73 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Sun, 13 May 2012 21:23:21 +0930 Subject: [PATCH 2/2] Update win32 findSystemFontFile to return substitute font name --- poppler/GlobalParams.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc index 098e4a4..5060450 100644 --- a/poppler/GlobalParams.cc +++ b/poppler/GlobalParams.cc @@ -1407,7 +1407,7 @@ void GlobalParams::setupBaseFonts(char *dir) { GooString *GlobalParams::findSystemFontFile(GfxFont *font, SysFontType *type, - int *fontNum, GooString * /*substituteFontName*/, + int *fontNum, GooString *substituteFontName, GooString * /*base14Name*/) { SysFontInfo *fi; GooString *path; @@ -1418,6 +1418,8 @@ GooString *GlobalParams::findSystemFontFile(GfxFont *font, path = fi->path->copy(); *type = fi->type; *fontNum = fi->fontNum; + if (substituteFontName) + substituteFontName.Set(fi->substituteName->getCString()); } unlockGlobalParams; return path; -- 1.7.9.5