[poppler] poppler/poppler: FontInfo.cc,1.9,1.10

[Albert Astals Cid]

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

Modified Files:
	FontInfo.cc 
Log Message:
poppler/FontInfo.cc: Embedded fonts don't have a font file


Index: FontInfo.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/FontInfo.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- FontInfo.cc	11 Mar 2006 15:19:02 -0000	1.9
+++ FontInfo.cc	16 Mar 2006 19:21:11 -0000	1.10
@@ -153,14 +153,6 @@
     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 @@
     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()) {