[poppler] Branch 'poppler-0.16' - poppler/GfxFont.cc

[Albert Astals Cid]

 poppler/GfxFont.cc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4808b5c42f742363b51624aa4b6d02e6e6d3a30c
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Thu Feb 24 18:47:35 2011 +0000

    Fix rendering of some substituted fonts
    
    More info in bug 34522

diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc
index 0a165a6..d80208d 100644
--- a/poppler/GfxFont.cc
+++ b/poppler/GfxFont.cc
@@ -23,6 +23,7 @@
 // Copyright (C) 2009 Peter Kerzum <kerzum at yandex-team.ru>
 // Copyright (C) 2009, 2010 David Benjamin <davidben at mit.edu>
 // Copyright (C) 2011 Axel Strübing <axel.struebing at freenet.de>
+// Copyright (C) 2011 Adrian Johnson <ajohnson at redneon.com>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -1215,7 +1216,7 @@ Gushort *Gfx8BitFont::getCodeToGIDMap(FoFiTrueType *ff) {
   cmap = 0;
   useMacRoman = gFalse;
   useUnicode = gFalse;
-  if (hasEncoding) {
+  if (hasEncoding || type == fontType1) {
     if (usesMacRomanEnc && macRomanCmap >= 0) {
       cmap = macRomanCmap;
       useMacRoman = gTrue;