From 263f4322e7bfa03a6c025dbc2b280e7f60e2cab1 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 18 Dec 2009 08:12:55 -0700
Subject: 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.
---
 progs/demos/fire.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'progs/demos/fire.c')

diff --git a/progs/demos/fire.c b/progs/demos/fire.c
index dd70f6141d..3db45418fa 100644
--- a/progs/demos/fire.c
+++ b/progs/demos/fire.c
@@ -733,7 +733,6 @@ main(int ac, char **av)
       HEIGHT = atoi(av[3]);
    }
 
-   glutInitWindowPosition(0, 0);
    glutInitWindowSize(WIDTH, HEIGHT);
    glutInit(&ac, av);
 
-- 
cgit v1.2.3


From d42467687e9de756aa3e4bca5e55f69391af3065 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Wed, 6 Jan 2010 21:39:44 -0800
Subject: progs/demos: Assert that input to malloc is valid.

---
 progs/demos/fire.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'progs/demos/fire.c')

diff --git a/progs/demos/fire.c b/progs/demos/fire.c
index dd70f6141d..f30b893dbf 100644
--- a/progs/demos/fire.c
+++ b/progs/demos/fire.c
@@ -6,6 +6,7 @@
  *            Humanware s.r.l.
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -759,6 +760,7 @@ main(int ac, char **av)
    glFogfv(GL_FOG_COLOR, fogcolor);
    glFogf(GL_FOG_DENSITY, 0.1);
 
+   assert(np > 0);
    p = (part *) malloc(sizeof(part) * np);
 
    for (i = 0; i < np; i++)
-- 
cgit v1.2.3