Changeset 1346 for trunk/source/visualization/externals/gl2ps
- Timestamp:
- Dec 22, 2010, 11:33:38 AM (14 years ago)
- Location:
- trunk/source/visualization/externals/gl2ps
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/externals/gl2ps/CVS/Entries
r1340 r1346 1 1 D/include//// 2 2 D/src//// 3 /CMakeLists.txt/1.1/Wed Sep 29 19:14:00 2010// 4 /GNUmakefile/1.5/ Thu Sep 30 06:17:28 2010//5 / sources.cmake/1.1/Wed Sep 29 19:14:08 2010//6 / History/1.18/Wed Nov 3 16:40:34 2010//3 /CMakeLists.txt/1.1/Wed Sep 29 19:14:00 2010//Tgeant4-09-04-ref-00 4 /GNUmakefile/1.5/dummy timestamp from new-entry//Tgeant4-09-04-ref-00 5 /History/1.21/Fri Nov 26 15:30:48 2010//Tgeant4-09-04-ref-00 6 /sources.cmake/1.5/Wed Dec 1 17:12:56 2010//Tgeant4-09-04-ref-00 -
trunk/source/visualization/externals/gl2ps/CVS/Tag
r1331 r1346 1 Ngeant4-09-04- beta-011 Ngeant4-09-04-ref-00 -
trunk/source/visualization/externals/gl2ps/GNUmakefile
r1228 r1346 18 18 include $(G4INSTALL)/config/interactivity.gmk 19 19 20 # NO need QT, then reset QTGLAGS 21 QTFLAGS = "" 22 QTLIBS = "" 23 GLQTLIBS = "" 24 20 25 ifdef G4LIB_BUILD_ZLIB 21 26 CPPFLAGS += -I$(G4BASE)/visualization/externals/zlib/include -
trunk/source/visualization/externals/gl2ps/History
r1340 r1346 1 $Id: History,v 1. 18 2010/11/03 16:40:34 lgarnierExp $1 $Id: History,v 1.21 2010/11/13 10:37:57 allison Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 18 18 ---------------------------------------------------------- 19 19 20 21 13th November 2010, John Allison (visexternal-V09-03-03) 22 - Geant4_gl2ps.h: Added #ifdef _WIN32, #define _USE_MATH_DEFINE. 23 24 5th November 2010, John Allison (visexternal-V09-03-02) 25 - Fixed Linux warnings. 26 27 5th November 2010, John Allison (visexternal-V09-03-01) 28 - Tagged. 20 29 21 30 3rd November 2010, Laurent Garnier -
trunk/source/visualization/externals/gl2ps/include/CVS/Entries
r1340 r1346 1 /G4OpenGL2PSAction.hh/1.4/ Thu Sep 30 06:17:28 2010//2 /Geant4_gl2ps.h/1. 3/Wed Nov 3 15:19:14 2010//3 /gl2ps.h/1.3/Wed Nov 3 16:40: 15 2010//1 /G4OpenGL2PSAction.hh/1.4/Mon Apr 26 16:28:18 2010//Tgeant4-09-04-ref-00 2 /Geant4_gl2ps.h/1.4/Fri Nov 26 15:30:48 2010//Tgeant4-09-04-ref-00 3 /gl2ps.h/1.3/Wed Nov 3 16:40:34 2010//Tgeant4-09-04-ref-00 4 4 D -
trunk/source/visualization/externals/gl2ps/include/CVS/Tag
r1331 r1346 1 Ngeant4-09-04- beta-011 Ngeant4-09-04-ref-00 -
trunk/source/visualization/externals/gl2ps/include/G4OpenGL2PSAction.hh
r1337 r1346 25 25 // 26 26 // $Id: G4OpenGL2PSAction.hh,v 1.4 2010/04/26 16:28:18 lgarnier Exp $ 27 // GEANT4 tag $Name: geant4-09-04-beta-01 $27 // GEANT4 tag $Name: visexternal-V09-03-01 $ 28 28 // 29 29 -
trunk/source/visualization/externals/gl2ps/include/Geant4_gl2ps.h
r1340 r1346 232 232 #include "gl2ps.h" 233 233 234 #ifdef _WIN32 235 #define _USE_MATH_DEFINES 234 236 #endif 237 238 #endif -
trunk/source/visualization/externals/gl2ps/src/CVS/Entries
r1340 r1346 1 /G4OpenGL2PSAction.cc/1.6/Wed Nov 3 16:40:34 2010// 2 /gl2ps.cc/1. 9/Wed Nov 3 15:22:18 2010//1 /G4OpenGL2PSAction.cc/1.6/Wed Nov 3 16:40:34 2010//Tgeant4-09-04-ref-00 2 /gl2ps.cc/1.13/Wed Dec 22 10:23:43 2010//Tgeant4-09-04-ref-00 3 3 D -
trunk/source/visualization/externals/gl2ps/src/CVS/Tag
r1331 r1346 1 Ngeant4-09-04- beta-011 Ngeant4-09-04-ref-00 -
trunk/source/visualization/externals/gl2ps/src/G4OpenGL2PSAction.cc
r1340 r1346 26 26 // 27 27 // $Id: G4OpenGL2PSAction.cc,v 1.6 2010/11/03 16:40:34 lgarnier Exp $ 28 // GEANT4 tag $Name: $28 // GEANT4 tag $Name: visexternal-V09-03-01 $ 29 29 // 30 30 // -
trunk/source/visualization/externals/gl2ps/src/gl2ps.cc
r1340 r1346 70 70 #include "Geant4_gl2ps.h" 71 71 72 #include < math.h>72 #include <cmath> 73 73 #include <string.h> 74 74 #include <sys/types.h> 75 75 #include <stdarg.h> 76 76 #include <time.h> 77 #include < float.h>77 #include <cfloat> 78 78 79 79 #define GL2PS_HAVE_ZLIB … … 97 97 #define GL2PS_ZOFFSET 5.0e-2F 98 98 #define GL2PS_ZOFFSET_LARGE 20.0F 99 #define GL2PS_ZERO(arg) ( fabs(arg) < 1.e-20)99 #define GL2PS_ZERO(arg) (std::fabs(arg) < 1.e-20) 100 100 101 101 /* Primitive types */ … … 725 725 726 726 for(i = 1; i < n; i++){ 727 if( fabs(rgba[0][0] - rgba[i][0]) > threshold[0] ||728 fabs(rgba[0][1] - rgba[i][1]) > threshold[1] ||729 fabs(rgba[0][2] - rgba[i][2]) > threshold[2])727 if(std::fabs(rgba[0][0] - rgba[i][0]) > threshold[0] || 728 std::fabs(rgba[0][1] - rgba[i][1]) > threshold[1] || 729 std::fabs(rgba[0][2] - rgba[i][2]) > threshold[2]) 730 730 return GL_FALSE; 731 731 } … … 3332 3332 } 3333 3333 3334 static void gl2psPrintTeXBeginViewport(GLint viewport[4])3334 static void gl2psPrintTeXBeginViewport(GLint[4]) 3335 3335 { 3336 3336 glRenderMode(GL_FEEDBACK); … … 5032 5032 } 5033 5033 5034 #if defined(GL2PS_HAVE_LIBPNG) 5034 5035 static void gl2psPrintSVGPixmap(GLfloat x, GLfloat y, GL2PSimage *pixmap) 5036 #else 5037 static void gl2psPrintSVGPixmap(GLfloat, GLfloat, GL2PSimage*) 5038 #endif 5035 5039 { 5036 5040 #if defined(GL2PS_HAVE_LIBPNG)
Note: See TracChangeset
for help on using the changeset viewer.