bitmap.h   bitmap.h 
skipping to change at line 96 skipping to change at line 96
unsigned long *glyphCount, CharInfoPtr *glyphs ); unsigned long *glyphCount, CharInfoPtr *glyphs );
extern int bitmapGetMetrics ( FontPtr pFont, unsigned long count, extern int bitmapGetMetrics ( FontPtr pFont, unsigned long count,
unsigned char *chars, FontEncoding charEncodin g, unsigned char *chars, FontEncoding charEncodin g,
unsigned long *glyphCount, xCharInfo **glyphs ); unsigned long *glyphCount, xCharInfo **glyphs );
extern void bitmapComputeFontBounds ( FontPtr pFont ); extern void bitmapComputeFontBounds ( FontPtr pFont );
extern void bitmapComputeFontInkBounds ( FontPtr pFont ); extern void bitmapComputeFontInkBounds ( FontPtr pFont );
extern Bool bitmapAddInkMetrics ( FontPtr pFont ); extern Bool bitmapAddInkMetrics ( FontPtr pFont );
extern int bitmapComputeWeight ( FontPtr pFont ); extern int bitmapComputeWeight ( FontPtr pFont );
extern int BitmapOpenBitmap ( FontPathElementPtr fpe, FontPtr *ppFont,
int flags, FontEntryPtr entry, char *fileName,
fsBitmapFormat format, fsBitmapFormatMask fmas
k,
FontPtr non_cachable_font );
extern int BitmapGetInfoBitmap ( FontPathElementPtr fpe,
FontInfoPtr pFontInfo, FontEntryPtr entry,
char *fileName );
extern void BitmapRegisterFontFileFunctions ( void ); extern void BitmapRegisterFontFileFunctions ( void );
extern int BitmapGetRenderIndex ( FontRendererPtr renderer ); extern int BitmapGetRenderIndex ( FontRendererPtr renderer );
extern int BitmapOpenScalable ( FontPathElementPtr fpe, FontPtr *pFont, extern int BitmapOpenScalable ( FontPathElementPtr fpe, FontPtr *pFont,
int flags, FontEntryPtr entry, char *fileNam e, int flags, FontEntryPtr entry, char *fileNam e,
FontScalablePtr vals, fsBitmapFormat format, FontScalablePtr vals, fsBitmapFormat format,
fsBitmapFormatMask fmask, fsBitmapFormatMask fmask,
FontPtr non_cachable_font ); FontPtr non_cachable_font );
extern int BitmapGetInfoScalable ( FontPathElementPtr fpe, extern int BitmapGetInfoScalable ( FontPathElementPtr fpe,
FontInfoPtr pFontInfo, FontEntryPtr entry , FontInfoPtr pFontInfo, FontEntryPtr entry ,
 End of changes. 1 change blocks. 
8 lines changed or deleted 0 lines changed or added


 bufio.h   bufio.h 
skipping to change at line 75 skipping to change at line 75
int (*)(int, BufFilePtr), int (*)(int, BufFilePtr),
int (*)(BufFilePtr, int), int (*)(BufFilePtr, int),
int (*)(BufFilePtr, int)); int (*)(BufFilePtr, int));
extern BufFilePtr BufFileOpenRead ( int ); extern BufFilePtr BufFileOpenRead ( int );
extern BufFilePtr BufFileOpenWrite ( int ); extern BufFilePtr BufFileOpenWrite ( int );
extern BufFilePtr BufFilePushCompressed ( BufFilePtr ); extern BufFilePtr BufFilePushCompressed ( BufFilePtr );
#ifdef X_GZIP_FONT_COMPRESSION #ifdef X_GZIP_FONT_COMPRESSION
extern BufFilePtr BufFilePushZIP ( BufFilePtr ); extern BufFilePtr BufFilePushZIP ( BufFilePtr );
#endif #endif
extern int BufFileClose ( BufFilePtr, int ); extern int BufFileClose ( BufFilePtr, int );
extern int BufFileFlush ( BufFilePtr, int );
extern int BufFileRead ( BufFilePtr, char*, int ); extern int BufFileRead ( BufFilePtr, char*, int );
extern int BufFileWrite ( BufFilePtr, char*, int ); extern int BufFileWrite ( BufFilePtr, char*, int );
extern void BufFileFree ( BufFilePtr );
#define BufFileGet(f) ((f)->left-- ? *(f)->bufp++ : ((f)->eof = (*(f)->inp ut) (f))) #define BufFileGet(f) ((f)->left-- ? *(f)->bufp++ : ((f)->eof = (*(f)->inp ut) (f)))
#define BufFilePut(c,f) (--(f)->left ? *(f)->bufp++ = ((unsigned cha r)(c)) : (*(f)->output) ((unsigned char)(c),f)) #define BufFilePut(c,f) (--(f)->left ? *(f)->bufp++ = ((unsigned cha r)(c)) : (*(f)->output) ((unsigned char)(c),f))
#define BufFileSkip(f,c) ((f)->eof = (*(f)->skip) (f, c)) #define BufFileSkip(f,c) ((f)->eof = (*(f)->skip) (f, c))
#ifndef TRUE #ifndef TRUE
#define TRUE 1 #define TRUE 1
#endif #endif
#ifndef FALSE #ifndef FALSE
#define FALSE 0 #define FALSE 0
 End of changes. 2 change blocks. 
2 lines changed or deleted 0 lines changed or added


 fntfil.h   fntfil.h 
skipping to change at line 95 skipping to change at line 95
XID id, FontPtr *pFont, char **aliasName, XID id, FontPtr *pFont, char **aliasName,
FontPtr non_cachable_font ); FontPtr non_cachable_font );
extern void FontFileCloseFont ( FontPathElementPtr fpe, FontPtr pFont ); extern void FontFileCloseFont ( FontPathElementPtr fpe, FontPtr pFont );
extern int FontFileOpenBitmap ( FontPathElementPtr fpe, FontPtr *pFont, extern int FontFileOpenBitmap ( FontPathElementPtr fpe, FontPtr *pFont,
int flags, FontEntryPtr entry, int flags, FontEntryPtr entry,
fsBitmapFormat format, fsBitmapFormat format,
fsBitmapFormatMask fmask ); fsBitmapFormatMask fmask );
extern int FontFileListFonts ( pointer client, FontPathElementPtr fpe, extern int FontFileListFonts ( pointer client, FontPathElementPtr fpe,
char *pat, int len, int max, char *pat, int len, int max,
FontNamesPtr names ); FontNamesPtr names );
extern int FontFileStartListFonts ( pointer client, FontPathElementPtr fpe,
char *pat, int len, int max,
pointer *privatep, int mark_aliases );
extern int FontFileStartListFontsWithInfo ( pointer client, extern int FontFileStartListFontsWithInfo ( pointer client,
FontPathElementPtr fpe, FontPathElementPtr fpe,
char *pat, int len, int max, char *pat, int len, int max,
pointer *privatep ); pointer *privatep );
extern int FontFileListNextFontWithInfo ( pointer client, extern int FontFileListNextFontWithInfo ( pointer client,
FontPathElementPtr fpe, FontPathElementPtr fpe,
char **namep, int *namelenp, char **namep, int *namelenp,
FontInfoPtr *pFontInfo, FontInfoPtr *pFontInfo,
int *numFonts, pointer private ); int *numFonts, pointer private );
extern int FontFileStartListFontsAndAliases ( pointer client, extern int FontFileStartListFontsAndAliases ( pointer client,
FontPathElementPtr fpe, FontPathElementPtr fpe,
char *pat, int len, int max, char *pat, int len, int max,
pointer *privatep ); pointer *privatep );
extern int FontFileListNextFontOrAlias ( pointer client, extern int FontFileListNextFontOrAlias ( pointer client,
FontPathElementPtr fpe, FontPathElementPtr fpe,
char **namep, int *namelenp, char **namep, int *namelenp,
char **resolvedp, int *resolvedlenp , char **resolvedp, int *resolvedlenp ,
pointer private ); pointer private );
extern void FontFileRegisterLocalFpeFunctions ( void ); extern void FontFileRegisterLocalFpeFunctions ( void );
extern void CatalogueRegisterLocalFpeFunctions ( void );
extern FontEntryPtr FontFileAddEntry ( FontTablePtr table, extern FontEntryPtr FontFileAddEntry ( FontTablePtr table,
FontEntryPtr prototype ); FontEntryPtr prototype );
extern Bool FontFileAddFontAlias ( FontDirectoryPtr dir, char *aliasName, extern Bool FontFileAddFontAlias ( FontDirectoryPtr dir, char *aliasName,
char *fontName ); char *fontName );
extern Bool FontFileAddFontFile ( FontDirectoryPtr dir, char *fontName, extern Bool FontFileAddFontFile ( FontDirectoryPtr dir, char *fontName,
char *fileName ); char *fileName );
extern int FontFileCountDashes ( char *name, int namelen ); extern int FontFileCountDashes ( char *name, int namelen );
extern FontEntryPtr FontFileFindNameInDir ( FontTablePtr table, extern FontEntryPtr FontFileFindNameInDir ( FontTablePtr table,
FontNamePtr pat ); FontNamePtr pat );
 End of changes. 2 change blocks. 
0 lines changed or deleted 4 lines changed or added


 ft.h   ft.h 
skipping to change at line 92 skipping to change at line 92
/* ftenc.c */ /* ftenc.c */
int FTPickMapping(char*, int, char*, FT_Face, FTMappingPtr); int FTPickMapping(char*, int, char*, FT_Face, FTMappingPtr);
unsigned FTRemap(FT_Face face, FTMappingPtr, unsigned code); unsigned FTRemap(FT_Face face, FTMappingPtr, unsigned code);
/* fttools.c */ /* fttools.c */
int FTtoXReturnCode(int); int FTtoXReturnCode(int);
int FTGetEnglishName(FT_Face, int, char *, int); int FTGetEnglishName(FT_Face, int, char *, int);
int FTcheckForTTCName(char*, char**, int*);
extern void ErrorF(const char*, ...); extern void ErrorF(const char*, ...);
#endif /* _FT_H_ */ #endif /* _FT_H_ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 lines changed or added


 pcf.h   pcf.h 
skipping to change at line 39 skipping to change at line 39
*/ */
/* $XFree86: xc/lib/font/bitmap/pcf.h,v 1.4 2001/12/14 19:56:47 dawes Exp $ */ /* $XFree86: xc/lib/font/bitmap/pcf.h,v 1.4 2001/12/14 19:56:47 dawes Exp $ */
/* /*
* Author: Keith Packard, MIT X Consortium * Author: Keith Packard, MIT X Consortium
*/ */
#ifndef _PCF_H_ #ifndef _PCF_H_
#define _PCF_H_ #define _PCF_H_
#include <X11/fonts/fntfilio.h>
/* /*
* Information used to read/write PCF fonts * Information used to read/write PCF fonts
*/ */
typedef struct _PCFTable { typedef struct _PCFTable {
CARD32 type; CARD32 type;
CARD32 format; CARD32 format;
CARD32 size; CARD32 size;
CARD32 offset; CARD32 offset;
} PCFTableRec, *PCFTablePtr; } PCFTableRec, *PCFTablePtr;
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 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/