poppler/FontInfo.cc: Embedded fonts don't have a font file

1 files changed, 12 insertions, 8 deletions

diff --git a/poppler/FontInfo.cc b/poppler/FontInfo.cc
index d9defa39..84221280 100644
--- a/poppler/FontInfo.cc
+++ b/poppler/FontInfo.cc
@@ -153,14 +153,6 @@ FontInfo::FontInfo(GfxFont *font, PDFDoc *doc) {
     name = NULL;
   }
 
-  DisplayFontParam *dfp = globalParams->getDisplayFont(font);
-  if (dfp)
-  {
-    if (dfp->kind == displayFontT1) file = dfp->t1.fileName->copy();
-    else file = dfp->tt.fileName->copy();
-  }
-  else file = NULL;
-  
   // font type
   type = (FontInfo::Type)font->getType();
 
@@ -171,6 +163,18 @@ FontInfo::FontInfo(GfxFont *font, PDFDoc *doc) {
     emb = font->getEmbeddedFontID(&embRef);
   }
 
+  if (!emb)
+  {
+    DisplayFontParam *dfp = globalParams->getDisplayFont(font);
+    if (dfp)
+    {
+      if (dfp->kind == displayFontT1) file = dfp->t1.fileName->copy();
+      else file = dfp->tt.fileName->copy();
+    }
+    else file = NULL;
+  }
+  else file = NULL;
+
   // look for a ToUnicode map
   hasToUnicode = gFalse;
   if (doc->getXRef()->fetch(fontRef.num, fontRef.gen, &fontObj)->isDict()) {