Changeset 1228 for trunk/source/visualization/externals/gl2ps/src

Timestamp:

Jan 8, 2010, 11:56:51 AM (14 years ago)

Author:

garnier

Message:

update geant4.9.3 tag

Location:

trunk/source/visualization/externals/gl2ps/src

Files:

• G4OpenGL2PSAction.cc (modified) (1 diff)
• gl2ps.cc (modified) (4 diffs)

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

@@ -125 +125 @@
      GL2PS_BEST_ROOT | GL2PS_SILENT | GL2PS_DRAW_BACKGROUND;
   int sort = GL2PS_BSP_SORT;
-  sort = GL2PS_SIMPLE_SORT;
+  //int sort = GL2PS_SIMPLE_SORT;
   GLint buffsize = 0;
   buffsize += 1024*1024;

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

@@ -92 +92 @@
 #include "Geant4_gl2ps.h"
 
-#include <math.h>
+#include <cmath>
 #include <string.h>
 #include <sys/types.h>
@@ -99 +99 @@
 #include <float.h>
 
-#if defined(G4LIB_USE_ZLIB)
 #define GL2PS_HAVE_ZLIB
 #include <zlib.h>
-#endif
 
 #if defined(GL2PS_HAVE_LIBPNG)
@@ -121 +119 @@
 #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 */
@@ -749 +747 @@
   
   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;
   }