diff options
Diffstat (limited to 'Build/source/libs/xpdf/xpdf-src/splash/SplashFontEngine.cc')
-rw-r--r-- | Build/source/libs/xpdf/xpdf-src/splash/SplashFontEngine.cc | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/Build/source/libs/xpdf/xpdf-src/splash/SplashFontEngine.cc b/Build/source/libs/xpdf/xpdf-src/splash/SplashFontEngine.cc index d4673a7a7c4..e435fe80c9a 100644 --- a/Build/source/libs/xpdf/xpdf-src/splash/SplashFontEngine.cc +++ b/Build/source/libs/xpdf/xpdf-src/splash/SplashFontEngine.cc @@ -18,6 +18,7 @@ # include <unistd.h> #endif #include "gmem.h" +#include "gmempp.h" #include "GString.h" #include "SplashMath.h" #include "SplashFTFontEngine.h" @@ -37,7 +38,7 @@ extern "C" int unlink(char *filename); //------------------------------------------------------------------------ SplashFontEngine::SplashFontEngine( -#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H +#if HAVE_FREETYPE_H GBool enableFreeType, Guint freeTypeFlags, #endif @@ -48,7 +49,7 @@ SplashFontEngine::SplashFontEngine( fontCache[i] = NULL; } -#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H +#if HAVE_FREETYPE_H if (enableFreeType) { ftEngine = SplashFTFontEngine::init(aa, freeTypeFlags); } else { @@ -66,7 +67,7 @@ SplashFontEngine::~SplashFontEngine() { } } -#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H +#if HAVE_FREETYPE_H if (ftEngine) { delete ftEngine; } @@ -99,7 +100,7 @@ SplashFontFile *SplashFontEngine::loadType1Font(SplashFontFileID *idA, SplashFontFile *fontFile; fontFile = NULL; -#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H +#if HAVE_FREETYPE_H if (!fontFile && ftEngine) { fontFile = ftEngine->loadType1Font(idA, #if LOAD_FONTS_FROM_MEM @@ -135,7 +136,7 @@ SplashFontFile *SplashFontEngine::loadType1CFont(SplashFontFileID *idA, SplashFontFile *fontFile; fontFile = NULL; -#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H +#if HAVE_FREETYPE_H if (!fontFile && ftEngine) { fontFile = ftEngine->loadType1CFont(idA, #if LOAD_FONTS_FROM_MEM @@ -171,7 +172,7 @@ SplashFontFile *SplashFontEngine::loadOpenTypeT1CFont(SplashFontFileID *idA, SplashFontFile *fontFile; fontFile = NULL; -#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H +#if HAVE_FREETYPE_H if (!fontFile && ftEngine) { fontFile = ftEngine->loadOpenTypeT1CFont(idA, #if LOAD_FONTS_FROM_MEM @@ -198,24 +199,25 @@ SplashFontFile *SplashFontEngine::loadOpenTypeT1CFont(SplashFontFileID *idA, SplashFontFile *SplashFontEngine::loadCIDFont(SplashFontFileID *idA, #if LOAD_FONTS_FROM_MEM - GString *fontBuf + GString *fontBuf, #else char *fileName, - GBool deleteFile + GBool deleteFile, #endif - ) { + int *codeToGID, + int codeToGIDLen) { SplashFontFile *fontFile; fontFile = NULL; -#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H +#if HAVE_FREETYPE_H if (!fontFile && ftEngine) { fontFile = ftEngine->loadCIDFont(idA, #if LOAD_FONTS_FROM_MEM - fontBuf + fontBuf, #else - fileName, deleteFile + fileName, deleteFile, #endif - ); + codeToGID, codeToGIDLen); } #endif @@ -244,7 +246,7 @@ SplashFontFile *SplashFontEngine::loadOpenTypeCFFFont(SplashFontFileID *idA, SplashFontFile *fontFile; fontFile = NULL; -#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H +#if HAVE_FREETYPE_H if (!fontFile && ftEngine) { fontFile = ftEngine->loadOpenTypeCFFFont(idA, #if LOAD_FONTS_FROM_MEM @@ -283,7 +285,7 @@ SplashFontFile *SplashFontEngine::loadTrueTypeFont(SplashFontFileID *idA, SplashFontFile *fontFile; fontFile = NULL; -#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H +#if HAVE_FREETYPE_H if (!fontFile && ftEngine) { fontFile = ftEngine->loadTrueTypeFont(idA, #if LOAD_FONTS_FROM_MEM |