summaryrefslogtreecommitdiffstats
path: root/progs/demos/copypix.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2009-12-18 08:12:55 -0700
committerBrian Paul <[email protected]>2009-12-18 13:58:14 -0700
commit263f4322e7bfa03a6c025dbc2b280e7f60e2cab1 (patch)
tree25aeab0940d8440aa88893d90f7cce7ee6a5fa99 /progs/demos/copypix.c
parentc8de081dc1f077a026a962244117ec69f0ba7055 (diff)
progs/demos: fix glut initialization calls
Remove glutInitWindowPosition() calls to play nicer with window managers. Move glutInitWindowSize() calls before glutInit() so the the default window size can be overridden by the -geometry cmd line option.
Diffstat (limited to 'progs/demos/copypix.c')
-rw-r--r--progs/demos/copypix.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/progs/demos/copypix.c b/progs/demos/copypix.c
index a13339ea62f..98c835f44f8 100644
--- a/progs/demos/copypix.c
+++ b/progs/demos/copypix.c
@@ -237,6 +237,9 @@ int main( int argc, char *argv[] )
const char *filename = IMAGE_FILE;
int i = 1;
+ glutInitWindowSize( WinWidth, WinHeight );
+ glutInit( &argc, argv );
+
if (argc > i && strcmp(argv[i], "-ci")==0) {
ciMode = GL_TRUE;
i++;
@@ -245,10 +248,6 @@ int main( int argc, char *argv[] )
filename = argv[i];
}
- glutInit( &argc, argv );
- glutInitWindowPosition( 0, 0 );
- glutInitWindowSize( WinWidth, WinHeight );
-
if (ciMode)
glutInitDisplayMode( GLUT_INDEX | GLUT_DOUBLE );
else