[poppler] poppler/poppler: PSOutputDev.cc, 1.4, 1.5 PSOutputDev.h, 1.3, 1.4

[Albert Astals Cid]

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

Modified Files:
	PSOutputDev.cc PSOutputDev.h 
Log Message:
Merge all the fofi/ changes from xpdf 3.01, there is only one api change that affects PSOutputDev (also has been updated the part that uses this api not the whole file). All our fixes in that dir are included in the upgrade.


Index: PSOutputDev.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/PSOutputDev.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PSOutputDev.cc	31 Aug 2005 15:28:46 -0000	1.4
+++ PSOutputDev.cc	14 Sep 2005 21:20:36 -0000	1.5
@@ -1267,7 +1267,7 @@
 	     font->getType() == fontCIDType2 &&
 	     font->getEmbeddedFontID(&fontFileID)) {
     psName = filterPSName(font->getEmbeddedFontName());
-    setupEmbeddedCIDTrueTypeFont(font, &fontFileID, psName);
+    setupEmbeddedCIDTrueTypeFont(font, &fontFileID, psName, gTrue);
 
   } else if (font->getType() == fontType3) {
     sprintf(type3Name, "T3_%d_%d",
@@ -1770,7 +1770,8 @@
 }
 
 void PSOutputDev::setupEmbeddedCIDTrueTypeFont(GfxFont *font, Ref *id,
-					       GooString *psName) {
+					       GooString *psName,
+					       GBool needVerticalMetrics) {
   char *fontBuf;
   int fontLen;
   FoFiTrueType *ffTT;
@@ -1804,12 +1805,14 @@
       ffTT->convertToCIDType2(psName->getCString(),
 			      ((GfxCIDFont *)font)->getCIDToGID(),
 			      ((GfxCIDFont *)font)->getCIDToGIDLen(),
+			      needVerticalMetrics,
 			      outputFunc, outputStream);
     } else {
       // otherwise: use a non-CID composite font
       ffTT->convertToType0(psName->getCString(),
 			   ((GfxCIDFont *)font)->getCIDToGID(),
 			   ((GfxCIDFont *)font)->getCIDToGIDLen(),
+			   needVerticalMetrics,
 			   outputFunc, outputStream);
     }
     delete ffTT;

Index: PSOutputDev.h
===================================================================
RCS file: /cvs/poppler/poppler/poppler/PSOutputDev.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PSOutputDev.h	28 Jul 2005 06:31:57 -0000	1.3
+++ PSOutputDev.h	14 Sep 2005 21:20:36 -0000	1.4
@@ -211,7 +211,8 @@
   void setupEmbeddedTrueTypeFont(GfxFont *font, Ref *id, GooString *psName);
   void setupExternalTrueTypeFont(GfxFont *font, GooString *psName);
   void setupEmbeddedCIDType0Font(GfxFont *font, Ref *id, GooString *psName);
-  void setupEmbeddedCIDTrueTypeFont(GfxFont *font, Ref *id, GooString *psName);
+  void setupEmbeddedCIDTrueTypeFont(GfxFont *font, Ref *id, GooString *psName,
+				    GBool needVerticalMetrics);
   void setupType3Font(GfxFont *font, GooString *psName, Dict *parentResDict);
   void setupImages(Dict *resDict);
   void setupImage(Ref id, Stream *str);