[poppler] poppler/poppler: CairoOutputDev.cc,1.24,1.25

[Jeff Muizelaar]

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

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

	* poppler/CairoOutputDev.cc: Don't try and load type3 fonts (#4030).


Index: CairoOutputDev.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/CairoOutputDev.cc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- CairoOutputDev.cc	7 Jan 2006 06:10:15 -0000	1.24
+++ CairoOutputDev.cc	8 Jan 2006 22:59:48 -0000	1.25
@@ -253,9 +253,12 @@
   cairo_matrix_t matrix;
 
   LOG(printf ("updateFont() font=%s\n", state->getFont()->getName()->getCString()));
-  
+
   needFontUpdate = gFalse;
 
+  if (state->getFont()->getType() == fontType3)
+    return;
+
   currentFont = fontEngine->getFont (state->getFont(), xref);
 
   state->getFontTransMat(&m11, &m12, &m21, &m22);