Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/pdf
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2005-01-26 15:19:40 (GMT)
committer Marco Pesenti Gritti <marco@src.gnome.org>2005-01-26 15:19:40 (GMT)
commit5bde54f8810020217366ec3e9a64b44b4f6ee3c6 (patch)
tree14a7b4dbd47f20be8698c624d7c32481045b6ebd /pdf
parent7a0789bc8bbe25d3b0674176d2096ad126fc75a5 (diff)
Fix CID fonts with freetype 2.1.9
2005-01-26 Marco Pesenti Gritti <marco@gnome.org> * configure.ac: * pdf/splash/SplashFTFontEngine.cc: Fix CID fonts with freetype 2.1.9
Diffstat (limited to 'pdf')
-rw-r--r--pdf/splash/SplashFTFontEngine.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/pdf/splash/SplashFTFontEngine.cc b/pdf/splash/SplashFTFontEngine.cc
index 64dbc75..7401459 100644
--- a/pdf/splash/SplashFTFontEngine.cc
+++ b/pdf/splash/SplashFTFontEngine.cc
@@ -81,6 +81,7 @@ SplashFontFile *SplashFTFontEngine::loadCIDFont(SplashFontFileID *idA,
SplashFontFile *ret;
// check for a CFF font
+#if HAVE_FREETYPE_217_OR_OLDER
if ((ff = FoFiType1C::load(fileName))) {
cidToGIDMap = ff->getCIDToGIDMap(&nCIDs);
delete ff;
@@ -88,6 +89,12 @@ SplashFontFile *SplashFTFontEngine::loadCIDFont(SplashFontFileID *idA,
cidToGIDMap = NULL;
nCIDs = 0;
}
+#else
+ // No need to check for CFF Font, freetype treats all CID fonts the same way
+ cidToGIDMap = NULL;
+ nCIDs = 0;
+#endif
+
ret = SplashFTFontFile::loadCIDFont(this, idA, fileName, deleteFile,
cidToGIDMap, nCIDs);
if (!ret) {