Import Geant4 10.5.0.beta source tree
This commit is contained in:
+26
@@ -0,0 +1,26 @@
|
||||
$Id: History 110493 2018-05-25 20:44:11Z allison $
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
Geant4 - an Object-Oriented Toolkit for Simulation in HEP
|
||||
=========================================================
|
||||
|
||||
Category History file
|
||||
---------------------
|
||||
This file should be used by G4 developers and category coordinators
|
||||
to briefly summarize all major modifications introduced in the code
|
||||
and keep track of all category-tags.
|
||||
It DOES NOT substitute the CVS log-message one should put at every
|
||||
committal in the CVS repository !
|
||||
|
||||
----------------------------------------------------------
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
28 May 2018 Gabriele Cosmo (visexternals-V10-04-01)
|
||||
- visexternalgl2ps-V10-04-01: Corrected GNUmakefile, now requiring dependency
|
||||
on global module.
|
||||
|
||||
26 May 2018 John Allison (visexternals-V10-04-00)
|
||||
- visexternalgl2ps-V10-04-00: Fix gcc-8 warnings.
|
||||
+2
-1
@@ -1,4 +1,4 @@
|
||||
# $Id: GNUmakefile 68732 2013-04-05 09:44:10Z gcosmo $
|
||||
# $Id: GNUmakefile 110519 2018-05-28 07:53:49Z gcosmo $
|
||||
# -------------------------------------------------------------
|
||||
# GNUmakefile for gl2ps. Laurent Garnier, 6/2/09.
|
||||
|
||||
@@ -22,6 +22,7 @@ QTFLAGS =
|
||||
QTLIBS =
|
||||
GLQTLIBS =
|
||||
|
||||
CPPFLAGS += -I$(G4BASE)/global/management/include
|
||||
ifdef G4LIB_BUILD_ZLIB
|
||||
CPPFLAGS += -I$(G4BASE)/externals/zlib/include
|
||||
endif
|
||||
|
||||
+7
-1
@@ -1,4 +1,4 @@
|
||||
$Id: History 104287 2017-05-23 13:22:34Z gcosmo $
|
||||
$Id: History 110519 2018-05-28 07:53:49Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -17,6 +17,12 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
28 May 2018 Gabriele Cosmo (visexternalgl2ps-V10-04-01)
|
||||
- Corrected GNUmakefile, now requiring dependency on global module.
|
||||
|
||||
26 May 2018 John Allison (visexternalgl2ps-V10-04-00)
|
||||
- Fix gcc-8 warnings.
|
||||
|
||||
23rd May 2017 John Allison (visexternal-V10-03-00)
|
||||
- Fix gcc-7.1 warning.
|
||||
|
||||
|
||||
@@ -23,14 +23,13 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4OpenGL2PSAction.hh 88190 2015-02-02 17:24:54Z gcosmo $
|
||||
// $Id: G4OpenGL2PSAction.hh 110513 2018-05-28 07:37:38Z gcosmo $
|
||||
//
|
||||
|
||||
#ifndef G4OpenGL2PSAction_h
|
||||
#define G4OpenGL2PSAction_h
|
||||
|
||||
|
||||
#include <string>
|
||||
#include "globals.hh"
|
||||
#include "Geant4_gl2ps.h"
|
||||
|
||||
class G4OpenGL2PSAction {
|
||||
@@ -56,7 +55,7 @@ public:
|
||||
|
||||
protected:
|
||||
bool G4gl2psBegin();
|
||||
const char * fFileName;
|
||||
G4String fFileName;
|
||||
FILE* fFile;
|
||||
GLint fViewport[4];
|
||||
GLint fBufferSize;
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4OpenGL2PSAction.cc 88206 2015-02-03 13:01:27Z gcosmo $
|
||||
// $Id: G4OpenGL2PSAction.cc 110513 2018-05-28 07:37:38Z gcosmo $
|
||||
//
|
||||
//
|
||||
|
||||
@@ -48,7 +48,6 @@ G4OpenGL2PSAction::G4OpenGL2PSAction(
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
|
||||
{
|
||||
fFileName = "";
|
||||
fFile = 0;
|
||||
fViewport[0] = 0;
|
||||
fViewport[1] = 0;
|
||||
@@ -112,7 +111,7 @@ void G4OpenGL2PSAction::setFileName(
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
|
||||
{
|
||||
fFileName = (strncpy((char*)malloc((unsigned)strlen(aFileName) + 1), aFileName, (unsigned)strlen(aFileName) + 1));
|
||||
fFileName = aFileName;
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
bool G4OpenGL2PSAction::enableFileWriting(
|
||||
@@ -192,7 +191,7 @@ bool G4OpenGL2PSAction::G4gl2psBegin(
|
||||
options,
|
||||
GL_RGBA,0, NULL,0,0,0,
|
||||
fBufferSize,
|
||||
fFile,fFileName);
|
||||
fFile,fFileName.c_str());
|
||||
if (res == GL2PS_ERROR) {
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user