summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Johnson <ajohnson@redneon.com>2012-05-13 21:36:36 +0930
committerAdrian Johnson <ajohnson@redneon.com>2012-05-24 18:29:14 +0930
commit028f580056f99719cfb8af7bbe8184ceac02cb16 (patch)
treeb144f54df30244ae0d6829ddcdd50ca9552361eb
parent1916d000a86336213ffd6e9bd44ce873e8955895 (diff)
add sustitute font name to GlobalParamsWin32 to fix compilation
-rw-r--r--poppler/GlobalParamsWin.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
index d8065e04..b8c3d0c0 100644
--- a/poppler/GlobalParamsWin.cc
+++ b/poppler/GlobalParamsWin.cc
@@ -313,6 +313,7 @@ SysFontInfo *SysFontList::makeWindowsFont(char *name, int fontNum,
char c;
int i;
SysFontType type;
+ GooString substituteName;
n = strlen(name);
bold = italic = oblique = fixedWidth = gFalse;
@@ -380,7 +381,7 @@ SysFontInfo *SysFontList::makeWindowsFont(char *name, int fontNum,
}
return new SysFontInfo(s, bold, italic, oblique, fixedWidth,
- new GooString(path), type, fontNum);
+ new GooString(path), type, fontNum, substituteName.copy());
}
static GooString* replaceSuffix(GooString *path,
@@ -570,6 +571,8 @@ GooString *GlobalParams::findSystemFontFile(GfxFont *font,
path = fi->path->copy();
*type = fi->type;
*fontNum = fi->fontNum;
+ if (substituteFontName)
+ substituteFontName.Set(fi->substituteName->getCString());
} else {
GooString *substFontName = new GooString(findSubstituteName(font, fontFiles,
substFiles,