[poppler] poppler/poppler: CairoOutputDev.cc, 1.36, 1.37 CairoOutputDev.h, 1.15, 1.16

[Jeff Muizelaar]

Update of /cvs/poppler/poppler/poppler
In directory kemper:/tmp/cvs-serv31901/poppler

Modified Files:
	CairoOutputDev.cc CairoOutputDev.h 
Log Message:
2006-05-27  Jeff Muizelaar  <jeff at infidigm.net>

	* poppler/CairoOutputDev.cc:
	* poppler/CairoOutputDev.h: Back out the rest of krh's type3
	font work. This fixes type3 fonts in CairoOutputDevice.


Index: CairoOutputDev.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/CairoOutputDev.cc,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- CairoOutputDev.cc	19 May 2006 19:21:59 -0000	1.36
+++ CairoOutputDev.cc	27 May 2006 17:27:37 -0000	1.37
@@ -258,6 +258,9 @@
 
   needFontUpdate = gFalse;
 
+  if (state->getFont()->getType() == fontType3)	 
+    return;
+
   currentFont = fontEngine->getFont (state->getFont(), xref);
 
   state->getFontTransMat(&m11, &m12, &m21, &m22);

Index: CairoOutputDev.h
===================================================================
RCS file: /cvs/poppler/poppler/poppler/CairoOutputDev.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- CairoOutputDev.h	19 May 2006 19:21:59 -0000	1.15
+++ CairoOutputDev.h	27 May 2006 17:27:37 -0000	1.16
@@ -52,7 +52,7 @@
 
   // Does this device use beginType3Char/endType3Char?  Otherwise,
   // text in Type 3 fonts will be drawn with drawChar/drawString.
-  virtual GBool interpretType3Chars() { return gFalse; }
+  virtual GBool interpretType3Chars() { return gTrue; }
 
   //----- initialization and control