Commit 7ed6737b authored by Albert Astals Cid's avatar Albert Astals Cid

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

parent a34688ee
2006-03-14 Albert Astals Cid <aacid@kde.org>
* poppler/FontInfo.cc: Embedded fonts don't have a font file
2006-03-14 Albert Astals Cid <aacid@kde.org>
* qt4/src/poppler-qt4.h: Fix compilation with gcc4.1, patch by
......
......@@ -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()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment