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

Timestamp:

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

Author:

garnier

Message:

update geant4.9.3 tag

Location:

trunk/source/visualization/externals/gl2ps

Files:

• GNUmakefile (modified) (3 diffs)
• History (modified) (2 diffs)
• src/G4OpenGL2PSAction.cc (modified) (1 diff)
• src/gl2ps.cc (modified) (4 diffs)

trunk/source/visualization/externals/gl2ps/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.2 2009/11/02 14:54:31 lgarnier Exp $
+# $Id: GNUmakefile,v 1.5 2009/11/18 17:15:11 gcosmo Exp $
 # -------------------------------------------------------------
 # GNUmakefile for gl2ps.  Laurent Garnier, 6/2/09.
@@ -12 +12 @@
 endif
 
-ifdef G4LIB_BUILD_ZLIB
-  CPPFLAGS += -I$(G4BASE)/visualization/externals/zlib/include
-endif
+GLOBLIBS = libG4zlib.lib
 
 include $(G4INSTALL)/config/architecture.gmk
@@ -20 +18 @@
 include $(G4INSTALL)/config/interactivity.gmk
 
+ifdef G4LIB_BUILD_ZLIB
+  CPPFLAGS += -I$(G4BASE)/visualization/externals/zlib/include
+endif
+
 include $(G4INSTALL)/config/common.gmk

trunk/source/visualization/externals/gl2ps/History

@@ -1 @@
-$Id: History,v 1.10 2009/11/02 14:54:31 lgarnier Exp $
+$Id: History,v 1.15 2009/11/18 17:23:36 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+18 Nov 2009, Gabriele Cosmo (visexternal-V09-02-06)
+ - Added GLOBLIBS dependencies to GNUmakefile to allow for building
+   DLLs on Windows. Removed redundant CPPFLAGS addition.
+ - Re-instated fix to gl2ps.cc.
+
+17 Nov 2009, John Allison, Gabriele Cosmo (visexternal-V09-02-05)
+ - Added dependency on zlib if G4LIB_BUILD_ZLIB is set and corrected
+   inclusion of zlib.h in gl2ps.cc
 
 2 Nov 2009, Laurent Garnier 

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;
   }