--- font.c	2002/09/12 19:43:13	1.3
+++ font.c	2003/02/15 15:22:18	1.4
@@ -1,35 +1,43 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - font module 
- *
- *  Copyright(C) 2002 Peter Ross <pross@xvid.org>
- *
- *  This program is an implementation of a part of one or more MPEG-4
- *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
- *  to use this software module in hardware or software products are
- *  advised that its use may infringe existing patents or copyrights, and
- *  any such use would be at such party's own risk.  The original
- *  developer of this software module and his/her company, and subsequent
- *  editors and their companies, will have no liability for use of this
- *  software or modifications or derivatives thereof.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- ****************************************************************************/
+ /******************************************************************************
+  *                                                                            *
+  *  This file is part of XviD, a free MPEG-4 video encoder/decoder            *
+  *                                                                            *
+  *  XviD is free software; you can redistribute it and/or modify it           *
+  *  under the terms of the GNU General Public License as published by         *
+  *  the Free Software Foundation; either version 2 of the License, or         *
+  *  (at your option) any later version.                                       *
+  *                                                                            *
+  *  XviD is distributed in the hope that it will be useful, but               *
+  *  WITHOUT ANY WARRANTY; without even the implied warranty of                *
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+  *  GNU General Public License for more details.                              *
+  *                                                                            *
+  *  You should have received a copy of the GNU General Public License         *
+  *  along with this program; if not, write to the Free Software               *
+  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA  *
+  *                                                                            *
+  ******************************************************************************/
+
+ /******************************************************************************
+  *                                                                            *
+  *  font.c                                                                    *
+  *                                                                            *
+  *  Copyright (C) 2001 - Peter Ross <suxen_drol@hotmail.com>                  *
+  *                                                                            *
+  *  For more information visit the XviD homepage: http://www.xvid.org         *
+  *                                                                            *
+  ******************************************************************************/
+
+ /******************************************************************************
+  *                                                                            *
+  *  Revision history:                                                         *
+  *                                                                            *
+  *	 22.06.2002  inital version                                                *
+  *                                                                            *
+  ******************************************************************************/
 
+#include <stdio.h>
+#include <stdarg.h>
 
 #include "image.h"
 #include "font.h"
@@ -473,9 +481,9 @@
 		0,0,1,0,
 		0,0,1,0,
 		0,0,1,0,
-		0,1,1,0,
+		0,0,1,0,
+		0,1,1,0 },
 
-		0,0,1,0 },
 	{	0,1,0,1,		// ^
 		0,0,0,0,
 		0,0,0,0,
@@ -526,12 +534,12 @@
 {
 	va_list args;
 	char buf[FONT_BUF_SZ];
-	size_t i;
+	int i;
 
 	va_start(args, fmt);
 	vsprintf(buf, fmt, args);
 
-	for (i = 0; i < strlen(buf); i++) {
+	for (i = 0; i < buf[i]; i++) {
 		const char * font;
 
 		if (buf[i] >= '!' && buf[i] <= '@')