diff options
Diffstat (limited to 'Build/source/libs/xpdf/xpdf-src/splash/SplashFTFontFile.h')
-rw-r--r-- | Build/source/libs/xpdf/xpdf-src/splash/SplashFTFontFile.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Build/source/libs/xpdf/xpdf-src/splash/SplashFTFontFile.h b/Build/source/libs/xpdf/xpdf-src/splash/SplashFTFontFile.h index 21fa517a594..3a6b9b7aa43 100644 --- a/Build/source/libs/xpdf/xpdf-src/splash/SplashFTFontFile.h +++ b/Build/source/libs/xpdf/xpdf-src/splash/SplashFTFontFile.h @@ -11,7 +11,7 @@ #include <aconf.h> -#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H +#if HAVE_FREETYPE_H #ifdef USE_GCC_PRAGMAS #pragma interface @@ -33,15 +33,16 @@ public: static SplashFontFile *loadType1Font(SplashFTFontEngine *engineA, SplashFontFileID *idA, + SplashFontType fontTypeA, #if LOAD_FONTS_FROM_MEM GString *fontBufA, #else char *fileNameA, GBool deleteFileA, #endif - const char **encA, - GBool useLightHintingA); + const char **encA); static SplashFontFile *loadCIDFont(SplashFTFontEngine *engineA, SplashFontFileID *idA, + SplashFontType fontTypeA, #if LOAD_FONTS_FROM_MEM GString *fontBufA, #else @@ -50,6 +51,7 @@ public: int *codeToGIDA, int codeToGIDLenA); static SplashFontFile *loadTrueTypeFont(SplashFTFontEngine *engineA, SplashFontFileID *idA, + SplashFontType fontTypeA, #if LOAD_FONTS_FROM_MEM GString *fontBufA, #else @@ -71,25 +73,23 @@ private: SplashFTFontFile(SplashFTFontEngine *engineA, SplashFontFileID *idA, + SplashFontType fontTypeA, #if LOAD_FONTS_FROM_MEM GString *fontBufA, #else char *fileNameA, GBool deleteFileA, #endif FT_Face faceA, - int *codeToGIDA, int codeToGIDLenA, - GBool trueTypeA, GBool useLightHintingA); + int *codeToGIDA, int codeToGIDLenA); SplashFTFontEngine *engine; FT_Face face; int *codeToGID; int codeToGIDLen; - GBool trueType; - GBool useLightHinting; friend class SplashFTFont; }; -#endif // HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H +#endif // HAVE_FREETYPE_H #endif |