"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "fofi/FoFiType1C.h" between
xpdf-4.01.01.tar.gz and xpdf-4.02.tar.gz

About: Xpdf is a PDF viewer for X.

FoFiType1C.h  (xpdf-4.01.01):FoFiType1C.h  (xpdf-4.02)
skipping to change at line 21 skipping to change at line 21
#include <aconf.h> #include <aconf.h>
#ifdef USE_GCC_PRAGMAS #ifdef USE_GCC_PRAGMAS
#pragma interface #pragma interface
#endif #endif
#include "gtypes.h" #include "gtypes.h"
#include "FoFiBase.h" #include "FoFiBase.h"
class GHash;
class GString; class GString;
//------------------------------------------------------------------------ //------------------------------------------------------------------------
struct Type1CIndex { struct Type1CIndex {
int pos; // absolute position in file int pos; // absolute position in file
int len; // length (number of entries) int len; // length (number of entries)
int offSize; // offset size int offSize; // offset size
int startPos; // position of start of index data - 1 int startPos; // position of start of index data - 1
int endPos; // position one byte past end of the index int endPos; // position one byte past end of the index
skipping to change at line 172 skipping to change at line 173
char *getName(); char *getName();
// Return the encoding, as an array of 256 names (any of which may // Return the encoding, as an array of 256 names (any of which may
// be NULL). This is only useful with 8-bit fonts. // be NULL). This is only useful with 8-bit fonts.
char **getEncoding(); char **getEncoding();
// Get the glyph names. // Get the glyph names.
int getNumGlyphs() { return nGlyphs; } int getNumGlyphs() { return nGlyphs; }
GString *getGlyphName(int gid); GString *getGlyphName(int gid);
// Returns a hash mapping glyph names to GIDs. This is only useful
// with 8-bit fonts.
GHash *getNameToGIDMap();
// Return the mapping from CIDs to GIDs, and return the number of // Return the mapping from CIDs to GIDs, and return the number of
// CIDs in *<nCIDs>. This is only useful for CID fonts. // CIDs in *<nCIDs>. This is only useful for CID fonts.
int *getCIDToGIDMap(int *nCIDs); int *getCIDToGIDMap(int *nCIDs);
// Return the font matrix as an array of six numbers. // Return the font matrix as an array of six numbers.
void getFontMatrix(double *mat); void getFontMatrix(double *mat);
// Convert to a Type 1 font, suitable for embedding in a PostScript // Convert to a Type 1 font, suitable for embedding in a PostScript
// file. This is only useful with 8-bit fonts. If <newEncoding> is // file. This is only useful with 8-bit fonts. If <newEncoding> is
// not NULL, it will be used in place of the encoding in the Type 1C // not NULL, it will be used in place of the encoding in the Type 1C
skipping to change at line 211 skipping to change at line 216
// PostScript font name. There are three cases for the CID-to-GID // PostScript font name. There are three cases for the CID-to-GID
// mapping: // mapping:
// (1) if <codeMap> is non-NULL, then it is the CID-to-GID mapping // (1) if <codeMap> is non-NULL, then it is the CID-to-GID mapping
// (2) if <codeMap> is NULL and this is a CID CFF font, then the // (2) if <codeMap> is NULL and this is a CID CFF font, then the
// font's internal CID-to-GID mapping is used // font's internal CID-to-GID mapping is used
// (3) is <codeMap> is NULL and this is an 8-bit CFF font, then // (3) is <codeMap> is NULL and this is an 8-bit CFF font, then
// the identity CID-to-GID mapping is used // the identity CID-to-GID mapping is used
void convertToType0(char *psName, int *codeMap, int nCodes, void convertToType0(char *psName, int *codeMap, int nCodes,
FoFiOutputFunc outputFunc, void *outputStream); FoFiOutputFunc outputFunc, void *outputStream);
// Write an OpenType file, encapsulating the CFF font. <widths>
// provides the glyph widths (in design units) for <nWidths> glyphs.
// The cmap table must be supplied by the caller.
void convertToOpenType(FoFiOutputFunc outputFunc, void *outputStream,
int nWidths, Gushort *widths,
Guchar *cmapTable, int cmapTableLen);
private: private:
FoFiType1C(char *fileA, int lenA, GBool freeFileDataA); FoFiType1C(char *fileA, int lenA, GBool freeFileDataA);
void eexecCvtGlyph(Type1CEexecBuf *eb, const char *glyphName, void eexecCvtGlyph(Type1CEexecBuf *eb, const char *glyphName,
int offset, int nBytes, int offset, int nBytes,
Type1CIndex *subrIdx, Type1CIndex *subrIdx,
Type1CPrivateDict *pDict); Type1CPrivateDict *pDict);
void cvtGlyph(int offset, int nBytes, GString *charBuf, void cvtGlyph(int offset, int nBytes, GString *charBuf,
Type1CIndex *subrIdx, Type1CPrivateDict *pDict, Type1CIndex *subrIdx, Type1CPrivateDict *pDict,
GBool top); GBool top);
void cvtGlyphWidth(GBool useOp, GString *charBuf, void cvtGlyphWidth(GBool useOp, GString *charBuf,
Type1CPrivateDict *pDict); Type1CPrivateDict *pDict);
void cvtNum(Type1COp op, GString *charBuf); void cvtNum(Type1COp op, GString *charBuf);
void eexecWrite(Type1CEexecBuf *eb, const char *s); void eexecWrite(Type1CEexecBuf *eb, const char *s);
void eexecWriteCharstring(Type1CEexecBuf *eb, Guchar *s, int n); void eexecWriteCharstring(Type1CEexecBuf *eb, Guchar *s, int n);
void writePSString(char *s, FoFiOutputFunc outputFunc, void *outputStream); void writePSString(char *s, FoFiOutputFunc outputFunc, void *outputStream);
Guint computeOpenTypeTableChecksum(Guchar *data, int length);
GBool parse(); GBool parse();
void readTopDict(); void readTopDict();
void readFD(int offset, int length, Type1CPrivateDict *pDict); void readFD(int offset, int length, Type1CPrivateDict *pDict);
void readPrivateDict(int offset, int length, Type1CPrivateDict *pDict); void readPrivateDict(int offset, int length, Type1CPrivateDict *pDict);
void readFDSelect(); void readFDSelect();
void buildEncoding(); void buildEncoding();
GBool readCharset(); GBool readCharset();
int getOp(int pos, GBool charstring, GBool *ok); int getOp(int pos, GBool charstring, GBool *ok);
int getDeltaIntArray(int *arr, int maxLen); int getDeltaIntArray(int *arr, int maxLen);
int getDeltaFPArray(double *arr, int maxLen); int getDeltaFPArray(double *arr, int maxLen);
 End of changes. 4 change blocks. 
0 lines changed or deleted 13 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)