[poppler] Branch 'xpdf303merge' - poppler/ArthurOutputDev.cc

[Albert Astals Cid]

 poppler/ArthurOutputDev.cc |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 3538ac89bfea750de8907847d1d5e3515d0b8be7
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Sep 8 15:07:21 2011 +0200

    xpdf303: compile

diff --git a/poppler/ArthurOutputDev.cc b/poppler/ArthurOutputDev.cc
index 5a63468..4ef376c 100644
--- a/poppler/ArthurOutputDev.cc
+++ b/poppler/ArthurOutputDev.cc
@@ -417,9 +417,19 @@ void ArthurOutputDev::updateFont(GfxState *state)
       }
       break;
     case fontCIDType0COT:
+      if (((GfxCIDFont *)gfxFont)->getCIDToGID()) {
+	n = ((GfxCIDFont *)gfxFont)->getCIDToGIDLen();
+	codeToGID = (int *)gmallocn(n, sizeof(int));
+	memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(),
+	       n * sizeof(int));
+      } else {
+	codeToGID = NULL;
+	n = 0;
+      }      
       if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(
 			   id,
-			   fontsrc))) {
+			   fontsrc,
+			   codeToGID, n))) {
 	error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
 	      gfxFont->getName() ? gfxFont->getName()->getCString()
 	                         : "(unnamed)");