SubWindow border thickness fix. Overlay changes in glutGet.

[freeglut] / freeglut-1.3 / freeglut_font.c

diff --git a/freeglut-1.3/freeglut_font.c b/freeglut-1.3/freeglut_font.c
index 20bbed4..c971ad6 100644 (file)
--- a/freeglut-1.3/freeglut_font.c
+++ b/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:
@@ -164,7 +164,7 @@ void FGAPIENTRY glutBitmapCharacter( void* fontID, int character )
   glBitmap(
       face[ 0 ], font->Height,      /* The bitmap's width and height */
       font->xorig, font->yorig,     /* The origin -- what on earth?  */
-      (float)(face[ 0 ] + 1), 0.0,  /* The raster advance -- inc. x  */
+      (float)(face[ 0 ]), 0.0,      /* The raster advance -- inc. x  */
       (face + 1)                    /* The packed bitmap data...     */
   );
 
@@ -226,7 +226,7 @@ void FGAPIENTRY glutBitmapString( void* fontID, const char *string )
         glBitmap(
             face[ 0 ], font->Height,      /* The bitmap's width and height */
             font->xorig, font->yorig,     /* The origin -- what on earth?  */
-            (float)(face[ 0 ] + 1), 0.0,  /* The raster advance -- inc. x  */
+            (float)(face[ 0 ]), 0.0,      /* The raster advance -- inc. x  */
             (face + 1)                    /* The packed bitmap data...     */
         ) ;
       }
@@ -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 ]) ;
     }
   }