← Back to branch summary

~cyphermox/ubuntu/precise/xscreensaver/merge-5.15-2

« back to all changes in this revision

Viewing changes to utils/minixpm.c

  • Committer: Mathieu Trudel-Lapierre
  • Date: 2011-12-21 15:57:35 UTC
  • mfrom: (1.1.13 upstream)
  • Revision ID: mathieu@canonical.com-20111221155735-m43kxy7824n1p36y
Merging shared upstream rev into target branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
utils/minixpm.c
76
76
 
77
77
  unsigned long *pixels;
78
78
  XImage *ximage = 0;
 
79
  
 
80
  memset (cmap, 0, sizeof(cmap)); /* avoid warnings */
79
81
 
80
82
  if (4 != sscanf ((const char *) *data,
81
83
                   "%d %d %d %d %c", &w, &h, &ncolors, &nbytes, &c)) {