Commit a92b1001 authored by Albert Astals Cid's avatar Albert Astals Cid

* poppler/CairoFontEngine.cc: Correct fix for #5149, i broke it when merging xpdf 3.01 patches

parent 66096477
......@@ -3,6 +3,11 @@
* qt4/tests/check_fonts.cpp (checkType3): Add another case to fonts
unit test
2005-12-04 Albert Astals Cid <aacid@kde.org>
* poppler/CairoFontEngine.cc: Correct fix for #5149, i broke it when
merging xpdf 3.01 patches
2005-12-04 Albert Astals Cid <aacid@kde.org>
* poppler/JPXStream.cc: Fix error in merging CAN-2005-3193 fix. Thanks
......
......@@ -162,15 +162,13 @@ CairoFont::CairoFont(GfxFont *gfxFont, XRef *xref, FT_Library lib, GBool useCIDs
codeToGID = NULL;
codeToGIDLen = 0;
#if HAVE_FREETYPE_217_OR_OLDER
if (useCIDs)
if (!useCIDs)
{
if ((ff1c = FoFiType1C::load(fileName->getCString()))) {
codeToGID = ff1c->getCIDToGIDMap(&codeToGIDLen);
delete ff1c;
}
}
#endif
if (FT_New_Face(lib, fileName->getCString(), 0, &face)) {
gfree(codeToGID);
......
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