[poppler] poppler/poppler: GlobalParams.cc,1.14,1.15

[Jeff Muizelaar]

Update of /cvs/poppler/poppler/poppler
In directory gabe:/tmp/cvs-serv6570/poppler

Modified Files:
	GlobalParams.cc 
Log Message:
2006-01-31  Jeff Muizelaar  <jeff at infidigm.net>

	* poppler/GlobalParams.cc (GlobalParams::getDisplayFont):
	Allow ttc fonts to be used.


Index: GlobalParams.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/GlobalParams.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- GlobalParams.cc	23 Jan 2006 18:52:48 -0000	1.14
+++ GlobalParams.cc	1 Feb 2006 03:52:12 -0000	1.15
@@ -1274,7 +1274,7 @@
     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);