From e0b6ee526ec42fcfc015958088cf0f9f086b6bb5 Mon Sep 17 00:00:00 2001 From: dheyse Date: Fri, 7 Feb 2003 21:17:40 +0000 Subject: [PATCH] John fixed a bug that make bitmap font one pixel wider than its drawn. git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@47 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/freeglut-1.3/freeglut_font.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/freeglut/freeglut/freeglut-1.3/freeglut_font.c b/freeglut/freeglut/freeglut-1.3/freeglut_font.c index 3c30519..c971ad6 100644 --- a/freeglut/freeglut/freeglut-1.3/freeglut_font.c +++ b/freeglut/freeglut/freeglut-1.3/freeglut_font.c @@ -32,7 +32,7 @@ #define G_LOG_DOMAIN "freeglut-font" #include "../include/GL/freeglut.h" -#include "../include/GL/freeglut_internal.h" +#include "freeglut_internal.h" /* * TODO BEFORE THE STABLE RELEASE: @@ -257,7 +257,7 @@ int FGAPIENTRY glutBitmapWidth( void* fontID, int character ) /* * Scan the font looking for the specified character */ - return( *(font->Characters[ character - 1 ]) + 1 ); + return( *(font->Characters[ character - 1 ]) ); } /* @@ -286,7 +286,7 @@ int FGAPIENTRY glutBitmapLength( void* fontID, const char* string ) this_line_length = 0 ; } else /* Not a carriage return, increment the length of this line */ - this_line_length += *(font->Characters[ string[ c ] - 1 ]) + 1 ; + this_line_length += *(font->Characters[ string[ c ] - 1 ]) ; } }