X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=pdf%2Fsplash%2FSplashFTFontEngine.cc;h=7401459a9cbd594c2510a35e3d72dc2587691765;hb=8dbcee6be49013edc9821096288e2c078169e349;hp=64dbc7509834ea7a1a8ddbe41d984d6c18f2f73f;hpb=bace4ea18c03bfcaadab55300bc15290f87540c7;p=evince.git

diff --git a/pdf/splash/SplashFTFontEngine.cc b/pdf/splash/SplashFTFontEngine.cc
index 64dbc750..7401459a 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) {