From d83464df48c71f95d5cddd95986121ac268151bb Mon Sep 17 00:00:00 2001 From: rkrolib Date: Fri, 14 Nov 2003 14:59:49 +0000 Subject: [PATCH] Yet more trivial style normalizations. Sorry, but that's all that I'm up to at the moment. On the plus, excepting the font_data file (which I've been skipping), up through this file, I think that the code style is pretty close to uniform. git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@345 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/freeglut_font.c | 4 ++-- freeglut/freeglut/src/freeglut_gamemode.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/freeglut/freeglut/src/freeglut_font.c b/freeglut/freeglut/src/freeglut_font.c index 3be0a0d..ae44763 100644 --- a/freeglut/freeglut/src/freeglut_font.c +++ b/freeglut/freeglut/src/freeglut_font.c @@ -333,7 +333,7 @@ int FGAPIENTRY glutStrokeLength( void* fontID, const unsigned char* string ) } if( length < this_line_length ) length = this_line_length; - return ( int )( length + 0.5 ); + return( int )( length + 0.5 ); } /* @@ -342,7 +342,7 @@ int FGAPIENTRY glutStrokeLength( void* fontID, const unsigned char* string ) GLfloat FGAPIENTRY glutStrokeHeight( void* fontID ) { SFG_StrokeFont* font = fghStrokeByID( fontID ); - return( font->Height ); + return font->Height; } /*** END OF FILE ***/ diff --git a/freeglut/freeglut/src/freeglut_gamemode.c b/freeglut/freeglut/src/freeglut_gamemode.c index 1d5397e..21484ad 100644 --- a/freeglut/freeglut/src/freeglut_gamemode.c +++ b/freeglut/freeglut/src/freeglut_gamemode.c @@ -97,7 +97,7 @@ void fghRememberState( void ) &fgDisplay.DisplayMode ); - if (!fgDisplay.DisplayModeValid) + if( !fgDisplay.DisplayModeValid ) fgWarning( "Runtime use of XF86VidModeGetModeLine failed.\n" ); # else @@ -148,7 +148,7 @@ void fghRestoreState( void ) * not approved as X Consortium standards */ - if (fgDisplay.DisplayModeValid) + if( fgDisplay.DisplayModeValid ) { XF86VidModeModeInfo** displayModes; int i, displayModesCount; @@ -216,10 +216,10 @@ GLboolean fghCheckDisplayMode( int width, int height, int depth, int refresh ) /* * The desired values should be stored in fgState structure... */ - return( (width == fgState.GameModeSize.X) && - (height == fgState.GameModeSize.Y) && - (depth == fgState.GameModeDepth) && - (refresh == fgState.GameModeRefresh) ); + return ( width == fgState.GameModeSize.X ) && + ( height == fgState.GameModeSize.Y ) && + ( depth == fgState.GameModeDepth ) && + (refresh == fgState.GameModeRefresh ); } /* @@ -239,7 +239,7 @@ GLboolean fghChangeDisplayMode( GLboolean haveToTest ) * This is also used by applcations which check modes by calling * glutGameModeGet(GLUT_GAME_MODE_POSSIBLE), so allow the check: */ - if (haveToTest || fgDisplay.DisplayModeValid) + if( haveToTest || fgDisplay.DisplayModeValid ) { XF86VidModeModeInfo** displayModes; int i, displayModesCount; @@ -311,7 +311,7 @@ GLboolean fghChangeDisplayMode( GLboolean haveToTest ) displayModes++; } - if ( mode == 0xffffffff ) + if( mode == 0xffffffff ) { /* then try without Display Frequency */ displayModes = 0; @@ -479,7 +479,7 @@ int FGAPIENTRY glutEnterGameMode( void ) # ifdef X_XF86VidModeSetViewPort - if (fgDisplay.DisplayModeValid) + if( fgDisplay.DisplayModeValid ) { int x, y; Window child;