products/patches/netgen-4.9.13-for-SALOME-OCCT7.0.0-Porting.patch

   1 diff -Naur netgen-4.9.13_SRC/libsrc/occ/occgeom.cpp netgen-4.9.13_SRC_new/libsrc/occ/occgeom.cpp
   2 --- netgen-4.9.13_SRC/libsrc/occ/occgeom.cpp    2016-02-15 09:50:31.000000000 +0300
   3 +++ netgen-4.9.13_SRC_new/libsrc/occ/occgeom.cpp        2016-02-05 16:44:26.000000000 +0300
   4 @@ -121,7 +121,7 @@
   5        double surfacecont = 0;
   6
   7        {
   8 -         Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;
   9 +         Handle(ShapeBuild_ReShape) rebuild = new ShapeBuild_ReShape;
  10           rebuild->Apply(shape);
  11           for (exp1.Init (shape, TopAbs_EDGE); exp1.More(); exp1.Next())
  12           {
  13 @@ -152,7 +152,7 @@
  14           cout << endl << "- repairing faces" << endl;
  15
  16           Handle(ShapeFix_Face) sff;
  17 -         Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;
  18 +         Handle(ShapeBuild_ReShape) rebuild = new ShapeBuild_ReShape;
  19           rebuild->Apply(shape);
  20
  21
  22 @@ -209,7 +209,7 @@
  23
  24
  25        {
  26 -         Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;
  27 +         Handle(ShapeBuild_ReShape) rebuild = new ShapeBuild_ReShape;
  28           rebuild->Apply(shape);
  29           for (exp1.Init (shape, TopAbs_EDGE); exp1.More(); exp1.Next())
  30           {
  31 @@ -226,7 +226,7 @@
  32           cout << endl << "- fixing small edges" << endl;
  33
  34           Handle(ShapeFix_Wire) sfw;
  35 -         Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;
  36 +         Handle(ShapeBuild_ReShape) rebuild = new ShapeBuild_ReShape;
  37           rebuild->Apply(shape);
  38
  39
  40 @@ -293,7 +293,7 @@
  41
  42           {
  43              BuildFMap();
  44 -            Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;
  45 +            Handle(ShapeBuild_ReShape) rebuild = new ShapeBuild_ReShape;
  46              rebuild->Apply(shape);
  47
  48              for (exp1.Init (shape, TopAbs_EDGE); exp1.More(); exp1.Next())
  49 @@ -321,7 +321,7 @@
  50
  51
  52           {
  53 -            Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;
  54 +            Handle(ShapeBuild_ReShape) rebuild = new ShapeBuild_ReShape;
  55              rebuild->Apply(shape);
  56              for (exp1.Init (shape, TopAbs_EDGE); exp1.More(); exp1.Next())
  57              {
  58 @@ -447,7 +447,7 @@
  59
  60
  61        {
  62 -         Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;
  63 +         Handle(ShapeBuild_ReShape) rebuild = new ShapeBuild_ReShape;
  64           rebuild->Apply(shape);
  65           for (exp1.Init (shape, TopAbs_EDGE); exp1.More(); exp1.Next())
  66           {
  67 @@ -492,7 +492,7 @@
  68                    TopoDS_Solid solid = TopoDS::Solid(exp0.Current());
  69                    TopoDS_Solid newsolid = solid;
  70                    BRepLib::OrientClosedSolid (newsolid);
  71 -                  Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;
  72 +                  Handle(ShapeBuild_ReShape) rebuild = new ShapeBuild_ReShape;
  73                    //             rebuild->Apply(shape);
  74                    rebuild->Replace(solid, newsolid, Standard_False);
  75                    TopoDS_Shape newshape = rebuild->Apply(shape, TopAbs_COMPSOLID);//, 1);
  76 @@ -915,7 +915,7 @@
  77              TopoDS_Solid solid = TopoDS::Solid(exp0.Current());
  78              TopoDS_Solid newsolid = solid;
  79              BRepLib::OrientClosedSolid (newsolid);
  80 -            Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;
  81 +            Handle(ShapeBuild_ReShape) rebuild = new ShapeBuild_ReShape;
  82              rebuild->Replace(solid, newsolid, Standard_False);
  83
  84              TopoDS_Shape newshape = rebuild->Apply(shape, TopAbs_SHAPE, 1);
  85 @@ -1116,10 +1116,10 @@
  86        occgeo = new OCCGeometry;
  87
  88        // Initiate a dummy XCAF Application to handle the IGES XCAF Document
  89 -      static Handle_XCAFApp_Application dummy_app = XCAFApp_Application::GetApplication();
  90 +      static Handle(XCAFApp_Application) dummy_app = XCAFApp_Application::GetApplication();
  91
  92        // Create an XCAF Document to contain the IGES file itself
  93 -      Handle_TDocStd_Document iges_doc;
  94 +      Handle(TDocStd_Document) iges_doc;
  95
  96        // Check if a IGES File is already open under this handle, if so, close it to prevent
  97        // Segmentation Faults when trying to create a new document
  98 @@ -1146,8 +1146,8 @@
  99        reader.Transfer(iges_doc);
 100
 101        // Read in the shape(s) and the colours present in the IGES File
 102 -      Handle_XCAFDoc_ShapeTool iges_shape_contents = XCAFDoc_DocumentTool::ShapeTool(iges_doc->Main());
 103 -      Handle_XCAFDoc_ColorTool iges_colour_contents = XCAFDoc_DocumentTool::ColorTool(iges_doc->Main());
 104 +      Handle(XCAFDoc_ShapeTool) iges_shape_contents = XCAFDoc_DocumentTool::ShapeTool(iges_doc->Main());
 105 +      Handle(XCAFDoc_ColorTool) iges_colour_contents = XCAFDoc_DocumentTool::ColorTool(iges_doc->Main());
 106
 107        TDF_LabelSequence iges_shapes;
 108        iges_shape_contents->GetShapes(iges_shapes);
 109 @@ -1194,10 +1194,10 @@
 110        occgeo = new OCCGeometry;
 111
 112        // Initiate a dummy XCAF Application to handle the STEP XCAF Document
 113 -      static Handle_XCAFApp_Application dummy_app = XCAFApp_Application::GetApplication();
 114 +      static Handle(XCAFApp_Application) dummy_app = XCAFApp_Application::GetApplication();
 115
 116        // Create an XCAF Document to contain the STEP file itself
 117 -      Handle_TDocStd_Document step_doc;
 118 +      Handle(TDocStd_Document) step_doc;
 119
 120        // Check if a STEP File is already open under this handle, if so, close it to prevent
 121        // Segmentation Faults when trying to create a new document
 122 @@ -1224,8 +1224,8 @@
 123        reader.Transfer(step_doc);
 124
 125        // Read in the shape(s) and the colours present in the STEP File
 126 -      Handle_XCAFDoc_ShapeTool step_shape_contents = XCAFDoc_DocumentTool::ShapeTool(step_doc->Main());
 127 -      Handle_XCAFDoc_ColorTool step_colour_contents = XCAFDoc_DocumentTool::ColorTool(step_doc->Main());
 128 +      Handle(XCAFDoc_ShapeTool) step_shape_contents = XCAFDoc_DocumentTool::ShapeTool(step_doc->Main());
 129 +      Handle(XCAFDoc_ColorTool) step_colour_contents = XCAFDoc_DocumentTool::ColorTool(step_doc->Main());
 130
 131        TDF_LabelSequence step_shapes;
 132        step_shape_contents->GetShapes(step_shapes);
 133 @@ -1278,7 +1278,7 @@
 134        // Fixed a bug in the OpenCascade XDE Colour handling when
 135        // opening BREP Files, since BREP Files have no colour data.
 136        // Hence, the face_colours Handle needs to be created as a NULL handle.
 137 -      occgeo->face_colours = Handle_XCAFDoc_ColorTool();
 138 +      occgeo->face_colours = Handle(XCAFDoc_ColorTool)();
 139        occgeo->face_colours.Nullify();
 140        occgeo->changed = 1;
 141        occgeo->BuildFMap();
 142 diff -Naur netgen-4.9.13_SRC/libsrc/occ/occgeom.hpp netgen-4.9.13_SRC_new/libsrc/occ/occgeom.hpp
 143 --- netgen-4.9.13_SRC/libsrc/occ/occgeom.hpp    2016-02-15 09:50:31.000000000 +0300
 144 +++ netgen-4.9.13_SRC_new/libsrc/occ/occgeom.hpp        2016-02-05 16:44:26.000000000 +0300
 145 @@ -86,7 +86,7 @@
 146
 147  // -- Optimization: to use cached projector and classifier
 148  #include <NCollection_DataMap.hxx>
 149 -class Handle_ShapeAnalysis_Surface;
 150 +class ShapeAnalysis_Surface;
 151  class BRepTopAdaptor_FClass2d;
 152
 153  // Philippose - 29/01/2009
 154 @@ -199,7 +199,7 @@
 155     {
 156        Point<3> center;
 157        // -- Optimization: to use cached projector and classifier
 158 -      mutable NCollection_DataMap<int,Handle_ShapeAnalysis_Surface> fprjmap;
 159 +      mutable NCollection_DataMap<int,Handle(ShapeAnalysis_Surface)> fprjmap;
 160        mutable NCollection_DataMap<int,BRepTopAdaptor_FClass2d*> fclsmap;
 161
 162     public:
 163 @@ -212,7 +212,7 @@
 164        // OpenCascade XDE Support
 165        // XCAF Handle to make the face colours available to the rest of
 166        // the system
 167 -      Handle_XCAFDoc_ColorTool face_colours;
 168 +      Handle(XCAFDoc_ColorTool) face_colours;
 169
 170        int changed;
 171        Array<int> facemeshstatus;
 172 diff -Naur netgen-4.9.13_SRC/libsrc/occ/Partition_Inter2d.cxx netgen-4.9.13_SRC_new/libsrc/occ/Partition_Inter2d.cxx
 173 --- netgen-4.9.13_SRC/libsrc/occ/Partition_Inter2d.cxx  2009-08-24 06:12:24.000000000 +0400
 174 +++ netgen-4.9.13_SRC_new/libsrc/occ/Partition_Inter2d.cxx      2016-02-12 14:47:51.000000000 +0300
 175 @@ -47,9 +47,7 @@
 176  #include <TopOpeBRep_EdgesIntersector.hxx>
 177  #include <TopOpeBRep_Point2d.hxx>
 178  #include <TopTools_ListIteratorOfListOfShape.hxx>
 179 -#include <TopTools_ListOfShape.hxx>
 180  #include <TopTools_MapIteratorOfMapOfShape.hxx>
 181 -#include <TopTools_MapOfShape.hxx>
 182  #include <TopoDS.hxx>
 183  #include <TopoDS_Edge.hxx>
 184  #include <TopoDS_Vertex.hxx>
 185 diff -Naur netgen-4.9.13_SRC/libsrc/occ/Partition_Inter2d.hxx netgen-4.9.13_SRC_new/libsrc/occ/Partition_Inter2d.hxx
 186 --- netgen-4.9.13_SRC/libsrc/occ/Partition_Inter2d.hxx  2009-08-24 06:12:24.000000000 +0400
 187 +++ netgen-4.9.13_SRC_new/libsrc/occ/Partition_Inter2d.hxx      2016-02-12 15:29:02.000000000 +0300
 188 @@ -27,8 +27,10 @@
 189  #ifndef _Partition_Inter2d_HeaderFile
 190  #define _Partition_Inter2d_HeaderFile
 191
 192 -#ifndef _Handle_BRepAlgo_AsDes_HeaderFile
 193 -#include <Handle_BRepAlgo_AsDes.hxx>
 194 +#include <Standard_Version.hxx>
 195 +
 196 +#if OCC_VERSION_MAJOR < 7
 197 +  #include <Handle_BRepAlgo_AsDes.hxx>
 198  #endif
 199  #ifndef _Standard_Real_HeaderFile
 200  #include <Standard_Real.hxx>
 201 @@ -36,11 +38,13 @@
 202  #ifndef _Standard_Boolean_HeaderFile
 203  #include <Standard_Boolean.hxx>
 204  #endif
 205 +
 206 +#include <TopTools_MapOfShape.hxx>
 207 +#include <TopTools_ListOfShape.hxx>
 208 +
 209  class BRepAlgo_AsDes;
 210  class TopoDS_Face;
 211 -class TopTools_MapOfShape;
 212  class TopoDS_Vertex;
 213 -class TopTools_ListOfShape;
 214  class TopoDS_Edge;
 215
 216
 217 diff -Naur netgen-4.9.13_SRC/libsrc/occ/Partition_Inter3d.cxx netgen-4.9.13_SRC_new/libsrc/occ/Partition_Inter3d.cxx
 218 --- netgen-4.9.13_SRC/libsrc/occ/Partition_Inter3d.cxx  2016-02-15 09:50:31.000000000 +0300
 219 +++ netgen-4.9.13_SRC_new/libsrc/occ/Partition_Inter3d.cxx      2016-02-05 16:44:26.000000000 +0300
 220 @@ -48,7 +48,6 @@
 221  #include <TopOpeBRepTool_BoxSort.hxx>
 222  #include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
 223  #include <TopTools_ListIteratorOfListOfShape.hxx>
 224 -#include <TopTools_ListOfShape.hxx>
 225  #include <TopoDS.hxx>
 226  #include <TopoDS_Compound.hxx>
 227  #include <TopoDS_Edge.hxx>
 228 @@ -209,7 +208,7 @@
 229    Handle (Geom_Surface) S   = BRep_Tool::Surface(F,L);
 230
 231    if (S->IsKind(STANDARD_TYPE(Geom_RectangularTrimmedSurface))) {
 232 -    S = (*(Handle_Geom_RectangularTrimmedSurface*)&S)->BasisSurface();
 233 +    S = Handle(Geom_RectangularTrimmedSurface)::DownCast (S)->BasisSurface();
 234    }
 235    if (!S->IsUPeriodic() && !S->IsVPeriodic())
 236      return;
 237 diff -Naur netgen-4.9.13_SRC/libsrc/occ/Partition_Inter3d.hxx netgen-4.9.13_SRC_new/libsrc/occ/Partition_Inter3d.hxx
 238 --- netgen-4.9.13_SRC/libsrc/occ/Partition_Inter3d.hxx  2009-08-24 06:12:24.000000000 +0400
 239 +++ netgen-4.9.13_SRC_new/libsrc/occ/Partition_Inter3d.hxx      2016-02-12 15:29:36.000000000 +0300
 240 @@ -27,8 +27,10 @@
 241  #ifndef _Partition_Inter3d_HeaderFile
 242  #define _Partition_Inter3d_HeaderFile
 243
 244 -#ifndef _Handle_BRepAlgo_AsDes_HeaderFile
 245 -#include <Handle_BRepAlgo_AsDes.hxx>
 246 +#include <Standard_Version.hxx>
 247 +
 248 +#if OCC_VERSION_MAJOR < 7
 249 +  #include <Handle_BRepAlgo_AsDes.hxx>
 250  #endif
 251  #ifndef _TopTools_DataMapOfShapeListOfShape_HeaderFile
 252  #include <TopTools_DataMapOfShapeListOfShape.hxx>
 253 @@ -36,6 +38,9 @@
 254  #ifndef _TopTools_MapOfShape_HeaderFile
 255  #include <TopTools_MapOfShape.hxx>
 256  #endif
 257 +#ifndef _TopTools_ListOfShape_HeaderFile
 258 +#include <TopTools_ListOfShape.hxx>
 259 +#endif
 260  #ifndef _TopTools_DataMapOfShapeShape_HeaderFile
 261  #include <TopTools_DataMapOfShapeShape.hxx>
 262  #endif
 263 @@ -43,10 +48,7 @@
 264  #include <Standard_Boolean.hxx>
 265  #endif
 266  class BRepAlgo_AsDes;
 267 -class TopTools_ListOfShape;
 268 -class TopTools_DataMapOfShapeShape;
 269  class TopoDS_Face;
 270 -class TopTools_MapOfShape;
 271  class TopoDS_Shape;
 272  class TopoDS_Vertex;
 273  class TopoDS_Edge;
 274 @@ -83,13 +85,13 @@
 275     void FacesPartition(const TopoDS_Face& F1,const TopoDS_Face& F2) ;
 276     Standard_Boolean IsDone(const TopoDS_Face& F1,const TopoDS_Face& F2) const;
 277     TopTools_MapOfShape& TouchedFaces() ;
 278 -   Handle_BRepAlgo_AsDes AsDes() const;
 279 +   Handle(BRepAlgo_AsDes) AsDes() const;
 280     TopTools_MapOfShape& NewEdges() ;
 281     Standard_Boolean HasSameDomainF(const TopoDS_Shape& F) const;
 282     Standard_Boolean IsSameDomainF(const TopoDS_Shape& F1,const TopoDS_Shape& F2) const;
 283     const TopTools_ListOfShape& SameDomain(const TopoDS_Face& F) const;
 284     TopoDS_Vertex ReplaceSameDomainV(const TopoDS_Vertex& V,const TopoDS_Edge& E) const;
 285 -   Handle_BRepAlgo_AsDes SectionEdgesAD() const;
 286 +   Handle(BRepAlgo_AsDes) SectionEdgesAD() const;
 287     Standard_Boolean IsSectionEdge(const TopoDS_Edge& E) const;
 288     Standard_Boolean HasSectionEdge(const TopoDS_Face& F) const;
 289     Standard_Boolean IsSplitOn(const TopoDS_Edge& NewE,const TopoDS_Edge& OldE,const TopoDS_Face& F) const;
 290 @@ -121,11 +123,11 @@
 291
 292     // Fields PRIVATE
 293     //
 294 -   Handle_BRepAlgo_AsDes myAsDes;
 295 +   Handle(BRepAlgo_AsDes) myAsDes;
 296     TopTools_DataMapOfShapeListOfShape myDone;
 297     TopTools_MapOfShape myTouched;
 298     TopTools_MapOfShape myNewEdges;
 299 -   Handle_BRepAlgo_AsDes mySectionEdgesAD;
 300 +   Handle(BRepAlgo_AsDes) mySectionEdgesAD;
 301     TopTools_DataMapOfShapeListOfShape mySameDomainFM;
 302     TopTools_DataMapOfShapeShape mySameDomainVM;
 303
 304 diff -Naur netgen-4.9.13_SRC/libsrc/occ/Partition_Loop2d.hxx netgen-4.9.13_SRC_new/libsrc/occ/Partition_Loop2d.hxx
 305 --- netgen-4.9.13_SRC/libsrc/occ/Partition_Loop2d.hxx   2009-08-24 06:12:24.000000000 +0400
 306 +++ netgen-4.9.13_SRC_new/libsrc/occ/Partition_Loop2d.hxx       2016-02-05 16:44:26.000000000 +0300
 307 @@ -24,7 +24,6 @@
 308  #endif
 309  class TopoDS_Face;
 310  class TopoDS_Edge;
 311 -class TopTools_ListOfShape;
 312  class BRepAlgo_Image;
 313
 314
 315 diff -Naur netgen-4.9.13_SRC/libsrc/occ/Partition_Loop3d.hxx netgen-4.9.13_SRC_new/libsrc/occ/Partition_Loop3d.hxx
 316 --- netgen-4.9.13_SRC/libsrc/occ/Partition_Loop3d.hxx   2009-08-24 06:12:24.000000000 +0400
 317 +++ netgen-4.9.13_SRC_new/libsrc/occ/Partition_Loop3d.hxx       2016-02-05 16:44:26.000000000 +0300
 318 @@ -13,6 +13,9 @@
 319  #ifndef _TopTools_ListOfShape_HeaderFile
 320  #include <TopTools_ListOfShape.hxx>
 321  #endif
 322 +#ifndef _TopTools_MapOfOrientedShape_HeaderFile
 323 +#include <TopTools_MapOfOrientedShape.hxx>
 324 +#endif
 325  #ifndef _TopTools_IndexedDataMapOfShapeListOfShape_HeaderFile
 326  #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 327  #endif
 328 @@ -23,8 +26,6 @@
 329  #include <Standard_Real.hxx>
 330  #endif
 331  class TopoDS_Shape;
 332 -class TopTools_ListOfShape;
 333 -class TopTools_MapOfOrientedShape;
 334  class TopoDS_Edge;
 335  class TopoDS_Face;
 336  class gp_Vec;
 337 diff -Naur netgen-4.9.13_SRC/libsrc/occ/Partition_Loop.hxx netgen-4.9.13_SRC_new/libsrc/occ/Partition_Loop.hxx
 338 --- netgen-4.9.13_SRC/libsrc/occ/Partition_Loop.hxx     2009-08-24 06:12:24.000000000 +0400
 339 +++ netgen-4.9.13_SRC_new/libsrc/occ/Partition_Loop.hxx 2016-02-05 16:44:26.000000000 +0300
 340 @@ -38,8 +38,6 @@
 341  #endif
 342  class TopoDS_Face;
 343  class TopoDS_Edge;
 344 -class TopTools_ListOfShape;
 345 -
 346
 347  #ifndef _Standard_HeaderFile
 348  #include <Standard.hxx>
 349 diff -Naur netgen-4.9.13_SRC/libsrc/occ/Partition_Spliter.cxx netgen-4.9.13_SRC_new/libsrc/occ/Partition_Spliter.cxx
 350 --- netgen-4.9.13_SRC/libsrc/occ/Partition_Spliter.cxx  2016-02-15 09:50:31.000000000 +0300
 351 +++ netgen-4.9.13_SRC_new/libsrc/occ/Partition_Spliter.cxx      2016-02-05 16:44:26.000000000 +0300
 352 @@ -48,7 +48,6 @@
 353  #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 354  #include <TopTools_IndexedMapOfShape.hxx>
 355  #include <TopTools_ListIteratorOfListOfShape.hxx>
 356 -#include <TopTools_ListOfShape.hxx>
 357  #include <TopTools_MapIteratorOfMapOfShape.hxx>
 358  #include <TopTools_SequenceOfShape.hxx>
 359
 360 diff -Naur netgen-4.9.13_SRC/libsrc/occ/Partition_Spliter.hxx netgen-4.9.13_SRC_new/libsrc/occ/Partition_Spliter.hxx
 361 --- netgen-4.9.13_SRC/libsrc/occ/Partition_Spliter.hxx  2009-08-24 06:12:24.000000000 +0400
 362 +++ netgen-4.9.13_SRC_new/libsrc/occ/Partition_Spliter.hxx      2016-02-05 16:44:26.000000000 +0300
 363 @@ -28,9 +28,6 @@
 364  #ifndef _TopTools_DataMapOfShapeShape_HeaderFile
 365  #include <TopTools_DataMapOfShapeShape.hxx>
 366  #endif
 367 -#ifndef _Handle_BRepAlgo_AsDes_HeaderFile
 368 -#include <Handle_BRepAlgo_AsDes.hxx>
 369 -#endif
 370  #ifndef _BRepAlgo_Image_HeaderFile
 371  #include <BRepAlgo_Image.hxx>
 372  #endif
 373 @@ -45,7 +42,6 @@
 374  #endif
 375  class BRepAlgo_AsDes;
 376  class TopoDS_Shape;
 377 -class TopTools_ListOfShape;
 378  class TopoDS_Edge;
 379
 380
 381 @@ -129,7 +125,7 @@
 382     TopTools_DataMapOfShapeShape myFaceShapeMap;
 383     TopTools_DataMapOfShapeShape myInternalFaces;
 384     TopTools_DataMapOfShapeShape myIntNotClFaces;
 385 -   Handle_BRepAlgo_AsDes myAsDes;
 386 +   Handle(BRepAlgo_AsDes) myAsDes;
 387     BRepAlgo_Image myImagesFaces;
 388     BRepAlgo_Image myImagesEdges;
 389     BRepAlgo_Image myImageShape;
 390 diff -Naur netgen-4.9.13_SRC/libsrc/visualization/mvdraw.cpp netgen-4.9.13_SRC_new/libsrc/visualization/mvdraw.cpp
 391 --- netgen-4.9.13_SRC/libsrc/visualization/mvdraw.cpp   2010-03-04 16:03:16.000000000 +0300
 392 +++ netgen-4.9.13_SRC_new/libsrc/visualization/mvdraw.cpp       2016-02-05 16:44:26.000000000 +0300
 393 @@ -28,7 +28,7 @@
 394  {
 395    Point3d VisualScene :: center;
 396    double VisualScene :: rad;
 397 -  GLdouble VisualScene :: backcolor;
 398 +  GLfloat VisualScene :: backcolor;
 399
 400    /*
 401  #if TOGL_MAJOR_VERSION!=2
 402 diff -Naur netgen-4.9.13_SRC/libsrc/visualization/mvdraw.hpp netgen-4.9.13_SRC_new/libsrc/visualization/mvdraw.hpp
 403 --- netgen-4.9.13_SRC/libsrc/visualization/mvdraw.hpp   2009-09-07 22:28:44.000000000 +0400
 404 +++ netgen-4.9.13_SRC_new/libsrc/visualization/mvdraw.hpp       2016-02-05 16:44:26.000000000 +0300
 405 @@ -32,7 +32,7 @@
 406      GLdouble clipplane[4];
 407
 408      int changeval;
 409 -    static GLdouble backcolor;
 410 +    static GLfloat backcolor;
 411
 412      static int selface;
 413      static int selelement;
 414 diff -Naur netgen-4.9.13_SRC/libsrc/visualization/vscsg.cpp netgen-4.9.13_SRC_new/libsrc/visualization/vscsg.cpp
 415 --- netgen-4.9.13_SRC/libsrc/visualization/vscsg.cpp    2009-08-10 15:40:50.000000000 +0400
 416 +++ netgen-4.9.13_SRC_new/libsrc/visualization/vscsg.cpp        2016-02-05 16:44:26.000000000 +0300
 417 @@ -85,7 +85,7 @@
 418        const TopLevelObject * tlo = geometry -> GetTopLevelObject (i);
 419        if (tlo->GetVisible() && !tlo->GetTransparent())
 420         {
 421 -         float mat_col[] = { tlo->GetRed(), tlo->GetGreen(), tlo->GetBlue(), 1 };
 422 +         float mat_col[] = { float(tlo->GetRed()), float(tlo->GetGreen()), float(tlo->GetBlue()), 1 };
 423           glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_col);
 424
 425           glCallList (trilists[i]);
 426 @@ -102,7 +102,7 @@
 427        const TopLevelObject * tlo = geometry -> GetTopLevelObject (i);
 428        if (tlo->GetVisible() && tlo->GetTransparent())
 429         {
 430 -         float mat_col[] = { tlo->GetRed(), tlo->GetGreen(), tlo->GetBlue(), transp };
 431 +         float mat_col[] = { float(tlo->GetRed()), float(tlo->GetGreen()), float(tlo->GetBlue()), float(transp) };
 432
 433           glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_col);
 434