Import Geant4 10.4.0 source tree

source/analysis/g4tools/include/tools/glutess/mesh

@@ -569,6 +569,9 @@ inline int __gl_meshDelete( GLUhalfEdge *eDel )
     /* We are joining two loops into one -- remove the left face */
     joiningLoops = GLU_TRUE;
     static_KillFace( eDel->Lface, eDel->Rface );
+    /* G.Barrand : note : Coverity says that there is a problem using eDel->Lface->anEdge in the below,
+       but it appears that at the out of the upper static_KillFace() call (then here), eDel->Lface before
+       (the pointer freeed) is not the same than after (then here). */
   }
 
   if( eDel->Onext == eDel ) {

source/analysis/g4tools/include/tools/glutess/normal

@@ -37,6 +37,9 @@ inline/*static*/ void static_ComputeNormal( GLUtesselator *tess, GLUdouble norm[
 
   maxVal[0] = maxVal[1] = maxVal[2] = -2 * GLU_TESS_MAX_COORD;
   minVal[0] = minVal[1] = minVal[2] = 2 * GLU_TESS_MAX_COORD;
+  
+  minVert[0] = 0;minVert[1] = 0;minVert[2] = 0; //G.Barrand : to quiet Coverity.
+  maxVert[0] = 0;maxVert[1] = 0;maxVert[2] = 0; //G.Barrand : to quiet Coverity.
 
   for( v = vHead->next; v != vHead; v = v->next ) {
     for( i = 0; i < 3; ++i ) {
@@ -64,6 +67,7 @@ inline/*static*/ void static_ComputeNormal( GLUtesselator *tess, GLUdouble norm[
   maxLen2 = 0;
   v1 = minVert[i];
   v2 = maxVert[i];
+  if( !v1 || !v2 ) {norm[0] = 0; norm[1] = 0; norm[2] = 1;return;} //G.Barrand.
   d1[0] = v1->coords[0] - v2->coords[0];
   d1[1] = v1->coords[1] - v2->coords[1];
   d1[2] = v1->coords[2] - v2->coords[2];

source/analysis/g4tools/include/tools/glutess/rename

@@ -1,7 +1,8 @@
 #ifndef tools_glutess_rename
 #define tools_glutess_rename
 
-/* G.Barrand : namespace protection : */
+/* G.Barrand : name space protection : */
+
 #define gluTessBeginContour tools_gluTessBeginContour
 #define gluTessBeginPolygon tools_gluTessBeginPolygon
 #define gluTessCallback     tools_gluTessCallback

source/analysis/g4tools/include/tools/glutess/sweep

@@ -1166,7 +1166,13 @@ inline/*static*/ void static_DoneEdgeDict( GLUtesselator *tess )
      */
     if( ! reg->sentinel ) {
       assert( reg->fixUpperEdge );
-      assert( ++fixedEdges == 1 );
+    //G.Barrand : fix a Coverity diagnostic : begin :
+    //assert( ++fixedEdges == 1 );
+#ifndef NDEBUG
+      fixedEdges++;
+#endif
+      assert( fixedEdges == 1 );
+    //G.Barrand : end.
     }
     assert( reg->windingNumber == 0 );
     static_DeleteRegion( tess, reg );