#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:
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... */
);
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... */
) ;
}
/*
* Scan the font looking for the specified character
*/
- return( *(font->Characters[ character - 1 ]) + 1 );
+ return( *(font->Characters[ character - 1 ]) );
}
/*
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 ]) ;
}
}