ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/util/glrad.c
(Generate patch)

Comparing ray/src/util/glrad.c (file contents):
Revision 3.18 by schorsch, Fri Jan 2 12:51:54 2004 UTC vs.
Revision 3.21 by greg, Sun Sep 26 15:47:33 2010 UTC

# Line 203 | Line 203 | userr:
203  
204  
205   void
206 < quit(code)                              /* exit gracefully */
207 < int     code;
206 > quit(                           /* exit gracefully */
207 >        int     code
208 > )
209   {
210          if (ourdisplay != NULL)
211                  dev_close();
# Line 448 | Line 449 | dev_open(                      /* initialize GLX driver */
449                                          /* set window manager hints */
450          ourxwmhints.flags = InputHint|IconPixmapHint;
451          ourxwmhints.input = True;
452 <        ourxwmhints.icon_pixmap = XCreateBitmapFromData(ourdisplay,
453 <                gwind, glradicon_bits, glradicon_width, glradicon_height);
452 >        ourxwmhints.icon_pixmap = XCreateBitmapFromData(ourdisplay, gwind,
453 >                (char *)glradicon_bits, glradicon_width, glradicon_height);
454          XSetWMHints(ourdisplay, gwind, &ourxwmhints);
455                                          /* set GLX context */
456          glXMakeCurrent(ourdisplay, gwind, gctx);
# Line 672 | Line 673 | waitabit(void)                         /* pause a moment */
673   {
674          struct timespec ts;
675          ts.tv_sec = 0;
676 <        ts.tv_nsec = 5000000;
676 >        ts.tv_nsec = 50000000;
677          nanosleep(&ts, NULL);
678   }
679  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines