diff --git a/Graphics/gl2ps.cpp b/Graphics/gl2ps.cpp
index 912caf8bcad1590235bfbc1a2f1e347bfe564141..ef2ca30d79d6892b1ee04c9fcff53543924a7094 100644
--- a/Graphics/gl2ps.cpp
+++ b/Graphics/gl2ps.cpp
@@ -1,4 +1,4 @@
-/* $Id: gl2ps.cpp,v 1.82 2003-11-10 01:32:18 geuzaine Exp $ */
+/* $Id: gl2ps.cpp,v 1.83 2003-11-16 16:49:37 geuzaine Exp $ */
/*
* GL2PS, an OpenGL to PostScript Printing Library
* Copyright (C) 1999-2003 Christophe Geuzaine <geuz@geuz.org>
@@ -296,21 +296,19 @@ void gl2psListSort(GL2PSlist *list,
qsort(list->array, list->n, list->size, fcmp);
}
-void gl2psListAction(GL2PSlist *list,
- void (*action)(void *data, void *dummy)){
- GLint i, dummy;
+void gl2psListAction(GL2PSlist *list, void (*action)(void *data)){
+ GLint i;
for(i = 0; i < gl2psListNbr(list); i++){
- (*action)(gl2psListPointer(list, i), &dummy);
+ (*action)(gl2psListPointer(list, i));
}
}
-void gl2psListActionInverse(GL2PSlist *list,
- void (*action)(void *data, void *dummy)){
- GLint i, dummy;
+void gl2psListActionInverse(GL2PSlist *list, void (*action)(void *data)){
+ GLint i;
for(i = gl2psListNbr(list); i > 0; i--){
- (*action)(gl2psListPointer(list, i-1), &dummy);
+ (*action)(gl2psListPointer(list, i-1));
}
}
@@ -753,10 +751,10 @@ GLint gl2psFindRoot(GL2PSlist *primitives, GL2PSprimitive **root){
}
}
-void gl2psFreePrimitive(void *a, void *b){
+void gl2psFreePrimitive(void *data){
GL2PSprimitive *q;
- q = *(GL2PSprimitive**)a;
+ q = *(GL2PSprimitive**)data;
gl2psFree(q->verts);
if(q->type == GL2PS_TEXT){
gl2psFree(q->data.text->str);
@@ -780,7 +778,7 @@ void gl2psAddPrimitiveInList(GL2PSprimitive *prim, GL2PSlist *list){
gl2psDivideQuad(prim, &t1, &t2);
gl2psListAdd(list, &t1);
gl2psListAdd(list, &t2);
- gl2psFreePrimitive(&prim, NULL);
+ gl2psFreePrimitive(&prim);
}
}
@@ -839,7 +837,7 @@ void gl2psBuildBspTree(GL2PSbsptree *tree, GL2PSlist *primitives){
case GL2PS_SPANNING:
gl2psAddPrimitiveInList(backprim, backlist);
gl2psAddPrimitiveInList(frontprim, frontlist);
- gl2psFreePrimitive(&prim, NULL);
+ gl2psFreePrimitive(&prim);
break;
}
}
@@ -872,7 +870,7 @@ void gl2psBuildBspTree(GL2PSbsptree *tree, GL2PSlist *primitives){
void gl2psTraverseBspTree(GL2PSbsptree *tree, GL2PSxyz eye, GLfloat epsilon,
GLboolean (*compare)(GLfloat f1, GLfloat f2),
- void (*action)(void *data, void *dummy), int inverse){
+ void (*action)(void *data), int inverse){
GLfloat result;
if(!tree) return;
@@ -1228,8 +1226,8 @@ GLint gl2psAddInBspImageTree(GL2PSprimitive *prim, GL2PSbsptree2d **tree){
return 0;
}
-void gl2psAddInImageTree(void *a, void *b){
- GL2PSprimitive *prim = *(GL2PSprimitive **)a;
+void gl2psAddInImageTree(void *data){
+ GL2PSprimitive *prim = *(GL2PSprimitive **)data;
gl2ps->primitivetoadd = prim;
if(!gl2psAddInBspImageTree(prim, &gl2ps->imagetree)){
prim->culled = 1;
@@ -1556,7 +1554,7 @@ void gl2psWriteByte(unsigned char byte){
}
void gl2psPrintPostScriptPixmap(GLfloat x, GLfloat y, GLsizei width, GLsizei height,
- GLenum format, GLenum type, GLfloat *pixels){
+ GLfloat *pixels){
int nbhex, nbyte2, nbyte4, nbyte8;
GLsizei row, col, col_max;
GLfloat dr, dg, db;
@@ -1696,10 +1694,12 @@ void gl2psPrintPostScriptHeader(void){
time_t now;
#ifdef GL2PS_HAVE_ZLIB
- char tmp[10] = {(char)0x1f,(char)0x8b /* magic numbers */,
- 8 /* compression method */, 0 /* flags */,
- 0,0,0,0 /* time */, 2 /* xflags: max compression */,
- (char)0x03 /* FIXME: OS code */};
+ char tmp[10] = {'\x1f', '\x8b', /* magic numbers: 0x1f, 0x8b */
+ 8, /* compression method: Z_DEFLATED */
+ 0, /* flags */
+ 0, 0, 0, 0, /* time */
+ 2, /* extra flags: max compression */
+ '\x03'}; /* OS code: 0x03 (Unix) */
if(gl2ps->options & GL2PS_COMPRESS){
gl2psSetupCompress();
@@ -1925,10 +1925,10 @@ void gl2psResetPostScriptColor(void){
gl2ps->lastrgba[0] = gl2ps->lastrgba[1] = gl2ps->lastrgba[2] = -1.;
}
-void gl2psPrintPostScriptPrimitive(void *a, void *b){
+void gl2psPrintPostScriptPrimitive(void *data){
GL2PSprimitive *prim;
- prim = *(GL2PSprimitive**)a;
+ prim = *(GL2PSprimitive**)data;
if((gl2ps->options & GL2PS_OCCLUSION_CULL) && prim->culled) return;
@@ -1936,7 +1936,6 @@ void gl2psPrintPostScriptPrimitive(void *a, void *b){
case GL2PS_PIXMAP :
gl2psPrintPostScriptPixmap(prim->verts[0].xyz[0], prim->verts[0].xyz[1],
prim->data.image->width, prim->data.image->height,
- prim->data.image->format, prim->data.image->type,
prim->data.image->pixels);
break;
case GL2PS_TEXT :
@@ -2091,7 +2090,6 @@ void gl2psPrintPostScriptBeginViewport(GLint viewport[4]){
GLint gl2psPrintPostScriptEndViewport(void){
GLint res;
- GLint gl2psPrintPrimitives(void);
res = gl2psPrintPrimitives();
gl2psPrintf("grestore\n");
@@ -2132,10 +2130,10 @@ void gl2psPrintTeXHeader(void){
(int)gl2ps->viewport[2], (int)gl2ps->viewport[3]);
}
-void gl2psPrintTeXPrimitive(void *a, void *b){
+void gl2psPrintTeXPrimitive(void *data){
GL2PSprimitive *prim;
- prim = *(GL2PSprimitive**)a;
+ prim = *(GL2PSprimitive**)data;
switch(prim->type){
case GL2PS_TEXT :
@@ -2185,13 +2183,6 @@ void gl2psPrintTeXFooter(void){
(gl2ps->options & GL2PS_LANDSCAPE) ? "}" : "");
}
-void gl2psPrintTeXBeginViewport(GLint viewport[4]){
-}
-
-GLint gl2psPrintTeXEndViewport(void){
- return GL2PS_SUCCESS;
-}
-
/*********************************************************************
*
* PDF routines
@@ -2421,13 +2412,13 @@ int gl2psFlushPDFLines(){
/* The central primitive drawing */
-void gl2psPrintPDFPrimitive(void *a, void *b){
+void gl2psPrintPDFPrimitive(void *data){
GL2PSprimitive *prim;
GL2PStriangle t;
GL2PSimage* image;
GL2PSstring* str;
- prim = *(GL2PSprimitive**)a;
+ prim = *(GL2PSprimitive**)data;
if((gl2ps->options & GL2PS_OCCLUSION_CULL) && prim->culled) return;
@@ -3062,7 +3053,6 @@ void gl2psPrintPDFBeginViewport(GLint viewport[4]){
GLint gl2psPrintPDFEndViewport(){
GLint res;
- GLint gl2psPrintPrimitives(void);
res = gl2psPrintPrimitives();
res += gl2psFlushPDFTriangles();
@@ -3083,7 +3073,7 @@ GLint gl2psPrintPrimitives(void){
GL2PSbsptree *root;
GL2PSxyz eye = {0.0F, 0.0F, 100000.0F};
GLint used;
- void (*pprim)(void *a, void *b) = 0;
+ void (*pprim)(void *data) = 0;
used = glRenderMode(GL_RENDER);
@@ -3324,7 +3314,6 @@ GL2PSDLL_API GLint gl2psBeginViewport(GLint viewport[4]){
gl2psPrintPDFBeginViewport(viewport);
break;
default :
- /* FIXME: handle other formats */
break;
}
@@ -3345,7 +3334,6 @@ GL2PSDLL_API GLint gl2psEndViewport(void){
res = gl2psPrintPDFEndViewport();
break;
default :
- /* FIXME: handle other formats */
res = GL2PS_SUCCESS;
break;
}
diff --git a/Graphics/gl2ps.h b/Graphics/gl2ps.h
index fc22cc3ad5b500ed516761fb51d293bf19679885..111618fb83cae1bae3e9d70b9ba3c0c2a30fb3db 100644
--- a/Graphics/gl2ps.h
+++ b/Graphics/gl2ps.h
@@ -1,4 +1,4 @@
-/* $Id: gl2ps.h,v 1.51 2003-11-10 01:32:18 geuzaine Exp $ */
+/* $Id: gl2ps.h,v 1.52 2003-11-16 16:49:37 geuzaine Exp $ */
/*
* GL2PS, an OpenGL to PostScript Printing Library
* Copyright (C) 1999-2003 Christophe Geuzaine <geuz@geuz.org>
@@ -75,7 +75,7 @@
#define GL2PS_MAJOR_VERSION 1
#define GL2PS_MINOR_VERSION 1
-#define GL2PS_PATCH_VERSION 1
+#define GL2PS_PATCH_VERSION 2
#define GL2PS_VERSION (GL2PS_MAJOR_VERSION + \
0.01 * GL2PS_MINOR_VERSION + \
@@ -271,6 +271,10 @@ typedef struct {
int line_width_diff, line_rgb_diff, last_line_finished, last_triangle_finished;
} GL2PScontext;
+/* private prototypes */
+
+GLint gl2psPrintPrimitives(void);
+
/* public functions */
#ifdef __cplusplus
diff --git a/Makefile b/Makefile
index 4917dad13c3a88087db5d88fe52049f0c7f08ca0..de7752cf705606a7ba6b70c0a0a073ed15fd9b77 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.305 2003-11-13 19:16:24 geuzaine Exp $
+# $Id: Makefile,v 1.306 2003-11-16 16:49:37 geuzaine Exp $
#
# Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
#
@@ -230,8 +230,8 @@ package-mac:
" <key>CFBundleShortVersionString</key><string>${GMSH_RELEASE}</string>\n"\
" <key>CFBundleIconFile</key><string>gmsh.icns</string>\n"\
" <key>CFBundleSignature</key><string>GMSH</string>\n"\
- " <key>CFBundleGetInfoString</key><string>Gmsh ${GMSH_RELEASE},"\
- "(c) C. Geuzaine and J.-F. Remacle, 1997-2003</string>\n"\
+ " <key>CFBundleGetInfoString</key><string>Gmsh version ${GMSH_RELEASE}, "\
+ "Copyright (C) 1997-2003 C. Geuzaine and J.-F. Remacle</string>\n"\
" <key>CFBundleIdentifier</key><string>org.geuz.Gmsh</string>\n"\
" </dict>\n"\
"</plist>" > gmsh-${GMSH_RELEASE}/Gmsh.app/Contents/Info.plist