Changeset 1346 for trunk/source/visualization/externals/gl2ps/src/gl2ps.cc

Timestamp:

Dec 22, 2010, 11:33:38 AM (14 years ago)

Author:

garnier

Message:

before tag

File:

• trunk/source/visualization/externals/gl2ps/src/gl2ps.cc (modified) (5 diffs)

trunk/source/visualization/externals/gl2ps/src/gl2ps.cc

@@ -70 +70 @@
 #include "Geant4_gl2ps.h"
 
-#include <math.h>
+#include <cmath>
 #include <string.h>
 #include <sys/types.h>
 #include <stdarg.h>
 #include <time.h>
-#include <float.h>
+#include <cfloat>
 
 #define GL2PS_HAVE_ZLIB
@@ -97 +97 @@
 #define GL2PS_ZOFFSET       5.0e-2F
 #define GL2PS_ZOFFSET_LARGE 20.0F
-#define GL2PS_ZERO(arg)     (fabs(arg) < 1.e-20)
+#define GL2PS_ZERO(arg)     (std::fabs(arg) < 1.e-20)
 
 /* Primitive types */
@@ -725 +725 @@
   
   for(i = 1; i < n; i++){
-    if(fabs(rgba[0][0] - rgba[i][0]) > threshold[0] ||
-       fabs(rgba[0][1] - rgba[i][1]) > threshold[1] ||
-       fabs(rgba[0][2] - rgba[i][2]) > threshold[2])
+    if(std::fabs(rgba[0][0] - rgba[i][0]) > threshold[0] ||
+       std::fabs(rgba[0][1] - rgba[i][1]) > threshold[1] ||
+       std::fabs(rgba[0][2] - rgba[i][2]) > threshold[2])
       return GL_FALSE;
   }
@@ -3332 +3332 @@
 }
 
-static void gl2psPrintTeXBeginViewport(GLint viewport[4])
+static void gl2psPrintTeXBeginViewport(GLint[4])
 {
   glRenderMode(GL_FEEDBACK);
@@ -5032 +5032 @@
 }
 
+#if defined(GL2PS_HAVE_LIBPNG)
 static void gl2psPrintSVGPixmap(GLfloat x, GLfloat y, GL2PSimage *pixmap)
+#else
+static void gl2psPrintSVGPixmap(GLfloat, GLfloat, GL2PSimage*)
+#endif
 {
 #if defined(GL2PS_HAVE_LIBPNG)