Ignore:
Timestamp:
May 25, 2006, 4:09:55 PM (16 years ago)
Author:
Eugene Romanenko
Message:

poppler updated to version 0.5.2, also needed changes to be compatible with new poppler

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/poppler/mypoppler/poppler/FontInfo.cc

    r2 r27  
    153153    name = NULL;
    154154  }
    155  
     155
    156156  // font type
    157157  type = (FontInfo::Type)font->getType();
     
    163163    emb = font->getEmbeddedFontID(&embRef);
    164164  }
     165
     166  if (!emb)
     167  {
     168    DisplayFontParam *dfp = globalParams->getDisplayFont(font);
     169    if (dfp)
     170    {
     171      if (dfp->kind == displayFontT1) file = dfp->t1.fileName->copy();
     172      else file = dfp->tt.fileName->copy();
     173    }
     174    else file = NULL;
     175  }
     176  else file = NULL;
    165177
    166178  // look for a ToUnicode map
     
    186198
    187199FontInfo::FontInfo(FontInfo& f) {
    188   name = f.name->copy();
     200  name = f.name ? f.name->copy() : NULL;
     201  file = f.file ? f.file->copy() : NULL;
    189202  type = f.type;
    190203  emb = f.emb;
     
    196209FontInfo::~FontInfo() {
    197210  delete name;
    198 }
     211  delete file;
     212}
Note: See TracChangeset for help on using the changeset viewer.