git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@26 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
cjp 2002-05-20 17:25:55 +00:00
parent 0c84f4f27e
commit 823e5f860a

View File

@ -137,7 +137,7 @@ void FGAPIENTRY glutBitmapCharacter( void* fontID, int character )
/* /*
* Make sure the character we want to output is valid * Make sure the character we want to output is valid
*/ */
freeglut_return_if_fail( character >= 0 && character < font->Quantity ); freeglut_return_if_fail( character >= 0 && character < font->256 );
/* /*
* Then find the character we want to draw * Then find the character we want to draw
@ -196,7 +196,7 @@ int FGAPIENTRY glutBitmapWidth( void* fontID, int character )
/* /*
* Make sure the character we want to output is valid * Make sure the character we want to output is valid
*/ */
freeglut_return_val_if_fail( character > 0 && character < font->Quantity, 0 ); freeglut_return_val_if_fail( character > 0 && character < font->256, 0 );
/* /*
* Scan the font looking for the specified character * Scan the font looking for the specified character
@ -225,6 +225,8 @@ void FGAPIENTRY glutStrokeCharacter( void* fontID, int character )
schar = font->Characters[character]; schar = font->Characters[character];
freeglut_return_if_fail( schar );
strip = schar->Strips; strip = schar->Strips;
for (i = 0; i < schar->Number; i++, strip++) for (i = 0; i < schar->Number; i++, strip++)
@ -254,7 +256,11 @@ int FGAPIENTRY glutStrokeWidth( void* fontID, int character )
*/ */
freeglut_return_if_fail( character >= 0 && character < font->Quantity ); freeglut_return_if_fail( character >= 0 && character < font->Quantity );
return (font->Characters[character]->Right); schar = font->Characters[character];
freeglut_return_if_fail( schar );
return (schar->Right);
} }
/* /*