diff options
Diffstat (limited to 'Build/source/libs/xpdf/xpdf-src/splash/SplashFontEngine.h')
-rw-r--r-- | Build/source/libs/xpdf/xpdf-src/splash/SplashFontEngine.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Build/source/libs/xpdf/xpdf-src/splash/SplashFontEngine.h b/Build/source/libs/xpdf/xpdf-src/splash/SplashFontEngine.h index 43eb6d3eb48..ac2558ee52d 100644 --- a/Build/source/libs/xpdf/xpdf-src/splash/SplashFontEngine.h +++ b/Build/source/libs/xpdf/xpdf-src/splash/SplashFontEngine.h @@ -29,7 +29,7 @@ class SplashFont; #define splashFontCacheSize 16 -#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H +#if HAVE_FREETYPE_H #define splashFTNoHinting (1 << 0) #endif @@ -42,7 +42,7 @@ public: // Create a font engine. SplashFontEngine( -#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H +#if HAVE_FREETYPE_H GBool enableFreeType, Guint freeTypeFlags, #endif @@ -78,11 +78,11 @@ public: const char **enc); SplashFontFile *loadCIDFont(SplashFontFileID *idA, #if LOAD_FONTS_FROM_MEM - GString *fontBuf + GString *fontBuf, #else - char *fileName, GBool deleteFile + char *fileName, GBool deleteFile, #endif - ); + int *codeToGID, int codeToGIDLen); SplashFontFile *loadOpenTypeCFFFont(SplashFontFileID *idA, #if LOAD_FONTS_FROM_MEM GString *fontBuf, @@ -115,7 +115,7 @@ private: SplashFont *fontCache[splashFontCacheSize]; -#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H +#if HAVE_FREETYPE_H SplashFTFontEngine *ftEngine; #endif }; |