Merge master branch into V9_dev

[modules/gui.git] / src / VTKViewer / VTKViewer_ArcBuilder.h

diff --git a/src/VTKViewer/VTKViewer_ArcBuilder.h b/src/VTKViewer/VTKViewer_ArcBuilder.h
index c5f47a2c4798a0fa45bd692f17d6203f084491d3..13f68ec8b58a2492e2ab8ce4f34156647ca1966d 100644 (file)
--- a/src/VTKViewer/VTKViewer_ArcBuilder.h
+++ b/src/VTKViewer/VTKViewer_ArcBuilder.h
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,6 +25,9 @@
 #include <map>
 #include <vector>
 
+#include <vtkType.h>
+#include <vtkSmartPointer.h>
+
 class vtkCell;
 class vtkDataArray;
 class vtkPoints;
@@ -35,7 +38,7 @@ class Pnt;
 
 typedef std::list<Pnt> PntList;
 
-vtkIdType MergevtkPoints(const std::vector<vtkPoints*>& theCollection,
+vtkIdType MergevtkPoints(const std::vector< vtkSmartPointer< vtkPoints > >& theCollection,
                          const std::vector< std::vector<double> >& theScalarCollection,
                          vtkPoints* thePoints,
                          std::map<int, double>& thePntId2ScalarValue,
@@ -45,7 +48,7 @@ vtkIdType Build1DArc(vtkIdType cellId,
                      vtkUnstructuredGrid* input, 
                      vtkPolyData *output,
                      vtkIdType *pts, 
-                     vtkFloatingPointType myMaxArcAngle);
+                     double myMaxArcAngle);
 
 Pnt CreatePnt(vtkCell* cell,
               vtkDataArray* scalars,
@@ -182,7 +185,7 @@ class VTKViewer_ArcBuilder{
 
   double myAngle;
   ArcStatus myStatus;
-  vtkPoints* myPoints;
+  vtkSmartPointer<vtkPoints> myPoints;
   std::vector<double> myScalarValues;
 };