From 7f1773b214f11a33571ab1e5b7f6701e7eaa89c1 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 14 Aug 2001 13:23:40 +0000
Subject: [PATCH] *** empty log message ***
---
Graphics/Draw.cpp | 4 ++--
Graphics/gl2ps.cpp | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Graphics/Draw.cpp b/Graphics/Draw.cpp
index 7eef57c33a..d9b9b50cf8 100644
--- a/Graphics/Draw.cpp
+++ b/Graphics/Draw.cpp
@@ -1,4 +1,4 @@
-// $Id: Draw.cpp,v 1.25 2001-08-06 16:47:57 geuzaine Exp $
+// $Id: Draw.cpp,v 1.26 2001-08-14 13:23:40 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -87,7 +87,7 @@ void Orthogonalize(int x, int y){
(GLdouble)(CTX.viewport[3]-y),
5.0,
5.0,
- CTX.viewport);
+ (GLint*)CTX.viewport);
Va = (GLdouble)(CTX.viewport[3]-CTX.viewport[1]) /
(GLdouble)(CTX.viewport[2]-CTX.viewport[0]) ;
diff --git a/Graphics/gl2ps.cpp b/Graphics/gl2ps.cpp
index 44332232cd..317821abc4 100644
--- a/Graphics/gl2ps.cpp
+++ b/Graphics/gl2ps.cpp
@@ -5,7 +5,7 @@
* GL2PS, an OpenGL to Postscript Printing Library
* Copyright (C) 1999-2001 Christophe Geuzaine
*
- * $Id: gl2ps.cpp,v 1.25 2001-08-06 12:26:26 geuzaine Exp $
+ * $Id: gl2ps.cpp,v 1.26 2001-08-14 13:23:40 geuzaine Exp $
*
* E-mail: Christophe.Geuzaine@AdValvas.be
* URL: http://www.geuz.org/gl2ps/
@@ -133,7 +133,7 @@ GLvoid *gl2psListPointer(GL2PSlist *list, GLint index){
}
GLvoid gl2psListSort(GL2PSlist *list,
- GLint (*fcmp)(const GLvoid *a, const GLvoid *b)){
+ int (*fcmp)(const void *a, const void *b)){
qsort(list->array, list->n, list->size, fcmp);
}
@@ -433,7 +433,7 @@ GLvoid gl2psDivideQuad(GL2PSprimitive *quad,
(*t1)->boundary = ((quad->boundary & 4) ? 2 : 0) | ((quad->boundary & 4) ? 2 : 0);
}
-int gl2psCompareDepth(const GLvoid *a, const GLvoid *b){
+int gl2psCompareDepth(const void *a, const void *b){
GL2PSprimitive *q,*w;
GLfloat diff;
@@ -448,7 +448,7 @@ int gl2psCompareDepth(const GLvoid *a, const GLvoid *b){
return 0;
}
-GLint gl2psTrianglesFirst(const GLvoid *a, const GLvoid *b){
+int gl2psTrianglesFirst(const void *a, const void *b){
GL2PSprimitive *q,*w;
q = *(GL2PSprimitive**)a;
--
GitLab