← Back to branch summary

~ubuntu-branches/ubuntu/quantal/xscreensaver/quantal

« back to all changes in this revision

Viewing changes to hacks/glx/polyhedra.c

  • Committer: Bazaar Package Importer
  • Author(s): Ted Gould
  • Date: 2008-08-28 16:15:25 UTC
  • mfrom: (1.1.6 upstream) (2.1.3 lenny)
  • Revision ID: james.westby@ubuntu.com-20080828161525-mxga521aoezxjq8h
Tags: 5.07-0ubuntu1
* Upgrade upstream version
* debian/control: Remove suggest xdaliclock as it is no longer
  included
* Remove 10_jwz-screensaver-randr-patch-3.patch as it has been merged
  upstream.
* Add 24_hacks_xsublim_enable.patch as it seems that xsublim was dropped
  from the build files.  There is nothing in the Changelog about it
  so I believe it was accidental.
* Updating the .desktop files from the XML files using gnome-screensaver's
  utility to do so.  Lots of text updates.  Also:
    * Added: abstractile.desktop
    * Added: cwaves.desktop
    * Added: m6502.desktop
    * Added: skytentacles.desktop
    * Removed: xteevee.desktop
* xscreensaver-gl-extra.files: Added skytentacles
* xscreensaver-data-extra.files: Added abstractile, cwaves and m6502
* xscreensaver-data.files: Remove partial abstractile, m6502 and cwaves

Show diffs side-by-side

added added

removed removed

Lines of Context:
hacks/glx/polyhedra.c
91
91
    } while(0)
92
92
 
93
93
#define Malloc(lvalue,n,type) do {\
94
 
        if (!(lvalue = (type*) malloc((n) * sizeof(type)))) \
 
94
        if (!(lvalue = (type*) calloc((n), sizeof(type)))) \
95
95
            Err("out of memory");\
96
96
    } while(0)
97
97
 
2418
2418
 
2419
2419
  int count = 0;
2420
2420
  polyhedron **result;
2421
 
  Malloc (result, last_uniform * 2 + 1, polyhedron*);
 
2421
  Malloc (result, last_uniform * 2 + 3, polyhedron*);
2422
2422
 
2423
2423
  while (index < last_uniform) {
2424
2424
    char sym[4];
2443
2443
  }
2444
2444
 
2445
2445
  *polyhedra_ret = result;
 
2446
  count++; /* leave room for teapot */
2446
2447
  return count;
2447
2448
}