X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_font.c;h=4bdfa88e165a0913bcdf92da8b3f66a1c567f8ec;hb=81417e365e0eb2726f1806087f782335be18aef6;hp=ae4476387285da8b2089aefa006458cf1fbc2658;hpb=b6b35f14c7152d19facbeeea36d4c086290dae54;p=freeglut

diff --git a/src/freeglut_font.c b/src/freeglut_font.c
index ae44763..4bdfa88 100644
--- a/src/freeglut_font.c
+++ b/src/freeglut_font.c
@@ -62,18 +62,21 @@ extern SFG_StrokeFont fgStrokeMonoRoman;
  */
 static SFG_Font* fghFontByID( void* font )
 {
-    /*
-     * XXX Use a macro, a table of some kind, or else split these
-     * XXX statements properly.  Jamming "return" on the end of an
-     * XXX "if" is just bad style, IMHO.
-     */
-    if( font == GLUT_BITMAP_8_BY_13        ) return &fgFontFixed8x13;
-    if( font == GLUT_BITMAP_9_BY_15        ) return &fgFontFixed9x15;
-    if( font == GLUT_BITMAP_HELVETICA_10   ) return &fgFontHelvetica10;
-    if( font == GLUT_BITMAP_HELVETICA_12   ) return &fgFontHelvetica12;
-    if( font == GLUT_BITMAP_HELVETICA_18   ) return &fgFontHelvetica18;
-    if( font == GLUT_BITMAP_TIMES_ROMAN_10 ) return &fgFontTimesRoman10;
-    if( font == GLUT_BITMAP_TIMES_ROMAN_24 ) return &fgFontTimesRoman24;
+    if( font == GLUT_BITMAP_8_BY_13        )
+        return &fgFontFixed8x13;
+    if( font == GLUT_BITMAP_9_BY_15        )
+        return &fgFontFixed9x15;
+    if( font == GLUT_BITMAP_HELVETICA_10   )
+        return &fgFontHelvetica10;
+    if( font == GLUT_BITMAP_HELVETICA_12   )
+        return &fgFontHelvetica12;
+    if( font == GLUT_BITMAP_HELVETICA_18   )
+        return &fgFontHelvetica18;
+    if( font == GLUT_BITMAP_TIMES_ROMAN_10 )
+        return &fgFontTimesRoman10;
+    if( font == GLUT_BITMAP_TIMES_ROMAN_24 )
+        return &fgFontTimesRoman24;
+
     fgError( "font 0x%08x not found", font );
     return 0; /*** NOT REACHED ***/
 }
@@ -84,12 +87,11 @@ static SFG_Font* fghFontByID( void* font )
  */
 static SFG_StrokeFont* fghStrokeByID( void* font )
 {
-    /*
-     * XXX Same comment as above about jamming "return" in after an
-     * XXX "if".
-     */
-    if( font == GLUT_STROKE_ROMAN      ) return &fgStrokeRoman;
-    if( font == GLUT_STROKE_MONO_ROMAN ) return &fgStrokeMonoRoman;
+    if( font == GLUT_STROKE_ROMAN      )
+        return &fgStrokeRoman;
+    if( font == GLUT_STROKE_MONO_ROMAN )
+        return &fgStrokeMonoRoman;
+
     fgError( "stroke font 0x%08x not found", font );
     return 0; /*** NOT REACHED ***/
 }
@@ -131,7 +133,7 @@ void FGAPIENTRY glutBitmapCharacter( void* fontID, int character )
 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 ];
 
@@ -187,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 numchar = strlen( string );
+    int numchar = strlen( (char *) string );
 
     for( c = 0; c < numchar; c++ )
     {
@@ -245,7 +247,7 @@ void FGAPIENTRY glutStrokeCharacter( void* fontID, int character )
 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 );
 
@@ -313,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 );
-    int numchar = strlen( string );
+    int numchar = strlen( (char *) string );
 
     for( c = 0; c < numchar; c++ )
         if( string[ c ] < font->Quantity )