svn merge ^/branches/released .

1 files changed, 87 insertions, 90 deletions

diff --git a/libXfont/include/X11/fonts/bdfint.h b/libXfont/include/X11/fonts/bdfint.h
index d41c4a556..3663ed5b7 100644
--- a/libXfont/include/X11/fonts/bdfint.h
+++ b/libXfont/include/X11/fonts/bdfint.h
@@ -1,90 +1,87 @@
-/* $Xorg: bdfint.h,v 1.4 2001/02/09 02:04:01 xorgcvs Exp $ */
-
-/*
-
-Copyright 1990, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-/* $XFree86: xc/lib/font/bitmap/bdfint.h,v 1.4 2001/01/17 19:43:26 dawes Exp $ */
-
-#ifndef BDFINT_H
-#define BDFINT_H
-
-#define bdfIsPrefix(buf,str)	(!strncmp((char *)buf,str,strlen(str)))
-#define	bdfStrEqual(s1,s2)	(!strcmp(s1,s2))
-
-#define	BDF_GENPROPS	6
-#define NullProperty	((FontPropPtr)0)
-
-/*
- * This structure holds some properties we need to generate if they aren't
- * specified in the BDF file and some other values read from the file
- * that we'll need to calculate them.  We need to keep track of whether
- * or not we've read them.
- */
-typedef struct BDFSTAT {
-    int         linenum;
-    char       *fileName;
-    char        fontName[MAXFONTNAMELEN];
-    float       pointSize;
-    int         resolution_x;
-    int         resolution_y;
-    int         digitCount;
-    int         digitWidths;
-    int         exHeight;
-
-    FontPropPtr fontProp;
-    FontPropPtr pointSizeProp;
-    FontPropPtr resolutionXProp;
-    FontPropPtr resolutionYProp;
-    FontPropPtr resolutionProp;
-    FontPropPtr xHeightProp;
-    FontPropPtr weightProp;
-    FontPropPtr quadWidthProp;
-    BOOL        haveFontAscent;
-    BOOL        haveFontDescent;
-    BOOL        haveDefaultCh;
-}           bdfFileState;
-
-extern void bdfError ( char * message, ... );
-extern void bdfWarning ( char *message, ... );
-extern unsigned char * bdfGetLine ( FontFilePtr file, unsigned char *buf, 
-				    int len );
-extern Atom bdfForceMakeAtom ( char *str, int *size );
-extern Atom bdfGetPropertyValue ( char *s );
-extern int bdfIsInteger ( char *str );
-extern unsigned char bdfHexByte ( unsigned char *s );
-extern Bool bdfSpecialProperty ( FontPtr pFont, FontPropPtr prop, 
-				 char isString, bdfFileState *bdfState );
-extern int bdfReadFont( FontPtr pFont, FontFilePtr file, 
-			int bit, int byte, int glyph, int scan );
-extern int bdfReadFontInfo( FontInfoPtr pFontInfo, FontFilePtr file );
-
-extern void FontCharInkMetrics ( FontPtr pFont, CharInfoPtr pCI, 
-				 xCharInfo *pInk );
-extern void FontCharReshape ( FontPtr pFont, CharInfoPtr pSrc, 
-			      CharInfoPtr pDst );
-
-#endif				/* BDFINT_H */
+/*

+

+Copyright 1990, 1998  The Open Group

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included

+in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall

+not be used in advertising or otherwise to promote the sale, use or

+other dealings in this Software without prior written authorization

+from The Open Group.

+

+*/

+

+#ifndef BDFINT_H

+#define BDFINT_H

+

+#define bdfIsPrefix(buf,str)	(!strncmp((char *)buf,str,strlen(str)))

+#define	bdfStrEqual(s1,s2)	(!strcmp(s1,s2))

+

+#define	BDF_GENPROPS	6

+#define NullProperty	((FontPropPtr)0)

+

+/*

+ * This structure holds some properties we need to generate if they aren't

+ * specified in the BDF file and some other values read from the file

+ * that we'll need to calculate them.  We need to keep track of whether

+ * or not we've read them.

+ */

+typedef struct BDFSTAT {

+    int         linenum;

+    char       *fileName;

+    char        fontName[MAXFONTNAMELEN];

+    float       pointSize;

+    int         resolution_x;

+    int         resolution_y;

+    int         digitCount;

+    int         digitWidths;

+    int         exHeight;

+

+    FontPropPtr fontProp;

+    FontPropPtr pointSizeProp;

+    FontPropPtr resolutionXProp;

+    FontPropPtr resolutionYProp;

+    FontPropPtr resolutionProp;

+    FontPropPtr xHeightProp;

+    FontPropPtr weightProp;

+    FontPropPtr quadWidthProp;

+    BOOL        haveFontAscent;

+    BOOL        haveFontDescent;

+    BOOL        haveDefaultCh;

+}           bdfFileState;

+

+extern void bdfError ( char * message, ... );

+extern void bdfWarning ( char *message, ... );

+extern unsigned char * bdfGetLine ( FontFilePtr file, unsigned char *buf, 

+				    int len );

+extern Atom bdfForceMakeAtom ( char *str, int *size );

+extern Atom bdfGetPropertyValue ( char *s );

+extern int bdfIsInteger ( char *str );

+extern unsigned char bdfHexByte ( unsigned char *s );

+extern Bool bdfSpecialProperty ( FontPtr pFont, FontPropPtr prop, 

+				 char isString, bdfFileState *bdfState );

+extern int bdfReadFont( FontPtr pFont, FontFilePtr file, 

+			int bit, int byte, int glyph, int scan );

+extern int bdfReadFontInfo( FontInfoPtr pFontInfo, FontFilePtr file );

+

+extern void FontCharInkMetrics ( FontPtr pFont, CharInfoPtr pCI, 

+				 xCharInfo *pInk );

+extern void FontCharReshape ( FontPtr pFont, CharInfoPtr pSrc, 

+			      CharInfoPtr pDst );

+

+#endif				/* BDFINT_H */