Import Geant4 10.1.0 source tree

source/visualization/externals/gl2ps/include/G4OpenGL2PSAction.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4OpenGL2PSAction.hh 70646 2013-06-03 15:07:58Z gcosmo $
+// $Id: G4OpenGL2PSAction.hh 82763 2014-07-08 14:22:48Z gcosmo $
 //
 
 #ifndef G4OpenGL2PSAction_h
@@ -39,6 +39,7 @@ public:
  G4OpenGL2PSAction();
  
  void setFileName(const char*);
+ void setExportImageFormat(unsigned int);
  bool enableFileWriting();
   // return true if ok, false is an error occured
 
@@ -59,6 +60,8 @@ protected:
  GLint fViewport[4];
  GLint fBufferSize;
  GLint fBufferSizeLimit;
+private:
+ unsigned int fExportImageFormat;
 };
 
 #endif

source/visualization/externals/gl2ps/include/Geant4_gl2ps.h

@@ -229,7 +229,7 @@
 
 #define gl2ps Geant4_gl2ps
 
-#ifndef G4VIS_BUILD_OPENGLWT_DRIVER
+#ifndef G4OPENGL_VERSION_2
 #include "gl2ps.h"
 #endif