libXfont: headers diff between 1.3.4 and 1.4.0 versions

	bitmap.h	bitmap.h

	skipping to change at line 40	skipping to change at line 40
	/* $XFree86: xc/lib/font/include/bitmap.h,v 1.9 2001/01/17 19:43:31 dawes E xp $ */	/* $XFree86: xc/lib/font/include/bitmap.h,v 1.9 2001/01/17 19:43:31 dawes E xp $ */

	/*	/*
	* Author: Keith Packard, MIT X Consortium	* Author: Keith Packard, MIT X Consortium
	*/	*/

	#ifndef _BITMAP_H_	#ifndef _BITMAP_H_
	#define _BITMAP_H_	#define _BITMAP_H_

	#include <X11/fonts/fntfilio.h>	#include <X11/fonts/fntfilio.h>

	#ifndef FONTMODULE
	#include <stdio.h> /* just for NULL */	#include <stdio.h> /* just for NULL */

	#else
	#include "xf86_ansic.h"
	#endif

	/*	/*
	* Internal format used to store bitmap fonts	* Internal format used to store bitmap fonts
	*/	*/

	/* number of encoding entries in one segment */	/* number of encoding entries in one segment */
	#define BITMAP_FONT_SEGMENT_SIZE 128	#define BITMAP_FONT_SEGMENT_SIZE 128

	typedef struct _BitmapExtra {	typedef struct _BitmapExtra {
	Atom *glyphNames;	Atom *glyphNames;

	skipping to change at line 97	skipping to change at line 93
	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 void BitmapRegisterFontFileFunctions ( void );	extern void BitmapRegisterFontFileFunctions ( void );

	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 ,
	FontNamePtr fontName, char *fileName,	FontNamePtr fontName, char *fileName,
	FontScalablePtr vals );	FontScalablePtr vals );

End of changes. 3 change blocks.
	5 lines changed or deleted	0 lines changed or added

	bufio.h	bufio.h

	skipping to change at line 37	skipping to change at line 37
	from The Open Group.	from The Open Group.

	*/	*/
	/* $XFree86: xc/lib/font/include/bufio.h,v 1.6 2001/07/31 16:44:55 alanh Ex p $ */	/* $XFree86: xc/lib/font/include/bufio.h,v 1.6 2001/07/31 16:44:55 alanh Ex p $ */

	#ifndef ___BUFIO_H___	#ifndef ___BUFIO_H___
	#define ___BUFIO_H___ 1	#define ___BUFIO_H___ 1

	#include <X11/Xfuncproto.h>	#include <X11/Xfuncproto.h>


	#ifdef TEST

	#define xalloc(s) malloc(s)
	#define xfree(s) free(s)

	#endif

	#define BUFFILESIZE 8192	#define BUFFILESIZE 8192
	#define BUFFILEEOF -1	#define BUFFILEEOF -1

	typedef unsigned char BufChar;	typedef unsigned char BufChar;
	typedef struct _buffile *BufFilePtr;	typedef struct _buffile *BufFilePtr;

	typedef struct _buffile {	typedef struct _buffile {
	BufChar *bufp;	BufChar *bufp;
	int left;	int left;
	int eof;	int eof;

End of changes. 1 change blocks.
	7 lines changed or deleted	0 lines changed or added

	fntfilst.h	fntfilst.h

	skipping to change at line 37	skipping to change at line 37
	*/	*/
	/* $XFree86: xc/lib/font/include/fntfilst.h,v 3.8 2002/12/09 17:30:00 dawes Exp $ */	/* $XFree86: xc/lib/font/include/fntfilst.h,v 3.8 2002/12/09 17:30:00 dawes Exp $ */

	/*	/*
	* Author: Keith Packard, MIT X Consortium	* Author: Keith Packard, MIT X Consortium
	*/	*/

	#ifndef _FONTFILEST_H_	#ifndef _FONTFILEST_H_
	#define _FONTFILEST_H_	#define _FONTFILEST_H_


	#ifndef FONTMODULE
	#include <X11/Xos.h>	#include <X11/Xos.h>

	#endif
	#ifndef XP_PSTEXT	#ifndef XP_PSTEXT
	#include <X11/fonts/fontmisc.h>	#include <X11/fonts/fontmisc.h>
	#endif	#endif
	#include <X11/fonts/fontstruct.h>	#include <X11/fonts/fontstruct.h>
	#include <X11/fonts/fontxlfd.h>	#include <X11/fonts/fontxlfd.h>
	#include <X11/fonts/fntfil.h>	#include <X11/fonts/fntfil.h>

	typedef struct _FontName {	typedef struct _FontName {
	char *name;	char *name;
	short length;	short length;

End of changes. 2 change blocks.
	2 lines changed or deleted	0 lines changed or added

	fontconf.h	fontconf.h

	skipping to change at line 27	skipping to change at line 27
	* EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR	* EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
	* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF U SE,	* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF U SE,
	* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER	* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
	* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR	* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
	* PERFORMANCE OF THIS SOFTWARE.	* PERFORMANCE OF THIS SOFTWARE.
	*/	*/

	/* Define as 1 if you have FreeType support in Xfont */	/* Define as 1 if you have FreeType support in Xfont */
	#define XFONT_FREETYPE 1	#define XFONT_FREETYPE 1


	/* Define as 1 if you have Type1 font support in Xfont */
	#define XFONT_TYPE1 1

	/* Define as 1 if you have Speedo support in Xfont */
	#define XFONT_SPEEDO 1

	/* Define as 1 if you have builtin font support in Xfont */	/* Define as 1 if you have builtin font support in Xfont */
	#define XFONT_BUILTINS 1	#define XFONT_BUILTINS 1

	/* Define as 1 if you have pcf font support in Xfont */	/* Define as 1 if you have pcf font support in Xfont */
	#define XFONT_PCFFORMAT 1	#define XFONT_PCFFORMAT 1

	/* Define as 1 if you have bdf font support in Xfont */	/* Define as 1 if you have bdf font support in Xfont */
	#define XFONT_BDFFORMAT 1	#define XFONT_BDFFORMAT 1

	/* Define as 1 if you have snf font support in Xfont */	/* Define as 1 if you have snf font support in Xfont */

End of changes. 1 change blocks.
	6 lines changed or deleted	0 lines changed or added

	fontmisc.h	fontmisc.h

	/* $Xorg: fontmisc.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */

	/*	/*

	Copyright 1991, 1998 The Open Group	Copyright 1991, 1998 The Open Group

	Permission to use, copy, modify, distribute, and sell this software and its	Permission to use, copy, modify, distribute, and sell this software and its
	documentation for any purpose is hereby granted without fee, provided that	documentation for any purpose is hereby granted without fee, provided that
	the above copyright notice appear in all copies and that both that	the above copyright notice appear in all copies and that both that
	copyright notice and this permission notice appear in supporting	copyright notice and this permission notice appear in supporting
	documentation.	documentation.


	skipping to change at line 37	skipping to change at line 35
	*/	*/
	/* $XFree86: xc/lib/font/include/fontmisc.h,v 3.16 2001/12/14 19:56:54 dawe s Exp $ */	/* $XFree86: xc/lib/font/include/fontmisc.h,v 3.16 2001/12/14 19:56:54 dawe s Exp $ */

	/*	/*
	* Author: Keith Packard, MIT X Consortium	* Author: Keith Packard, MIT X Consortium
	*/	*/

	#ifndef _FONTMISC_H_	#ifndef _FONTMISC_H_
	#define _FONTMISC_H_	#define _FONTMISC_H_


	#ifndef FONTMODULE
	#include <X11/Xfuncs.h>	#include <X11/Xfuncs.h>
	#include <stdlib.h>	#include <stdlib.h>
	#include <stdio.h>	#include <stdio.h>


	#ifndef X_NOT_POSIX
	#include <unistd.h>	#include <unistd.h>

	#else
	extern int close();
	#endif

	#endif /* FONTMODULE */

	#include <X11/Xdefs.h>	#include <X11/Xdefs.h>

	#ifndef LSBFirst	#ifndef LSBFirst
	#define LSBFirst 0	#define LSBFirst 0
	#define MSBFirst 1	#define MSBFirst 1
	#endif	#endif

	#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 ( 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);


	#ifndef _HAVE_XALLOC_DECLS
	#define _HAVE_XALLOC_DECLS
	extern pointer Xalloc(unsigned long);
	extern pointer Xrealloc(pointer, unsigned long);
	extern void Xfree(pointer);
	extern pointer Xcalloc(unsigned long);
	#endif
	extern int f_strcasecmp(const char s1, const char s2);

	#ifndef xalloc
	#define xalloc(n) Xalloc ((unsigned) n)
	#define xfree(p) Xfree ((pointer) p)
	#define xrealloc(p,n) Xrealloc ((pointer)p,n)
	#define xcalloc(n,s) Xcalloc((unsigned) n * (unsigned) s)
	#endif
	#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)


	#ifndef strcasecmp
	#if defined(NEED_STRCASECMP) && !defined(FONTMODULE)
	#define strcasecmp(s1,s2) f_strcasecmp(s1,s2)
	#endif
	#endif

	extern void	extern void
	BitOrderInvert(	BitOrderInvert(
	register unsigned char *,	register unsigned char *,
	register int	register int
	);	);

	extern void	extern void
	TwoByteSwap(	TwoByteSwap(
	register unsigned char *,	register unsigned char *,
	register int	register int

End of changes. 6 change blocks.
	32 lines changed or deleted	0 lines changed or added

	ft.h	ft.h

	skipping to change at line 79	skipping to change at line 79
	int named;	int named;
	FT_CharMap cmap;	FT_CharMap cmap;
	int base;	int base;
	struct _FontMap mapping; / allow inclusion without fontenc.h */	struct _FontMap mapping; / allow inclusion without fontenc.h */
	} FTMappingRec, *FTMappingPtr;	} FTMappingRec, *FTMappingPtr;

	/* Prototypes */	/* Prototypes */

	/* ftfuncs.c */	/* ftfuncs.c */


	#if 0
	void FreeTypeRegisterFontFileFunctions(void);
	#endif

	/* 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);


End of changes. 1 change blocks.
	4 lines changed or deleted	0 lines changed or added

	pcf.h	pcf.h

	skipping to change at line 97	skipping to change at line 97
	#define PCF_BITMAPS (1<<3)	#define PCF_BITMAPS (1<<3)
	#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 pmfReadFont ( FontPtr pFont, FontFilePtr file,
	int bit, int byte, int glyph, int scan );
	extern int pcfWriteFont ( FontPtr pFont, FontFilePtr file );	extern int pcfWriteFont ( FontPtr pFont, FontFilePtr file );
	extern void pcfError ( const char *, ... );	extern void pcfError ( const char *, ... );

	#endif /* _PCF_H_ */	#endif /* _PCF_H_ */

End of changes. 1 change blocks.
	2 lines changed or deleted	0 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/