fofi/FoFiTrueType.cc | 18 +++++++++--------- fofi/FoFiTrueType.h | 14 +++++++------- fofi/FoFiType1C.cc | 8 ++++---- fofi/FoFiType1C.h | 2 +- poppler/CairoFontEngine.cc | 22 +++++++++++----------- poppler/CairoFontEngine.h | 8 ++++---- poppler/GfxFont.cc | 22 +++++++++++----------- poppler/GfxFont.h | 10 +++++----- poppler/PSOutputDev.cc | 14 +++++++------- poppler/SplashOutputDev.cc | 6 +++--- splash/SplashFTFontEngine.cc | 6 +++--- splash/SplashFTFontEngine.h | 2 +- splash/SplashFTFontFile.cc | 12 ++++++------ splash/SplashFTFontFile.h | 8 ++++---- splash/SplashFontEngine.cc | 2 +- splash/SplashFontEngine.h | 2 +- 16 files changed, 78 insertions(+), 78 deletions(-)
New commits: commit 37ca8dc4215693ec657d165ebdb6c315a0ae92c9 Author: Carlos Garcia Campos <[email protected]> Date: Thu Sep 1 12:34:32 2011 +0200 xpdf303: Use int instead of Gushort for gid/cid maps diff --git a/fofi/FoFiTrueType.cc b/fofi/FoFiTrueType.cc index 7db63e1..53fb1a5 100644 --- a/fofi/FoFiTrueType.cc +++ b/fofi/FoFiTrueType.cc @@ -338,8 +338,8 @@ int FoFiTrueType::findCmap(int platform, int encoding) { return -1; } -Gushort FoFiTrueType::mapCodeToGID(int i, Guint c) { - Gushort gid; +int FoFiTrueType::mapCodeToGID(int i, Guint c) { + int gid; Guint segCnt, segEnd, segStart, segDelta, segOffset; Guint cmapFirst, cmapLen; int pos, a, b, m; @@ -442,9 +442,9 @@ int FoFiTrueType::mapNameToGID(char *name) { return nameToGID->lookupInt(name); } -Gushort *FoFiTrueType::getCIDToGIDMap(int *nCIDs) { +int *FoFiTrueType::getCIDToGIDMap(int *nCIDs) { FoFiType1C *ff; - Gushort *map; + int *map; int i; *nCIDs = 0; @@ -489,7 +489,7 @@ int FoFiTrueType::getEmbeddingRights() { } void FoFiTrueType::convertToType42(char *psName, char **encoding, - Gushort *codeToGID, + int *codeToGID, FoFiOutputFunc outputFunc, void *outputStream) { GooString *buf; @@ -551,7 +551,7 @@ void FoFiTrueType::convertToType1(char *psName, const char **newEncoding, } void FoFiTrueType::convertToCIDType2(char *psName, - Gushort *cidMap, int nCIDs, + int *cidMap, int nCIDs, GBool needVerticalMetrics, FoFiOutputFunc outputFunc, void *outputStream) { @@ -701,7 +701,7 @@ void FoFiTrueType::convertToCIDType0(char *psName, delete ff; } -void FoFiTrueType::convertToType0(char *psName, Gushort *cidMap, int nCIDs, +void FoFiTrueType::convertToType0(char *psName, int *cidMap, int nCIDs, GBool needVerticalMetrics, FoFiOutputFunc outputFunc, void *outputStream) { @@ -828,7 +828,7 @@ void FoFiTrueType::convertToType0(char *psName, void FoFiTrueType::writeTTF(FoFiOutputFunc outputFunc, void *outputStream, char *name, - Gushort *codeToGID) { + int *codeToGID) { // this substitute cmap table maps char codes 0000-ffff directly to // glyphs 0000-ffff static char cmapTab[36] = { @@ -1499,7 +1499,7 @@ void FoFiTrueType::cvtEncoding(char **encoding, } void FoFiTrueType::cvtCharStrings(char **encoding, - Gushort *codeToGID, + int *codeToGID, FoFiOutputFunc outputFunc, void *outputStream) { char *name; diff --git a/fofi/FoFiTrueType.h b/fofi/FoFiTrueType.h index c8884d0..7a53ebc 100644 --- a/fofi/FoFiTrueType.h +++ b/fofi/FoFiTrueType.h @@ -71,7 +71,7 @@ public: int findCmap(int platform, int encoding); // Return the GID corresponding to <c> according to the <i>th cmap. - Gushort mapCodeToGID(int i, Guint c); + int mapCodeToGID(int i, Guint c); // map gid to vertical glyph gid if exist. // if not exist return original gid @@ -85,7 +85,7 @@ public: // Return the mapping from CIDs to GIDs, and return the number of // CIDs in *<nCIDs>. This is only useful for CID fonts. (Only // useful for OpenType CFF fonts.) - Gushort *getCIDToGIDMap(int *nCIDs); + int *getCIDToGIDMap(int *nCIDs); // Returns the least restrictive embedding licensing right (as // defined by the TrueType spec): @@ -104,7 +104,7 @@ public: // <codeToGID> array specifies the mapping from char codes to GIDs. // (Not useful for OpenType CFF fonts.) void convertToType42(char *psName, char **encoding, - Gushort *codeToGID, + int *codeToGID, FoFiOutputFunc outputFunc, void *outputStream); // Convert to a Type 1 font, suitable for embedding in a PostScript @@ -122,7 +122,7 @@ public: // name (so we don't need to depend on the 'name' table in the // font). The <cidMap> array maps CIDs to GIDs; it has <nCIDs> // entries. (Not useful for OpenType CFF fonts.) - void convertToCIDType2(char *psName, Gushort *cidMap, int nCIDs, + void convertToCIDType2(char *psName, int *cidMap, int nCIDs, GBool needVerticalMetrics, FoFiOutputFunc outputFunc, void *outputStream); @@ -137,7 +137,7 @@ public: // PostScript font name (so we don't need to depend on the 'name' // table in the font). The <cidMap> array maps CIDs to GIDs; it has // <nCIDs> entries. (Not useful for OpenType CFF fonts.) - void convertToType0(char *psName, Gushort *cidMap, int nCIDs, + void convertToType0(char *psName, int *cidMap, int nCIDs, GBool needVerticalMetrics, FoFiOutputFunc outputFunc, void *outputStream); @@ -154,7 +154,7 @@ public: // complete and correct, it will be written unmodified. (Not useful // for OpenType CFF fonts.) void writeTTF(FoFiOutputFunc outputFunc, void *outputStream, - char *name = NULL, Gushort *codeToGID = NULL); + char *name = NULL, int *codeToGID = NULL); int setupGSUB(const char *tagName); private: @@ -164,7 +164,7 @@ private: FoFiOutputFunc outputFunc, void *outputStream); void cvtCharStrings(char **encoding, - Gushort *codeToGID, + int *codeToGID, FoFiOutputFunc outputFunc, void *outputStream); void cvtSfnts(FoFiOutputFunc outputFunc, diff --git a/fofi/FoFiType1C.cc b/fofi/FoFiType1C.cc index 401d70b..c97f033 100644 --- a/fofi/FoFiType1C.cc +++ b/fofi/FoFiType1C.cc @@ -116,8 +116,8 @@ char **FoFiType1C::getEncoding() { return encoding; } -Gushort *FoFiType1C::getCIDToGIDMap(int *nCIDs) { - Gushort *map; +int *FoFiType1C::getCIDToGIDMap(int *nCIDs) { + int *map; int n, i; // a CID font's top dict has ROS as the first operator @@ -135,8 +135,8 @@ Gushort *FoFiType1C::getCIDToGIDMap(int *nCIDs) { } } ++n; - map = (Gushort *)gmallocn(n, sizeof(Gushort)); - memset(map, 0, n * sizeof(Gushort)); + map = (int *)gmallocn(n, sizeof(int)); + memset(map, 0, n * sizeof(int)); for (i = 0; i < nGlyphs; ++i) { map[charset[i]] = i; } diff --git a/fofi/FoFiType1C.h b/fofi/FoFiType1C.h index d48340b..2eb1308 100644 --- a/fofi/FoFiType1C.h +++ b/fofi/FoFiType1C.h @@ -163,7 +163,7 @@ public: // Return the mapping from CIDs to GIDs, and return the number of // CIDs in *<nCIDs>. This is only useful for CID fonts. - Gushort *getCIDToGIDMap(int *nCIDs); + int *getCIDToGIDMap(int *nCIDs); // Convert to a Type 1 font, suitable for embedding in a PostScript // file. This is only useful with 8-bit fonts. If <newEncoding> is diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc index b827465..90407fa 100644 --- a/poppler/CairoFontEngine.cc +++ b/poppler/CairoFontEngine.cc @@ -65,7 +65,7 @@ CairoFont::CairoFont(Ref ref, cairo_font_face_t *cairo_font_face, - Gushort *codeToGID, + int *codeToGID, Guint codeToGIDLen, GBool substitute, GBool printing) : ref(ref), @@ -368,7 +368,7 @@ _ft_new_face (FT_Library lib, CairoFreeTypeFont::CairoFreeTypeFont(Ref ref, cairo_font_face_t *cairo_font_face, - Gushort *codeToGID, + int *codeToGID, Guint codeToGIDLen, GBool substitute) : CairoFont(ref, cairo_font_face, @@ -398,7 +398,7 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Face face; cairo_font_face_t *font_face; - Gushort *codeToGID; + int *codeToGID; Guint codeToGIDLen; dfp = NULL; @@ -458,12 +458,12 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, enc = ((Gfx8BitFont *)gfxFont)->getEncoding(); - codeToGID = (Gushort *)gmallocn(256, sizeof(int)); + codeToGID = (int *)gmallocn(256, sizeof(int)); codeToGIDLen = 256; for (i = 0; i < 256; ++i) { codeToGID[i] = 0; if ((name = enc[i])) { - codeToGID[i] = (Gushort)FT_Get_Name_Index(face, name); + codeToGID[i] = FT_Get_Name_Index(face, name); } } break; @@ -474,9 +474,9 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, if (((GfxCIDFont *)gfxFont)->getCIDToGID()) { n = ((GfxCIDFont *)gfxFont)->getCIDToGIDLen(); if (n) { - codeToGID = (Gushort *)gmallocn(n, sizeof(Gushort)); + codeToGID = (int *)gmallocn(n, sizeof(int)); memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(), - n * sizeof(Gushort)); + n * sizeof(int)); } } else { if (font_data != NULL) { @@ -667,7 +667,7 @@ CairoType3Font *CairoType3Font::create(GfxFont *gfxFont, XRef *xref, type3_font_info_t *info; cairo_font_face_t *font_face; Ref ref; - Gushort *codeToGID; + int *codeToGID; Guint codeToGIDLen; int i, j; char **enc; @@ -689,14 +689,14 @@ CairoType3Font *CairoType3Font::create(GfxFont *gfxFont, XRef *xref, cairo_font_face_set_user_data (font_face, &type3_font_key, (void *) info, _free_type3_font_info); enc = ((Gfx8BitFont *)gfxFont)->getEncoding(); - codeToGID = (Gushort *)gmallocn(256, sizeof(int)); + codeToGID = (int *)gmallocn(256, sizeof(int)); codeToGIDLen = 256; for (i = 0; i < 256; ++i) { codeToGID[i] = 0; if (charProcs && (name = enc[i])) { for (j = 0; j < charProcs->getLength(); j++) { if (strcmp(name, charProcs->getKey(j)) == 0) { - codeToGID[i] = (Gushort) j; + codeToGID[i] = j; } } } @@ -709,7 +709,7 @@ CairoType3Font::CairoType3Font(Ref ref, XRef *xref, Catalog *catalog, cairo_font_face_t *cairo_font_face, - Gushort *codeToGID, + int *codeToGID, Guint codeToGIDLen, GBool printing) : CairoFont(ref, cairo_font_face, diff --git a/poppler/CairoFontEngine.h b/poppler/CairoFontEngine.h index 552b5e6..74e9aad 100644 --- a/poppler/CairoFontEngine.h +++ b/poppler/CairoFontEngine.h @@ -44,7 +44,7 @@ class CairoFont { public: CairoFont(Ref ref, cairo_font_face_t *face, - Gushort *codeToGID, + int *codeToGID, Guint codeToGIDLen, GBool substitute, GBool printing); @@ -60,7 +60,7 @@ protected: Ref ref; cairo_font_face_t *cairo_font_face; - Gushort *codeToGID; + int *codeToGID; Guint codeToGIDLen; GBool substitute; @@ -76,7 +76,7 @@ public: private: CairoFreeTypeFont(Ref ref, cairo_font_face_t *cairo_font_face, - Gushort *codeToGID, Guint codeToGIDLen, GBool substitute); + int *codeToGID, Guint codeToGIDLen, GBool substitute); }; //------------------------------------------------------------------------ @@ -93,7 +93,7 @@ public: private: CairoType3Font(Ref ref, XRef *xref, Catalog *catalog, cairo_font_face_t *cairo_font_face, - Gushort *codeToGID, Guint codeToGIDLen, + int *codeToGID, Guint codeToGIDLen, GBool printing); XRef *xref; Catalog *catalog; diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc index 20b68cb..79b2f0a 100644 --- a/poppler/GfxFont.cc +++ b/poppler/GfxFont.cc @@ -1166,8 +1166,8 @@ CharCodeToUnicode *Gfx8BitFont::getToUnicode() { return ctu; } -Gushort *Gfx8BitFont::getCodeToGIDMap(FoFiTrueType *ff) { - Gushort *map; +int *Gfx8BitFont::getCodeToGIDMap(FoFiTrueType *ff) { + int *map; int cmapPlatform, cmapEncoding; int unicodeCmap, macRomanCmap, msSymbolCmap, cmap; GBool useMacRoman, useUnicode; @@ -1175,7 +1175,7 @@ Gushort *Gfx8BitFont::getCodeToGIDMap(FoFiTrueType *ff) { Unicode u; int code, i, n; - map = (Gushort *)gmallocn(256, sizeof(Gushort)); + map = (int *)gmallocn(256, sizeof(int)); for (i = 0; i < 256; ++i) { map[i] = 0; } @@ -1281,7 +1281,7 @@ Gushort *Gfx8BitFont::getCodeToGIDMap(FoFiTrueType *ff) { // try the TrueType 'post' table to handle any unmapped characters for (i = 0; i < 256; ++i) { if (!map[i] && (charName = enc[i])) { - map[i] = (Gushort)(int)ff->mapNameToGID(charName); + map[i] = ff->mapNameToGID(charName); } } @@ -1505,15 +1505,15 @@ GfxCIDFont::GfxCIDFont(XRef *xref, const char *tagA, Ref idA, GooString *nameA, if (obj1.isStream()) { cidToGIDLen = 0; i = 64; - cidToGID = (Gushort *)gmallocn(i, sizeof(Gushort)); + cidToGID = (int *)gmallocn(i, sizeof(int)); obj1.streamReset(); while ((c1 = obj1.streamGetChar()) != EOF && (c2 = obj1.streamGetChar()) != EOF) { if (cidToGIDLen == i) { i *= 2; - cidToGID = (Gushort *)greallocn(cidToGID, i, sizeof(Gushort)); + cidToGID = (int *)greallocn(cidToGID, i, sizeof(int)); } - cidToGID[cidToGIDLen++] = (Gushort)((c1 << 8) + c2); + cidToGID[cidToGIDLen++] = (c1 << 8) + c2; } } else if (!obj1.isName("Identity") && !obj1.isNull()) { error(errSyntaxError, -1, "Invalid CIDToGIDMap entry in CID font"); @@ -1798,7 +1798,7 @@ GooString *GfxCIDFont::getCollection() { return cMap ? cMap->getCollection() : (GooString *)NULL; } -Gushort GfxCIDFont::mapCodeToGID(FoFiTrueType *ff, int cmapi, +int GfxCIDFont::mapCodeToGID(FoFiTrueType *ff, int cmapi, Unicode unicode, GBool wmode) { Gushort gid = ff->mapCodeToGID(cmapi,unicode); if (wmode) { @@ -1808,7 +1808,7 @@ Gushort GfxCIDFont::mapCodeToGID(FoFiTrueType *ff, int cmapi, return gid; } -Gushort *GfxCIDFont::getCodeToGIDMap(FoFiTrueType *ff, int *mapsizep) { +int *GfxCIDFont::getCodeToGIDMap(FoFiTrueType *ff, int *mapsizep) { #define N_UCS_CANDIDATES 2 /* space characters */ static const unsigned long spaces[] = { @@ -1892,7 +1892,7 @@ Gushort *GfxCIDFont::getCodeToGIDMap(FoFiTrueType *ff, int *mapsizep) { Unicode *humap = 0; Unicode *vumap = 0; Unicode *tumap = 0; - Gushort *codeToGID = 0; + int *codeToGID = 0; unsigned long n; int i; unsigned long code; @@ -2002,7 +2002,7 @@ Gushort *GfxCIDFont::getCodeToGIDMap(FoFiTrueType *ff, int *mapsizep) { } } // map CID -> Unicode -> GID - codeToGID = (Gushort *)gmallocn(n, sizeof(Gushort)); + codeToGID = (int *)gmallocn(n, sizeof(int)); for (code = 0; code < n; ++code) { Unicode unicode; unsigned long gid; diff --git a/poppler/GfxFont.h b/poppler/GfxFont.h index b94e597..bf26c13 100644 --- a/poppler/GfxFont.h +++ b/poppler/GfxFont.h @@ -295,7 +295,7 @@ public: // Return a char code-to-GID mapping for the provided font file. // (This is only useful for TrueType fonts.) - Gushort *getCodeToGIDMap(FoFiTrueType *ff); + int *getCodeToGIDMap(FoFiTrueType *ff); // Return the Type 3 CharProc dictionary, or NULL if none. Dict *getCharProcs(); @@ -347,23 +347,23 @@ public: // Return the CID-to-GID mapping table. These should only be called // if type is fontCIDType2. - Gushort *getCIDToGID() { return cidToGID; } + int *getCIDToGID() { return cidToGID; } int getCIDToGIDLen() { return cidToGIDLen; } - Gushort *getCodeToGIDMap(FoFiTrueType *ff, int *length); + int *getCodeToGIDMap(FoFiTrueType *ff, int *length); double getWidth(char* s, int len); private: virtual ~GfxCIDFont(); - Gushort mapCodeToGID(FoFiTrueType *ff, int cmapi, + int mapCodeToGID(FoFiTrueType *ff, int cmapi, Unicode unicode, GBool wmode); CMap *cMap; // char code --> CID CharCodeToUnicode *ctu; // CID --> Unicode GfxFontCIDWidths widths; // character widths - Gushort *cidToGID; // CID --> GID mapping (for embedded + int *cidToGID; // CID --> GID mapping (for embedded // TrueType fonts) int cidToGIDLen; }; diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc index 63e4eae..d8ec295 100644 --- a/poppler/PSOutputDev.cc +++ b/poppler/PSOutputDev.cc @@ -841,7 +841,7 @@ static const PSSubstFont psSubstFonts[] = { // Info for 8-bit fonts struct PSFont8Info { Ref fontID; - Gushort *codeToGID; // code-to-GID mapping for TrueType fonts + int *codeToGID; // code-to-GID mapping for TrueType fonts }; // Encoding info for substitute 16-bit font @@ -2222,7 +2222,7 @@ void PSOutputDev::setupEmbeddedTrueTypeFont(GfxFont *font, Ref *id, char *fontBuf; int fontLen; FoFiTrueType *ffTT; - Gushort *codeToGID; + int *codeToGID; int i; // check if font is already embedded @@ -2282,7 +2282,7 @@ GooString *PSOutputDev::setupExternalTrueTypeFont(GfxFont *font) { char *fontBuf; int fontLen; FoFiTrueType *ffTT; - Gushort *codeToGID; + int *codeToGID; GooString *psName; int i; @@ -2348,7 +2348,7 @@ GooString *PSOutputDev::setupExternalTrueTypeFont(GfxFont *font) { GooString *PSOutputDev::setupExternalCIDTrueTypeFont(GfxFont *font, GooString *fileName, int faceIndex) { FoFiTrueType *ffTT; - Gushort *codeToGID; + int *codeToGID; GooString *psName; int i; GooString *myFileName; @@ -2394,8 +2394,8 @@ GooString *PSOutputDev::setupExternalCIDTrueTypeFont(GfxFont *font, GooString *f if ((ffTT = FoFiTrueType::load(fileName->getCString(), faceIndex))) { int n = ((GfxCIDFont *)font)->getCIDToGIDLen(); if (n) { - codeToGID = (Gushort *)gmallocn(n, sizeof(Gushort)); - memcpy(codeToGID, ((GfxCIDFont *)font)->getCIDToGID(), n * sizeof(Gushort)); + codeToGID = (int *)gmallocn(n, sizeof(int)); + memcpy(codeToGID, ((GfxCIDFont *)font)->getCIDToGID(), n * sizeof(int)); } else { codeToGID = ((GfxCIDFont *)font)->getCodeToGIDMap(ffTT, &n); } @@ -4541,7 +4541,7 @@ void PSOutputDev::doPath(GfxPath *path) { void PSOutputDev::drawString(GfxState *state, GooString *s) { GfxFont *font; int wMode; - Gushort *codeToGID; + int *codeToGID; GooString *s2; double dx, dy, dx2, dy2, originX, originY; char *p; diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc index 09815ba..2263753 100644 --- a/poppler/SplashOutputDev.cc +++ b/poppler/SplashOutputDev.cc @@ -1738,7 +1738,7 @@ void SplashOutputDev::doUpdateFont(GfxState *state) { GooString *fileName; char *tmpBuf; int tmpBufLen; - Gushort *codeToGID; + int *codeToGID; DisplayFontParam *dfp; double *textMat; double m11, m12, m21, m22, fontSize; @@ -1896,9 +1896,9 @@ void SplashOutputDev::doUpdateFont(GfxState *state) { if (((GfxCIDFont *)gfxFont)->getCIDToGID()) { n = ((GfxCIDFont *)gfxFont)->getCIDToGIDLen(); if (n) { - codeToGID = (Gushort *)gmallocn(n, sizeof(Gushort)); + codeToGID = (int *)gmallocn(n, sizeof(int)); memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(), - n * sizeof(Gushort)); + n * sizeof(int)); } } else { if (fileName) diff --git a/splash/SplashFTFontEngine.cc b/splash/SplashFTFontEngine.cc index ffed747..676db5f 100644 --- a/splash/SplashFTFontEngine.cc +++ b/splash/SplashFTFontEngine.cc @@ -109,7 +109,7 @@ SplashFontFile *SplashFTFontEngine::loadOpenTypeT1CFont(SplashFontFileID *idA, SplashFontFile *SplashFTFontEngine::loadCIDFont(SplashFontFileID *idA, SplashFontSrc *src) { FoFiType1C *ff; - Gushort *cidToGIDMap; + int *cidToGIDMap; int nCIDs; SplashFontFile *ret; @@ -141,7 +141,7 @@ SplashFontFile *SplashFTFontEngine::loadCIDFont(SplashFontFileID *idA, SplashFontFile *SplashFTFontEngine::loadOpenTypeCFFFont(SplashFontFileID *idA, SplashFontSrc *src) { FoFiTrueType *ff; - Gushort *cidToGIDMap; + int *cidToGIDMap; int nCIDs; SplashFontFile *ret; @@ -170,7 +170,7 @@ SplashFontFile *SplashFTFontEngine::loadOpenTypeCFFFont(SplashFontFileID *idA, SplashFontFile *SplashFTFontEngine::loadTrueTypeFont(SplashFontFileID *idA, SplashFontSrc *src, - Gushort *codeToGID, + int *codeToGID, int codeToGIDLen, int faceIndex) { #if 0 diff --git a/splash/SplashFTFontEngine.h b/splash/SplashFTFontEngine.h index da85409..6bb40c8 100644 --- a/splash/SplashFTFontEngine.h +++ b/splash/SplashFTFontEngine.h @@ -56,7 +56,7 @@ public: SplashFontFile *loadCIDFont(SplashFontFileID *idA, SplashFontSrc *src); SplashFontFile *loadOpenTypeCFFFont(SplashFontFileID *idA, SplashFontSrc *src); SplashFontFile *loadTrueTypeFont(SplashFontFileID *idA, SplashFontSrc *src, - Gushort *codeToGID, int codeToGIDLen, int faceIndex = 0); + int *codeToGID, int codeToGIDLen, int faceIndex = 0); private: diff --git a/splash/SplashFTFontFile.cc b/splash/SplashFTFontFile.cc index 8575560..5bedb1a 100644 --- a/splash/SplashFTFontFile.cc +++ b/splash/SplashFTFontFile.cc @@ -41,7 +41,7 @@ SplashFontFile *SplashFTFontFile::loadType1Font(SplashFTFontEngine *engineA, SplashFontSrc *src, const char **encA) { FT_Face faceA; - Gushort *codeToGIDA; + int *codeToGIDA; const char *name; int i; @@ -52,11 +52,11 @@ SplashFontFile *SplashFTFontFile::loadType1Font(SplashFTFontEngine *engineA, if (FT_New_Memory_Face(engineA->lib, (const FT_Byte *)src->buf, src->bufLen, 0, &faceA)) return NULL; } - codeToGIDA = (Gushort *)gmallocn(256, sizeof(int)); + codeToGIDA = (int *)gmallocn(256, sizeof(int)); for (i = 0; i < 256; ++i) { codeToGIDA[i] = 0; if ((name = encA[i])) { - codeToGIDA[i] = (Gushort)FT_Get_Name_Index(faceA, (char *)name); + codeToGIDA[i] = (int)FT_Get_Name_Index(faceA, (char *)name); } } @@ -67,7 +67,7 @@ SplashFontFile *SplashFTFontFile::loadType1Font(SplashFTFontEngine *engineA, SplashFontFile *SplashFTFontFile::loadCIDFont(SplashFTFontEngine *engineA, SplashFontFileID *idA, SplashFontSrc *src, - Gushort *codeToGIDA, + int *codeToGIDA, int codeToGIDLenA) { FT_Face faceA; @@ -86,7 +86,7 @@ SplashFontFile *SplashFTFontFile::loadCIDFont(SplashFTFontEngine *engineA, SplashFontFile *SplashFTFontFile::loadTrueTypeFont(SplashFTFontEngine *engineA, SplashFontFileID *idA, SplashFontSrc *src, - Gushort *codeToGIDA, + int *codeToGIDA, int codeToGIDLenA, int faceIndexA) { FT_Face faceA; @@ -107,7 +107,7 @@ SplashFTFontFile::SplashFTFontFile(SplashFTFontEngine *engineA, SplashFontFileID *idA, SplashFontSrc *src, FT_Face faceA, - Gushort *codeToGIDA, int codeToGIDLenA, + int *codeToGIDA, int codeToGIDLenA, GBool trueTypeA): SplashFontFile(idA, src) { diff --git a/splash/SplashFTFontFile.h b/splash/SplashFTFontFile.h index 28ee0e5..f4a9ebd 100644 --- a/splash/SplashFTFontFile.h +++ b/splash/SplashFTFontFile.h @@ -47,11 +47,11 @@ public: static SplashFontFile *loadCIDFont(SplashFTFontEngine *engineA, SplashFontFileID *idA, SplashFontSrc *src, - Gushort *codeToCIDA, int codeToGIDLenA); + int *codeToCIDA, int codeToGIDLenA); static SplashFontFile *loadTrueTypeFont(SplashFTFontEngine *engineA, SplashFontFileID *idA, SplashFontSrc *src, - Gushort *codeToGIDA, + int *codeToGIDA, int codeToGIDLenA, int faceIndexA=0); @@ -68,12 +68,12 @@ private: SplashFontFileID *idA, SplashFontSrc *src, FT_Face faceA, - Gushort *codeToGIDA, int codeToGIDLenA, + int *codeToGIDA, int codeToGIDLenA, GBool trueTypeA); SplashFTFontEngine *engine; FT_Face face; - Gushort *codeToGID; + int *codeToGID; int codeToGIDLen; GBool trueType; diff --git a/splash/SplashFontEngine.cc b/splash/SplashFontEngine.cc index 3ce0d30..aff059d 100644 --- a/splash/SplashFontEngine.cc +++ b/splash/SplashFontEngine.cc @@ -257,7 +257,7 @@ SplashFontFile *SplashFontEngine::loadOpenTypeCFFFont(SplashFontFileID *idA, SplashFontFile *SplashFontEngine::loadTrueTypeFont(SplashFontFileID *idA, SplashFontSrc *src, - Gushort *codeToGID, + int *codeToGID, int codeToGIDLen, int faceIndex) { SplashFontFile *fontFile; diff --git a/splash/SplashFontEngine.h b/splash/SplashFontEngine.h index 7f84bd0..2d349ba 100644 --- a/splash/SplashFontEngine.h +++ b/splash/SplashFontEngine.h @@ -76,7 +76,7 @@ public: SplashFontFile *loadCIDFont(SplashFontFileID *idA, SplashFontSrc *src); SplashFontFile *loadOpenTypeCFFFont(SplashFontFileID *idA, SplashFontSrc *src); SplashFontFile *loadTrueTypeFont(SplashFontFileID *idA, SplashFontSrc *src, - Gushort *codeToGID, int codeToGIDLen, int faceIndex = 0); + int *codeToGID, int codeToGIDLen, int faceIndex = 0); // Get a font - this does a cache lookup first, and if not found, // creates a new SplashFont object and adds it to the cache. The _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
