summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--poppler/GlobalParams.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7fb8c20a..22d74459 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-31 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/GlobalParams.cc (GlobalParams::getDisplayFont):
+ Allow ttc fonts to be used.
+
2006-01-28 Jeff Muizelaar <jeff@infidigm.net>
* glib/poppler-attachment.h: fix compile by adding <time.h> include.
diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
index 49c05907..df4c04ca 100644
--- a/poppler/GlobalParams.cc
+++ b/poppler/GlobalParams.cc
@@ -1274,7 +1274,7 @@ DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
ext = strrchr((char*)s,'.');
if (!ext)
goto fin;
- if (!strncasecmp(ext,".ttf",4))
+ if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext,".ttc",4))
{
dfp = new DisplayFontParam(fontName->copy(), displayFontTT);
dfp->tt.fileName = new GooString((char*)s);