projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.31.tar.gz
[xscreensaver]
/
hacks
/
bumps.c
diff --git
a/hacks/bumps.c
b/hacks/bumps.c
index 49c47519aeadb0f99a705e1d476fab54a130f75a..20603986dde5cbef49b539120df7280fde0925b5 100644
(file)
--- a/
hacks/bumps.c
+++ b/
hacks/bumps.c
@@
-433,7
+433,7
@@
static void InitBumpMap_2(Display *dpy, SBumps *pBumps)
XWindowAttributes XWinAttribs;
XGetWindowAttributes( pBumps->dpy, pBumps->Win, &XWinAttribs );
XWindowAttributes XWinAttribs;
XGetWindowAttributes( pBumps->dpy, pBumps->Win, &XWinAttribs );
- pBumps->start_time = time ((time_t) 0);
+ pBumps->start_time = time ((time_t
*
) 0);
pScreenImage = XGetImage( pBumps->dpy, pBumps->source, 0, 0,
pBumps->iWinWidth, pBumps->iWinHeight,
pScreenImage = XGetImage( pBumps->dpy, pBumps->source, 0, 0,
pBumps->iWinWidth, pBumps->iWinHeight,
@@
-666,7
+666,7
@@
bumps_init (Display *dpy, Window Win)
Bumps->duration = get_integer_resource (dpy, "duration", "Seconds");
if (Bumps->delay < 0) Bumps->delay = 0;
if (Bumps->duration < 1) Bumps->duration = 1;
Bumps->duration = get_integer_resource (dpy, "duration", "Seconds");
if (Bumps->delay < 0) Bumps->delay = 0;
if (Bumps->duration < 1) Bumps->duration = 1;
- Bumps->start_time = time ((time_t) 0);
+ Bumps->start_time = time ((time_t
*
) 0);
return Bumps;
}
return Bumps;
}
@@
-684,7
+684,7
@@
bumps_draw (Display *dpy, Window window, void *closure)
}
if (!Bumps->img_loader &&
}
if (!Bumps->img_loader &&
- Bumps->start_time + Bumps->duration < time ((time_t) 0)) {
+ Bumps->start_time + Bumps->duration < time ((time_t
*
) 0)) {
Bumps->img_loader = load_image_async_simple (0, Bumps->screen,
Bumps->Win, Bumps->source,
0, 0);
Bumps->img_loader = load_image_async_simple (0, Bumps->screen,
Bumps->Win, Bumps->source,
0, 0);