projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resolution of X11 key-repeat handling
[freeglut]
/
src
/
freeglut_font.c
diff --git
a/src/freeglut_font.c
b/src/freeglut_font.c
index
52a80c1
..
59c1c1f
100644
(file)
--- a/
src/freeglut_font.c
+++ b/
src/freeglut_font.c
@@
-29,7
+29,7
@@
#include "config.h"
#endif
#include "config.h"
#endif
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
#include "freeglut_internal.h"
/*
#include "freeglut_internal.h"
/*
@@
-133,7
+133,7
@@
void FGAPIENTRY glutBitmapCharacter( void* fontID, int character )
void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string )
{
int c;
void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string )
{
int c;
- int numchar = strlen( string );
+ int numchar = strlen( (char *) string );
SFG_Font* font = fghFontByID( fontID );
float raster_position[ 4 ];
SFG_Font* font = fghFontByID( fontID );
float raster_position[ 4 ];
@@
-189,7
+189,7
@@
int FGAPIENTRY glutBitmapLength( void* fontID, const unsigned char* string )
{
int c, length = 0, this_line_length = 0;
SFG_Font* font = fghFontByID( fontID );
{
int c, length = 0, this_line_length = 0;
SFG_Font* font = fghFontByID( fontID );
- int numchar = strlen( string );
+ int numchar = strlen( (char *) string );
for( c = 0; c < numchar; c++ )
{
for( c = 0; c < numchar; c++ )
{
@@
-247,7
+247,7
@@
void FGAPIENTRY glutStrokeCharacter( void* fontID, int character )
void FGAPIENTRY glutStrokeString( void* fontID, const unsigned char *string )
{
int c, i, j;
void FGAPIENTRY glutStrokeString( void* fontID, const unsigned char *string )
{
int c, i, j;
- int numchar = strlen( string );
+ int numchar = strlen( (char *) string );
float length = 0.0;
SFG_StrokeFont* font = fghStrokeByID( fontID );
float length = 0.0;
SFG_StrokeFont* font = fghStrokeByID( fontID );
@@
-280,7
+280,7
@@
void FGAPIENTRY glutStrokeString( void* fontID, const unsigned char *string )
glEnd( );
}
glEnd( );
}
-
+
length += schar->Right;
glTranslatef( schar->Right, 0.0, 0.0 );
}
length += schar->Right;
glTranslatef( schar->Right, 0.0, 0.0 );
}
@@
-302,7
+302,7
@@
int FGAPIENTRY glutStrokeWidth( void* fontID, int character )
);
schar = font->Characters[ character ];
freeglut_return_val_if_fail( schar, 0 );
);
schar = font->Characters[ character ];
freeglut_return_val_if_fail( schar, 0 );
-
+
return ( int )( schar->Right + 0.5 );
}
return ( int )( schar->Right + 0.5 );
}
@@
-315,7
+315,7
@@
int FGAPIENTRY glutStrokeLength( void* fontID, const unsigned char* string )
float length = 0.0;
float this_line_length = 0.0;
SFG_StrokeFont* font = fghStrokeByID( fontID );
float length = 0.0;
float this_line_length = 0.0;
SFG_StrokeFont* font = fghStrokeByID( fontID );
- int numchar = strlen( string );
+ int numchar = strlen( (char *) string );
for( c = 0; c < numchar; c++ )
if( string[ c ] < font->Quantity )
for( c = 0; c < numchar; c++ )
if( string[ c ] < font->Quantity )