projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
3c30519
..
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"
#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:
/*
* TODO BEFORE THE STABLE RELEASE:
@@
-257,7
+257,7
@@
int FGAPIENTRY glutBitmapWidth( void* fontID, int character )
/*
* Scan the font looking for the specified 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 = 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 ]) ;
}
}
}
}