projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://svn.poeml.de/viewvc/ppc/src-unpacked/xscreensaver/xscreensaver-4.12.tar.bz2...
[xscreensaver]
/
utils
/
logo.c
diff --git
a/utils/logo.c
b/utils/logo.c
index 858c68c90951ce82b6188502478331fba6648526..b0d7205186a36a0afec2d803cdeccdc5b3887b41 100644
(file)
--- a/
utils/logo.c
+++ b/
utils/logo.c
@@
-1,4
+1,4
@@
-/* xscreensaver, Copyright (c) 2001-2002 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2001-2002
, 2003
Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@
-49,7
+49,7
@@
static const char hex[128] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
static XImage *
parse_xpm_data (Display *dpy, Visual *visual, Colormap colormap, int depth,
unsigned long transparent_color,
static XImage *
parse_xpm_data (Display *dpy, Visual *visual, Colormap colormap, int depth,
unsigned long transparent_color,
-
unsigned
const char * const * data,
+ const char * const * data,
int *width_ret, int *height_ret,
unsigned long **pixels_ret, int *npixels_ret,
unsigned char **mask_ret)
int *width_ret, int *height_ret,
unsigned long **pixels_ret, int *npixels_ret,
unsigned char **mask_ret)
@@
-90,7
+90,7
@@
parse_xpm_data (Display *dpy, Visual *visual, Colormap colormap, int depth,
for (i = 0; i < ncolors; i++)
{
for (i = 0; i < ncolors; i++)
{
- const
unsigned
char *line = *data;
+ const char *line = *data;
cmap[i].byte = *line++;
while (*line)
{
cmap[i].byte = *line++;
while (*line)
{
@@
-175,10
+175,11
@@
parse_xpm_data (Display *dpy, Visual *visual, Colormap colormap, int depth,
ximage->data = (char *) calloc (ximage->height, ximage->bytes_per_line);
for (y = 0; y < h; y++)
{
ximage->data = (char *) calloc (ximage->height, ximage->bytes_per_line);
for (y = 0; y < h; y++)
{
- const
unsigned
char *line = *data++;
+ const char *line = *data++;
for (x = 0; x < w; x++)
{
for (x = 0; x < w; x++)
{
- int p = rmap[*line++];
+ int p = rmap[(int) *line];
+ line++;
XPutPixel (ximage, x, y,
(p == 255 ? transparent_color : pixels[p]));
XPutPixel (ximage, x, y,
(p == 255 ? transparent_color : pixels[p]));