Fix compilation error and some warnings

[modules/geom.git] / src / OBJECT / GEOM_OCCReader.cxx

diff --git a/src/OBJECT/GEOM_OCCReader.cxx b/src/OBJECT/GEOM_OCCReader.cxx
index 02e81bdf1a3ce4c3db526ee9ca9659bc2f77710c..8611d3e96f2c7804a2a2949bf259e46bd84cc6e9 100644 (file)
--- a/src/OBJECT/GEOM_OCCReader.cxx
+++ b/src/OBJECT/GEOM_OCCReader.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -213,7 +213,7 @@ void GEOM_OCCReader::createISO (const TopoDS_Face      &TopologicalFace,
                                       vtkPoints        *Pts,
                                       vtkCellArray     *Cell)
 {
-  GEOMUtils_Hatcher aHatcher(TopologicalFace);
+  GEOMUtils::Hatcher aHatcher(TopologicalFace);
 
   aHatcher.Init(NbIsos);
   aHatcher.Perform();
@@ -231,7 +231,7 @@ void GEOM_OCCReader::createISO (const TopoDS_Face      &TopologicalFace,
 // Function : createIsos
 // Purpose  : Create isolines obtained from hatcher.
 //=======================================================================
-void GEOM_OCCReader::createIsos(const GEOMUtils_Hatcher &theHatcher,
+void GEOM_OCCReader::createIsos(const GEOMUtils::Hatcher &theHatcher,
                                 const Standard_Boolean   IsUIso,
                                       Standard_Integer  &pt_start_idx,
                                       vtkPoints         *Pts,
@@ -484,6 +484,7 @@ void GEOM_OCCReader::DrawIso(GeomAbs_IsoType T,
           case GeomAbs_Hyperbola :
           case GeomAbs_BezierCurve :
           case GeomAbs_BSplineCurve :
+          case GeomAbs_OffsetCurve:
           case GeomAbs_OtherCurve :
             for (j = 1; j <= myDiscret/2; j++) {
 
@@ -558,9 +559,8 @@ void GEOM_OCCReader::PlotIso (BRepAdaptor_Surface& S,
 
 void GEOM_OCCReader::TransferEdgeWData(const TopoDS_Edge& aEdge,
                                          vtkPoints* Pts,
-                                         vtkCellArray* Cells) {
-  
-  
+                                         vtkCellArray* Cells)
+{
   Handle(Poly_PolygonOnTriangulation) aEdgePoly;
   Standard_Integer i = 1;
   Handle(Poly_Triangulation) T;
@@ -786,11 +786,12 @@ void GEOM_OCCReader::TransferEdgeWData(const TopoDS_Edge& aEdge,
 //=======================================================================
 
 void GEOM_OCCReader::TransferVertexWData(const TopoDS_Vertex& aVertex,
-                                         vtkPoints* Pts,
-                                         vtkCellArray* Cells) {
-#define ZERO_COORD coord[0] = 0.0; coord[1] = 0.0; coord[2] = 0.0
+                                         vtkPoints*           Pts,
+                                         vtkCellArray*        Cells)
+{
+#define ZERO_COORD coord[0] = coord[1] = coord[2] = 0.0
   
-  gp_Pnt P = BRep_Tool::Pnt( aVertex );
+  // gp_Pnt P = BRep_Tool::Pnt( aVertex ); ??????????????????????????
   float delta = 1, coord[3];
   vtkIdType pts[2];
   // insert pt