From 13bc069810e3f513a9aa6cd44e8a37d02c7baabf Mon Sep 17 00:00:00 2001 From: Richard Rauch Date: Tue, 11 Nov 2003 11:52:14 +0000 Subject: [PATCH] Removal of all remaining TABs in the freeglut *.[ch] files. (I missed a few in the "one" demo, it seems, and some more crept back into freeglut_(ext|font).c, presumably due to my own edits when I forgot to use the "freeglut-c-mode" in EMACS.) git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@339 7f0cb862-5218-0410-a997-914c9d46530a --- include/GL/freeglut_std.h | 18 +++++++++--------- progs/demos/One/one.c | 8 ++++---- src/freeglut_ext.c | 4 ++-- src/freeglut_font.c | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h index 62c6fcd..d7bdec0 100644 --- a/include/GL/freeglut_std.h +++ b/include/GL/freeglut_std.h @@ -48,14 +48,14 @@ #else -# if defined(FREEGLUT_EXPORTS) -# define FGAPI __declspec(dllexport) -/* # define FGAPI */ -# else -# define FGAPI __declspec(dllimport) +# if defined(FREEGLUT_EXPORTS) +# define FGAPI __declspec(dllexport) +/* # define FGAPI */ +# else +# define FGAPI __declspec(dllimport) # pragma comment (lib, "freeglut.lib") /* link with Win32 freeglut lib */ -# endif -# define FGAPIENTRY __stdcall +# endif +# define FGAPIENTRY __stdcall #endif @@ -67,8 +67,8 @@ #else -# define FGAPI -# define FGAPIENTRY +# define FGAPI +# define FGAPIENTRY #endif /* diff --git a/progs/demos/One/one.c b/progs/demos/One/one.c index 7a714f4..7d609db 100644 --- a/progs/demos/One/one.c +++ b/progs/demos/One/one.c @@ -56,14 +56,14 @@ void PrintText( int nX, int nY, char* pszText ) glLoadIdentity(); /* - * Now the main text + * Now the main text */ glColor3ub( 0, 0, 0 ); glRasterPos2i( nX, nY ); for( p=pszText, lines=0; *p; p++ ) { - if( *p == '\n' ) + if( *p == '\n' ) { lines++; glRasterPos2i( nX, nY-(lines*18) ); @@ -71,7 +71,7 @@ void PrintText( int nX, int nY, char* pszText ) glutBitmapCharacter( GLUT_BITMAP_HELVETICA_18, *p ); } - + /* * Revert to the old matrix modes */ @@ -311,7 +311,7 @@ int main( int argc, char** argv ) printf( "current window is %ix%i+%i+%i", glutGet( GLUT_WINDOW_X ), glutGet( GLUT_WINDOW_Y ), glutGet( GLUT_WINDOW_WIDTH ), glutGet( GLUT_WINDOW_HEIGHT ) - ); + ); /* * Enter the main FreeGLUT processing loop diff --git a/src/freeglut_ext.c b/src/freeglut_ext.c index 5b2ca92..414885d 100644 --- a/src/freeglut_ext.c +++ b/src/freeglut_ext.c @@ -185,8 +185,8 @@ void *FGAPIENTRY glutGetProcAddress( const char *procName ) /* Try GLUT functions first */ int i; for( i = 0; glut_functions[ i ].name; i++ ) - if( strcmp( glut_functions[ i ].name, procName ) == 0) - return glut_functions[ i ].address; + if( strcmp( glut_functions[ i ].name, procName ) == 0) + return glut_functions[ i ].address; /* Try core GL functions */ #if TARGET_HOST_WIN32 diff --git a/src/freeglut_font.c b/src/freeglut_font.c index b15f410..7581365 100644 --- a/src/freeglut_font.c +++ b/src/freeglut_font.c @@ -120,10 +120,10 @@ void FGAPIENTRY glutBitmapCharacter( void* fontID, int character ) glPixelStorei( GL_UNPACK_SKIP_PIXELS, 0 ); glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); glBitmap( - face[ 0 ], font->Height, /* The bitmap's width and height */ - font->xorig, font->yorig, /* The origin in the font glyph */ - ( float )( face[ 0 ] ), 0.0, /* The raster advance -- inc. x,y */ - ( face + 1 ) /* The packed bitmap data... */ + face[ 0 ], font->Height, /* The bitmap's width and height */ + font->xorig, font->yorig, /* The origin in the font glyph */ + ( float )( face[ 0 ] ), 0.0, /* The raster advance -- inc. x,y */ + ( face + 1 ) /* The packed bitmap data... */ ); glPopClientAttrib( ); } -- 1.7.10.4