ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/common/rglsurf.c
(Generate patch)

Comparing ray/src/common/rglsurf.c (file contents):
Revision 3.12 by greg, Tue Mar 30 20:40:03 2004 UTC vs.
Revision 3.13 by greg, Wed Apr 25 22:21:06 2012 UTC

# Line 115 | Line 115 | newtess()                      /* allocate GLU tessellation object */
115          gluTessCallback(gluto, GLU_TESS_BEGIN, glBegin);
116          gluTessCallback(gluto, GLU_TESS_VERTEX, glVertex3dv);
117          gluTessCallback(gluto, GLU_TESS_END, glEnd);
118 <        gluTessCallback(gluto, GLU_TESS_COMBINE, myCombine);
119 <        gluTessCallback(gluto, GLU_TESS_ERROR, glu_error);
118 >        gluTessCallback(gluto, GLU_TESS_COMBINE, (void*)myCombine);
119 >        gluTessCallback(gluto, GLU_TESS_ERROR, (void*)glu_error);
120          gluTessProperty(gluto, GLU_TESS_WINDING_RULE, GLU_TESS_WINDING_NONZERO);
121   }
122  
# Line 127 | Line 127 | newquadric()                   /* allocate GLU quadric structure */
127          if ((gluqo = gluNewQuadric()) == NULL)
128                  error(INTERNAL, "gluNewQuadric failed");
129          gluQuadricDrawStyle(gluqo, GLU_FILL);
130 <        gluQuadricCallback(gluqo, GLU_ERROR, glu_error);
130 >        gluQuadricCallback(gluqo, GLU_ERROR, (void*)glu_error);
131   }
132  
133  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)