gEDA-cvs: pcb.git: branch: master updated (ac84c0aae23879d66f5dfe9740ca0b563adeec04)

[git@xxxxxxxxxx]

The branch, master has been updated
  discards  54c04e4d07ac74e5deabded920313f170056da67 (commit)
       via  ac84c0aae23879d66f5dfe9740ca0b563adeec04 (commit)
      from  54c04e4d07ac74e5deabded920313f170056da67 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/hid/common/hidgl.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)


=================
 Commit Messages
=================

commit ac84c0aae23879d66f5dfe9740ca0b563adeec04
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    hid/common/hidgl.c: Cast the function pointers passed to gluTessCallback()
    
    Silences compiler warnings about incompatible pointer types

:100644 100644 bbba217... 992f3e3... M	src/hid/common/hidgl.c

=========
 Changes
=========

commit ac84c0aae23879d66f5dfe9740ca0b563adeec04
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    hid/common/hidgl.c: Cast the function pointers passed to gluTessCallback()
    
    Silences compiler warnings about incompatible pointer types

diff --git a/src/hid/common/hidgl.c b/src/hid/common/hidgl.c
index bbba217..992f3e3 100644
--- a/src/hid/common/hidgl.c
+++ b/src/hid/common/hidgl.c
@@ -529,10 +529,10 @@ hidgl_fill_polygon (int n_coords, int *x, int *y)
   vertices = malloc (sizeof(GLdouble) * n_coords * 3);
 
   tobj = gluNewTess ();
-  gluTessCallback(tobj, GLU_TESS_BEGIN, myBegin);
-  gluTessCallback(tobj, GLU_TESS_VERTEX, myVertex);
-  gluTessCallback(tobj, GLU_TESS_COMBINE, myCombine);
-  gluTessCallback(tobj, GLU_TESS_ERROR, myError);
+  gluTessCallback(tobj, GLU_TESS_BEGIN,   (_GLUfuncptr)myBegin);
+  gluTessCallback(tobj, GLU_TESS_VERTEX,  (_GLUfuncptr)myVertex);
+  gluTessCallback(tobj, GLU_TESS_COMBINE, (_GLUfuncptr)myCombine);
+  gluTessCallback(tobj, GLU_TESS_ERROR,   (_GLUfuncptr)myError);
 
   gluTessBeginPolygon (tobj, NULL);
   gluTessBeginContour (tobj);
@@ -646,10 +646,10 @@ hidgl_fill_pcb_polygon (PolygonType *poly, const BoxType *clip_box, double scale
 
   info.vertices = malloc (sizeof(GLdouble) * vertex_count * 3);
   info.tobj = gluNewTess ();
-  gluTessCallback(info.tobj, GLU_TESS_BEGIN, myBegin);
-  gluTessCallback(info.tobj, GLU_TESS_VERTEX, myVertex);
-  gluTessCallback(info.tobj, GLU_TESS_COMBINE, myCombine);
-  gluTessCallback(info.tobj, GLU_TESS_ERROR, myError);
+  gluTessCallback(info.tobj, GLU_TESS_BEGIN,   (_GLUfuncptr)myBegin);
+  gluTessCallback(info.tobj, GLU_TESS_VERTEX,  (_GLUfuncptr)myVertex);
+  gluTessCallback(info.tobj, GLU_TESS_COMBINE, (_GLUfuncptr)myCombine);
+  gluTessCallback(info.tobj, GLU_TESS_ERROR,   (_GLUfuncptr)myError);
 
   glPushAttrib (GL_STENCIL_BUFFER_BIT);                 /* Save the write mask etc.. for final restore */
   glEnable (GL_STENCIL_TEST);




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs