bdfint.h   bdfint.h 
skipping to change at line 68 skipping to change at line 68
FontPropPtr resolutionYProp; FontPropPtr resolutionYProp;
FontPropPtr resolutionProp; FontPropPtr resolutionProp;
FontPropPtr xHeightProp; FontPropPtr xHeightProp;
FontPropPtr weightProp; FontPropPtr weightProp;
FontPropPtr quadWidthProp; FontPropPtr quadWidthProp;
BOOL haveFontAscent; BOOL haveFontAscent;
BOOL haveFontDescent; BOOL haveFontDescent;
BOOL haveDefaultCh; BOOL haveDefaultCh;
} bdfFileState; } bdfFileState;
extern void bdfError ( char * message, ... ); extern void bdfError ( const char * message, ... ) _X_ATTRIBUTE_PRINTF(1, 2
extern void bdfWarning ( char *message, ... ); );
extern void bdfWarning ( const char *message, ... ) _X_ATTRIBUTE_PRINTF(1,
2);
extern unsigned char * bdfGetLine ( FontFilePtr file, unsigned char *buf, extern unsigned char * bdfGetLine ( FontFilePtr file, unsigned char *buf,
int len ); int len );
extern Atom bdfForceMakeAtom ( char *str, int *size ); extern Atom bdfForceMakeAtom ( const char *str, int *size );
extern Atom bdfGetPropertyValue ( char *s ); extern Atom bdfGetPropertyValue ( char *s );
extern int bdfIsInteger ( char *str ); extern int bdfIsInteger ( char *str );
extern unsigned char bdfHexByte ( unsigned char *s ); extern unsigned char bdfHexByte ( unsigned char *s );
extern Bool bdfSpecialProperty ( FontPtr pFont, FontPropPtr prop, extern Bool bdfSpecialProperty ( FontPtr pFont, FontPropPtr prop,
char isString, bdfFileState *bdfState ); char isString, bdfFileState *bdfState );
extern int bdfReadFont( FontPtr pFont, FontFilePtr file, extern int bdfReadFont( FontPtr pFont, FontFilePtr file,
int bit, int byte, int glyph, int scan ); int bit, int byte, int glyph, int scan );
extern int bdfReadFontInfo( FontInfoPtr pFontInfo, FontFilePtr file ); extern int bdfReadFontInfo( FontInfoPtr pFontInfo, FontFilePtr file );
extern void FontCharInkMetrics ( FontPtr pFont, CharInfoPtr pCI, extern void FontCharInkMetrics ( FontPtr pFont, CharInfoPtr pCI,
 End of changes. 2 change blocks. 
3 lines changed or deleted 5 lines changed or added


 fntfil.h   fntfil.h 
skipping to change at line 140 skipping to change at line 140
extern int FontFileFindNamesInScalableDir ( FontTablePtr table, extern int FontFileFindNamesInScalableDir ( FontTablePtr table,
FontNamePtr pat, int max, FontNamePtr pat, int max,
FontNamesPtr names, FontNamesPtr names,
FontScalablePtr vals, FontScalablePtr vals,
int alias_behavior, int *newmax ); int alias_behavior, int *newmax );
extern void FontFileFreeDir ( FontDirectoryPtr dir ); extern void FontFileFreeDir ( FontDirectoryPtr dir );
extern void FontFileFreeEntry ( FontEntryPtr entry ); extern void FontFileFreeEntry ( FontEntryPtr entry );
extern void FontFileFreeTable ( FontTablePtr table ); extern void FontFileFreeTable ( FontTablePtr table );
extern Bool FontFileInitTable ( FontTablePtr table, int size ); extern Bool FontFileInitTable ( FontTablePtr table, int size );
extern FontDirectoryPtr FontFileMakeDir ( char *dirName, int size ); extern FontDirectoryPtr FontFileMakeDir ( const char *dirName, int size );
extern Bool FontFileMatchName ( char *name, int length, FontNamePtr pat ); extern Bool FontFileMatchName ( char *name, int length, FontNamePtr pat );
extern char * FontFileSaveString ( char *s ); extern char * FontFileSaveString ( char *s );
extern void FontFileSortDir ( FontDirectoryPtr dir ); extern void FontFileSortDir ( FontDirectoryPtr dir );
extern void FontFileSortTable ( FontTablePtr table ); extern void FontFileSortTable ( FontTablePtr table );
extern void FontDefaultFormat ( int *bit, int *byte, int *glyph, int *scan ); extern void FontDefaultFormat ( int *bit, int *byte, int *glyph, int *scan );
extern Bool FontFileRegisterRenderer ( FontRendererPtr renderer ); extern Bool FontFileRegisterRenderer ( FontRendererPtr renderer );
extern Bool FontFilePriorityRegisterRenderer ( FontRendererPtr renderer, extern Bool FontFilePriorityRegisterRenderer ( FontRendererPtr renderer,
int priority ); int priority );
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 fntfilst.h   fntfilst.h 
skipping to change at line 127 skipping to change at line 127
char *attributes; char *attributes;
} FontDirectoryRec; } FontDirectoryRec;
/* Capability bits: for definition of capabilities bitmap in the /* Capability bits: for definition of capabilities bitmap in the
FontRendererRec to indicate support of XLFD enhancements */ FontRendererRec to indicate support of XLFD enhancements */
#define CAP_MATRIX 0x1 #define CAP_MATRIX 0x1
#define CAP_CHARSUBSETTING 0x2 #define CAP_CHARSUBSETTING 0x2
typedef struct _FontRenderer { typedef struct _FontRenderer {
char *fileSuffix; const char *fileSuffix;
int fileSuffixLen; int fileSuffixLen;
int (*OpenBitmap)(FontPathElementPtr /* fpe */, int (*OpenBitmap)(FontPathElementPtr /* fpe */,
FontPtr * /* pFont */, FontPtr * /* pFont */,
int /* flags */, int /* flags */,
FontEntryPtr /* entry */, FontEntryPtr /* entry */,
char * /* fileName */, char * /* fileName */,
fsBitmapFormat /* format */, fsBitmapFormat /* format */,
fsBitmapFormatMask /* mask */, fsBitmapFormatMask /* mask */,
FontPtr /* non_cachable_font */); FontPtr /* non_cachable_font */);
int (*OpenScalable)(FontPathElementPtr /* fpe */, int (*OpenScalable)(FontPathElementPtr /* fpe */,
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 fontmisc.h   fontmisc.h 
skipping to change at line 54 skipping to change at line 54
#ifndef None #ifndef None
#define None 0l #define None 0l
#endif #endif
#ifndef TRUE #ifndef TRUE
#define TRUE 1 #define TRUE 1
#define FALSE 0 #define FALSE 0
#endif #endif
extern Atom MakeAtom ( char *string, unsigned len, int makeit ); extern Atom MakeAtom ( const char *string, unsigned len, int makeit );
extern int ValidAtom ( Atom atom ); extern int ValidAtom ( Atom atom );
extern char *NameForAtom (Atom atom); extern char *NameForAtom (Atom atom);
#define lowbit(x) ((x) & (~(x) + 1)) #define lowbit(x) ((x) & (~(x) + 1))
#undef assert #undef assert
#define assert(x) ((void)0) #define assert(x) ((void)0)
extern void extern void
BitOrderInvert( BitOrderInvert(
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 pcf.h   pcf.h 
skipping to change at line 95 skipping to change at line 95
#define PCF_INK_METRICS (1<<4) #define PCF_INK_METRICS (1<<4)
#define PCF_BDF_ENCODINGS (1<<5) #define PCF_BDF_ENCODINGS (1<<5)
#define PCF_SWIDTHS (1<<6) #define PCF_SWIDTHS (1<<6)
#define PCF_GLYPH_NAMES (1<<7) #define PCF_GLYPH_NAMES (1<<7)
#define PCF_BDF_ACCELERATORS (1<<8) #define PCF_BDF_ACCELERATORS (1<<8)
extern int pcfReadFont ( FontPtr pFont, FontFilePtr file, extern int pcfReadFont ( FontPtr pFont, FontFilePtr file,
int bit, int byte, int glyph, int scan ); int bit, int byte, int glyph, int scan );
extern int pcfReadFontInfo ( FontInfoPtr pFontInfo, FontFilePtr file ); extern int pcfReadFontInfo ( FontInfoPtr pFontInfo, FontFilePtr file );
extern int pcfWriteFont ( FontPtr pFont, FontFilePtr file ); extern int pcfWriteFont ( FontPtr pFont, FontFilePtr file );
extern void pcfError ( const char *, ... ); extern void pcfError ( const char *, ... ) _X_ATTRIBUTE_PRINTF(1, 2);
#endif /* _PCF_H_ */ #endif /* _PCF_H_ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/