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

Comparing ray/src/hd/rhd_ogl.c (file contents):
Revision 3.27 by greg, Fri Jan 21 00:52:59 2005 UTC vs.
Revision 3.30 by schorsch, Wed Jun 7 17:52:04 2006 UTC

# Line 235 | Line 235 | char  *id;
235                                          /* set window manager hints */
236          ourxwmhints.flags = InputHint|IconPixmapHint;
237          ourxwmhints.input = True;
238 <        ourxwmhints.icon_pixmap = XCreateBitmapFromData(ourdisplay,
239 <                        gwind, x11icon_bits, x11icon_width, x11icon_height);
238 >        ourxwmhints.icon_pixmap = XCreateBitmapFromData(ourdisplay, gwind,
239 >                        (char *)x11icon_bits, x11icon_width, x11icon_height);
240          XSetWMHints(ourdisplay, gwind, &ourxwmhints);
241          oursizhints.min_width = MINWIDTH;
242   #ifdef STEREO
# Line 324 | Line 324 | dev_view(                      /* assign new driver view */
324          register VIEW   *nv
325   )
326   {
327 + #ifdef STEREO
328 +        double  d;
329 + #endif
330          if (nv->type != VT_PER ||               /* check view legality */
331                          nv->horiz > 160. || nv->vert > 160.) {
332                  error(COMMAND, "illegal view type/angle");
# Line 765 | Line 768 | moveview(      /* move our view */
768   {
769          VIEW    nv;
770          FVECT   odir, v1, wip;
771 <        double  d, d1;
771 >        double  d;
772 > #ifdef DOBJ
773 >        double d1;
774 > #endif
775                                  /* start with old view */
776          nv = odev.v;
777                                  /* orient our motion */
# Line 821 | Line 827 | getframe(                              /* get focus frame */
827          int     startx = ebut->x, starty = ebut->y;
828          int     endx, endy, midx, midy;
829          FVECT   odir, v1;
830 <        double  d, d1;
830 >        double  d;
831 > #ifdef DOBJ
832 >        double d1;
833 > #endif
834                                                  /* get mouse drag */
835          XMaskEvent(ourdisplay, ButtonReleaseMask, levptr(XEvent));
836          endx = levptr(XButtonReleasedEvent)->x;

Diff Legend

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