diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | pdf/splash/SplashFTFontEngine.cc | 7 |
3 files changed, 22 insertions, 0 deletions
@@ -1,3 +1,10 @@ +2005-01-26 Marco Pesenti Gritti <marco@gnome.org> + + * configure.ac: + * pdf/splash/SplashFTFontEngine.cc: + + Fix CID fonts with freetype 2.1.9 + 2005-01-26 Bryan Clark <clarkbw@cvs.gnome.org> * TODO: added item for desktop icon thumbnailer diff --git a/configure.ac b/configure.ac index ace97ff..2a04fd8 100644 --- a/configure.ac +++ b/configure.ac @@ -267,6 +267,14 @@ if test "x$FREETYPE_CONFIG" != "xno" ; then FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` AC_DEFINE(HAVE_FREETYPE_H, 1, [Have FreeType2 include files]) + + vers=`$FREETYPE_CONFIG --version 2>/dev/null | sed -e 's/libfreetype //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + if test -n "$vers" && test "$vers" -le 9005003; then + AC_DEFINE_UNQUOTED(HAVE_FREETYPE_217_OR_OLDER, 1, [Defines if your system has the freetype library 2.1.7 or older]) + else + AC_DEFINE_UNQUOTED(HAVE_FREETYPE_217_OR_OLDER, 0, [Defines if your system has the freetype library 2.1.7 or older]) + fi + fi AC_SUBST(FREETYPE_CFLAGS) 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) { |