From 70575ed3c0286cda0e288d2aff2b4c2b0e0c640a Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sun, 23 Sep 2018 13:24:30 +0200 Subject: FoFiTrueType: More const --- fofi/FoFiTrueType.cc | 48 ++++++++++++++++++++++++------------------------ fofi/FoFiTrueType.h | 50 +++++++++++++++++++++++++------------------------- 2 files changed, 49 insertions(+), 49 deletions(-) (limited to 'fofi') diff --git a/fofi/FoFiTrueType.cc b/fofi/FoFiTrueType.cc index 9b25bb60..459fa0cb 100644 --- a/fofi/FoFiTrueType.cc +++ b/fofi/FoFiTrueType.cc @@ -271,7 +271,7 @@ static const char *macGlyphNames[258] = { // FoFiTrueType //------------------------------------------------------------------------ -FoFiTrueType *FoFiTrueType::make(char *fileA, int lenA, int faceIndexA) { +FoFiTrueType *FoFiTrueType::make(const char *fileA, int lenA, int faceIndexA) { FoFiTrueType *ff; ff = new FoFiTrueType(fileA, lenA, gFalse, faceIndexA); @@ -298,7 +298,7 @@ FoFiTrueType *FoFiTrueType::load(const char *fileName, int faceIndexA) { return ff; } -FoFiTrueType::FoFiTrueType(char *fileA, int lenA, GBool freeFileDataA, int faceIndexA): +FoFiTrueType::FoFiTrueType(const char *fileA, int lenA, GBool freeFileDataA, int faceIndexA): FoFiBase(fileA, lenA, freeFileDataA) { tables = nullptr; @@ -318,19 +318,19 @@ FoFiTrueType::~FoFiTrueType() { gfree(cmaps); } -int FoFiTrueType::getNumCmaps() { +int FoFiTrueType::getNumCmaps() const { return nCmaps; } -int FoFiTrueType::getCmapPlatform(int i) { +int FoFiTrueType::getCmapPlatform(int i) const { return cmaps[i].platform; } -int FoFiTrueType::getCmapEncoding(int i) { +int FoFiTrueType::getCmapEncoding(int i) const { return cmaps[i].encoding; } -int FoFiTrueType::findCmap(int platform, int encoding) { +int FoFiTrueType::findCmap(int platform, int encoding) const { int i; for (i = 0; i < nCmaps; ++i) { @@ -341,7 +341,7 @@ int FoFiTrueType::findCmap(int platform, int encoding) { return -1; } -int FoFiTrueType::mapCodeToGID(int i, Guint c) { +int FoFiTrueType::mapCodeToGID(int i, Guint c) const { int gid; Guint segCnt, segEnd, segStart, segDelta, segOffset; Guint cmapFirst, cmapLen; @@ -438,7 +438,7 @@ int FoFiTrueType::mapCodeToGID(int i, Guint c) { return gid; } -int FoFiTrueType::mapNameToGID(char *name) const { +int FoFiTrueType::mapNameToGID(const char *name) const { const auto gid = nameToGID.find(name); if (gid == nameToGID.end()) { return 0; @@ -446,7 +446,7 @@ int FoFiTrueType::mapNameToGID(char *name) const { return gid->second; } -GBool FoFiTrueType::getCFFBlock(char **start, int *length) { +GBool FoFiTrueType::getCFFBlock(char **start, int *length) const { int i; if (!openTypeCFF || !tables) { @@ -461,7 +461,7 @@ GBool FoFiTrueType::getCFFBlock(char **start, int *length) { return gTrue; } -int *FoFiTrueType::getCIDToGIDMap(int *nCIDs) { +int *FoFiTrueType::getCIDToGIDMap(int *nCIDs) const { char *start; int length; FoFiType1C *ff; @@ -479,7 +479,7 @@ int *FoFiTrueType::getCIDToGIDMap(int *nCIDs) { return map; } -int FoFiTrueType::getEmbeddingRights() { +int FoFiTrueType::getEmbeddingRights() const { int i, fsType; GBool ok; @@ -503,7 +503,7 @@ int FoFiTrueType::getEmbeddingRights() { return 3; } -void FoFiTrueType::getFontMatrix(double *mat) { +void FoFiTrueType::getFontMatrix(double *mat) const { char *start; int length; FoFiType1C *ff; @@ -521,7 +521,7 @@ void FoFiTrueType::getFontMatrix(double *mat) { void FoFiTrueType::convertToType42(const char *psName, char **encoding, int *codeToGID, FoFiOutputFunc outputFunc, - void *outputStream) { + void *outputStream) const { GooString *buf; int maxUsedGlyph; GBool ok; @@ -561,7 +561,7 @@ void FoFiTrueType::convertToType42(const char *psName, char **encoding, void FoFiTrueType::convertToType1(const char *psName, const char **newEncoding, GBool ascii, FoFiOutputFunc outputFunc, - void *outputStream) { + void *outputStream) const { char *start; int length; FoFiType1C *ff; @@ -580,7 +580,7 @@ void FoFiTrueType::convertToCIDType2(const char *psName, int *cidMap, int nCIDs, GBool needVerticalMetrics, FoFiOutputFunc outputFunc, - void *outputStream) { + void *outputStream) const { GooString *buf; int cid, maxUsedGlyph; GBool ok; @@ -708,7 +708,7 @@ void FoFiTrueType::convertToCIDType2(const char *psName, void FoFiTrueType::convertToCIDType0(const char *psName, int *cidMap, int nCIDs, FoFiOutputFunc outputFunc, - void *outputStream) { + void *outputStream) const { char *start; int length; FoFiType1C *ff; @@ -727,7 +727,7 @@ void FoFiTrueType::convertToType0(const char *psName, int *cidMap, int nCIDs, GBool needVerticalMetrics, int *maxValidGlyph, FoFiOutputFunc outputFunc, - void *outputStream) { + void *outputStream) const { GooString *buf; GooString *sfntsName; int maxUsedGlyph, n, i, j; @@ -840,7 +840,7 @@ void FoFiTrueType::convertToType0(const char *psName, int *cidMap, int nCIDs, void FoFiTrueType::convertToType0(const char *psName, int *cidMap, int nCIDs, FoFiOutputFunc outputFunc, - void *outputStream) { + void *outputStream) const { char *start; int length; FoFiType1C *ff; @@ -857,7 +857,7 @@ void FoFiTrueType::convertToType0(const char *psName, int *cidMap, int nCIDs, void FoFiTrueType::cvtEncoding(char **encoding, FoFiOutputFunc outputFunc, - void *outputStream) { + void *outputStream) const { const char *name; GooString *buf; int i; @@ -887,7 +887,7 @@ void FoFiTrueType::cvtEncoding(char **encoding, void FoFiTrueType::cvtCharStrings(char **encoding, int *codeToGID, FoFiOutputFunc outputFunc, - void *outputStream) { + void *outputStream) const { char *name; GooString *buf; char buf2[16]; @@ -939,7 +939,7 @@ void FoFiTrueType::cvtCharStrings(char **encoding, void FoFiTrueType::cvtSfnts(FoFiOutputFunc outputFunc, void *outputStream, GooString *name, GBool needVerticalMetrics, - int *maxUsedGlyph) { + int *maxUsedGlyph) const { Guchar headData[54]; TrueTypeLoca *locaTable; Guchar *locaData; @@ -1260,7 +1260,7 @@ void FoFiTrueType::cvtSfnts(FoFiOutputFunc outputFunc, void FoFiTrueType::dumpString(const Guchar *s, int length, FoFiOutputFunc outputFunc, - void *outputStream) { + void *outputStream) const { GooString *buf; int pad, i, j; @@ -1287,7 +1287,7 @@ void FoFiTrueType::dumpString(const Guchar *s, int length, (*outputFunc)(outputStream, "00>\n", 4); } -Guint FoFiTrueType::computeTableChecksum(const Guchar *data, int length) { +Guint FoFiTrueType::computeTableChecksum(const Guchar *data, int length) const { Guint checksum, word; int i; @@ -1521,7 +1521,7 @@ void FoFiTrueType::readPostTable() { nameToGID.clear(); } -int FoFiTrueType::seekTable(const char *tag) { +int FoFiTrueType::seekTable(const char *tag) const { Guint tagI; int i; diff --git a/fofi/FoFiTrueType.h b/fofi/FoFiTrueType.h index 269880da..3524b139 100644 --- a/fofi/FoFiTrueType.h +++ b/fofi/FoFiTrueType.h @@ -50,7 +50,7 @@ class FoFiTrueType: public FoFiBase { public: // Create a FoFiTrueType object from a memory buffer. - static FoFiTrueType *make(char *fileA, int lenA, int faceIndexA=0); + static FoFiTrueType *make(const char *fileA, int lenA, int faceIndexA=0); // Create a FoFiTrueType object from a file on disk. static FoFiTrueType *load(const char *fileName, int faceIndexA=0); @@ -59,23 +59,23 @@ public: // Returns true if this an OpenType font containing CFF data, false // if it's a TrueType font (or OpenType font with TrueType data). - GBool isOpenTypeCFF() { return openTypeCFF; } + GBool isOpenTypeCFF() const { return openTypeCFF; } // Return the number of cmaps defined by this font. - int getNumCmaps(); + int getNumCmaps() const; // Return the platform ID of the th cmap. - int getCmapPlatform(int i); + int getCmapPlatform(int i) const; // Return the encoding ID of the th cmap. - int getCmapEncoding(int i); + int getCmapEncoding(int i) const; // Return the index of the cmap for , . Returns // -1 if there is no corresponding cmap. - int findCmap(int platform, int encoding); + int findCmap(int platform, int encoding) const; // Return the GID corresponding to according to the th cmap. - int mapCodeToGID(int i, Guint c); + int mapCodeToGID(int i, Guint c) const; // map gid to vertical glyph gid if exist. // if not exist return original gid @@ -84,12 +84,12 @@ public: // Returns the GID corresponding to according to the post // table. Returns 0 if there is no mapping for or if the // font does not have a post table. - int mapNameToGID(char *name) const; + int mapNameToGID(const char *name) const; // Return the mapping from CIDs to GIDs, and return the number of // CIDs in *. This is only useful for CID fonts. (Only // useful for OpenType CFF fonts.) - int *getCIDToGIDMap(int *nCIDs); + int *getCIDToGIDMap(int *nCIDs) const; // Returns the least restrictive embedding licensing right (as // defined by the TrueType spec): @@ -98,11 +98,11 @@ public: // * 2: editable embedding // * 1: preview & print embedding // * 0: restricted license embedding - int getEmbeddingRights(); + int getEmbeddingRights() const; // Return the font matrix as an array of six numbers. (Only useful // for OpenType CFF fonts.) - void getFontMatrix(double *mat); + void getFontMatrix(double *mat) const; // Convert to a Type 42 font, suitable for embedding in a PostScript // file. will be used as the PostScript font name (so we @@ -113,7 +113,7 @@ public: // (Not useful for OpenType CFF fonts.) void convertToType42(const char *psName, char **encoding, int *codeToGID, - FoFiOutputFunc outputFunc, void *outputStream); + FoFiOutputFunc outputFunc, void *outputStream) const; // Convert to a Type 1 font, suitable for embedding in a PostScript // file. This is only useful with 8-bit fonts. If is @@ -123,7 +123,7 @@ public: // non-NULL, it will be used as the PostScript font name. (Only // useful for OpenType CFF fonts.) void convertToType1(const char *psName, const char **newEncoding, GBool ascii, - FoFiOutputFunc outputFunc, void *outputStream); + FoFiOutputFunc outputFunc, void *outputStream) const; // Convert to a Type 2 CIDFont, suitable for embedding in a // PostScript file. will be used as the PostScript font @@ -132,13 +132,13 @@ public: // entries. (Not useful for OpenType CFF fonts.) void convertToCIDType2(const char *psName, int *cidMap, int nCIDs, GBool needVerticalMetrics, - FoFiOutputFunc outputFunc, void *outputStream); + FoFiOutputFunc outputFunc, void *outputStream) const; // Convert to a Type 0 CIDFont, suitable for embedding in a // PostScript file. will be used as the PostScript font // name. (Only useful for OpenType CFF fonts.) void convertToCIDType0(const char *psName, int *cidMap, int nCIDs, - FoFiOutputFunc outputFunc, void *outputStream); + FoFiOutputFunc outputFunc, void *outputStream) const; // Convert to a Type 0 (but non-CID) composite font, suitable for // embedding in a PostScript file. will be used as the @@ -148,18 +148,18 @@ public: void convertToType0(const char *psName, int *cidMap, int nCIDs, GBool needVerticalMetrics, int *maxValidGlyph, - FoFiOutputFunc outputFunc, void *outputStream); + FoFiOutputFunc outputFunc, void *outputStream) const; // Convert to a Type 0 (but non-CID) composite font, suitable for // embedding in a PostScript file. will be used as the // PostScript font name. (Only useful for OpenType CFF fonts.) void convertToType0(const char *psName, int *cidMap, int nCIDs, - FoFiOutputFunc outputFunc, void *outputStream); + FoFiOutputFunc outputFunc, void *outputStream) const; // Returns a pointer to the CFF font embedded in this OpenType font. // If successful, sets * and *, and returns true. // Otherwise returns false. (Only useful for OpenType CFF fonts). - GBool getCFFBlock(char **start, int *length); + GBool getCFFBlock(char **start, int *length) const; // setup vert/vrt2 GSUB for default lang int setupGSUB(const char *scriptName); @@ -169,25 +169,25 @@ public: private: - FoFiTrueType(char *fileA, int lenA, GBool freeFileDataA, int faceIndexA); + FoFiTrueType(const char *fileA, int lenA, GBool freeFileDataA, int faceIndexA); void cvtEncoding(char **encoding, FoFiOutputFunc outputFunc, - void *outputStream); + void *outputStream) const; void cvtCharStrings(char **encoding, int *codeToGID, FoFiOutputFunc outputFunc, - void *outputStream); + void *outputStream) const; void cvtSfnts(FoFiOutputFunc outputFunc, void *outputStream, GooString *name, GBool needVerticalMetrics, - int *maxUsedGlyph); + int *maxUsedGlyph) const; void dumpString(const Guchar *s, int length, FoFiOutputFunc outputFunc, - void *outputStream); - Guint computeTableChecksum(const Guchar *data, int length); + void *outputStream) const; + Guint computeTableChecksum(const Guchar *data, int length) const; void parse(); void readPostTable(); - int seekTable(const char *tag); + int seekTable(const char *tag) const; Guint charToTag(const char *tagName); Guint doMapToVertGID(Guint orgGID); Guint scanLookupList(Guint listIndex, Guint orgGID); -- cgit v1.2.3