Merge topic 'AddLegacyPolyDataGetPointCellsWithUnsignedShort'

59e7ae1c Add back vtkPD/vtkUG::GetPointCells with unsigned short ref parameter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Will Schroeder <will.schroeder@kitware.com>
Merge-request: !5797

Common/DataModel/vtkPolyData.h

@@ -287,12 +287,18 @@ public:
    */
   void DeleteLinks();
 
+  //@{
   /**
    * Special (efficient) operations on poly data. Use carefully (i.e., make
    * sure that BuildLinks() has been called).
    */
   void GetPointCells(vtkIdType ptId, vtkIdType& ncells,
                      vtkIdType* &cells) VTK_SIZEHINT(cells, ncells);
+#ifndef VTK_LEGACY_REMOVE
+  VTK_LEGACY(void GetPointCells(vtkIdType ptId, unsigned short& ncells, vtkIdType*& cells))
+    VTK_SIZEHINT(cells, ncells);
+#endif
+  //@}
 
   /**
    * Get the neighbors at an edge. More efficient than the general
@@ -608,6 +614,16 @@ inline void vtkPolyData::GetPointCells(vtkIdType ptId, vtkIdType& ncells,
   cells = this->Links->GetCells(ptId);
 }
 
+#ifndef VTK_LEGACY_REMOVE
+inline void vtkPolyData::GetPointCells(vtkIdType ptId, unsigned short& ncells,
+                                       vtkIdType* &cells)
+{
+  VTK_LEGACY_BODY(vtkPolyData::GetPointCells, "VTK 9.0");
+  ncells = static_cast<unsigned short>(this->Links->GetNcells(ptId));
+  cells = this->Links->GetCells(ptId);
+}
+#endif
+
 inline int vtkPolyData::IsTriangle(int v1, int v2, int v3)
 {
   vtkIdType n1;

Common/DataModel/vtkUnstructuredGrid.cxx

@@ -1546,6 +1546,19 @@ GetPointCells(vtkIdType ptId, vtkIdType& ncells, vtkIdType* &cells)
   }
 }
 
+//----------------------------------------------------------------------------
+#ifndef VTK_LEGACY_REMOVE
+void vtkUnstructuredGrid::
+GetPointCells(vtkIdType ptId, unsigned short& ncells, vtkIdType*& cells)
+{
+  VTK_LEGACY_BODY(
+    vtkUnstructuredGrid::GetPointCells, "VTK 9.0");
+  vtkIdType nc;
+  this->GetPointCells(ptId, nc, cells);
+  ncells = static_cast<unsigned short>(nc);
+}
+#endif
+
 //----------------------------------------------------------------------------
 void vtkUnstructuredGrid::GetCellPoints(vtkIdType cellId, vtkIdList *ptIds)
 {

Common/DataModel/vtkUnstructuredGrid.h

@@ -156,6 +156,7 @@ public:
     this->Connectivity->GetCell(loc,npts,pts);
   }
 
+  //@{
   /**
    * Special (efficient) operation to return the list of cells using the
    * specified point ptId. Use carefully (i.e., make sure that BuildLinks()
@@ -163,6 +164,11 @@ public:
    */
   void GetPointCells(vtkIdType ptId, vtkIdType& ncells,
                      vtkIdType* &cells) VTK_SIZEHINT(cells, ncells);
+#ifndef VTK_LEGACY_REMOVE
+  VTK_LEGACY(void GetPointCells(vtkIdType ptId, unsigned short& ncells, vtkIdType*& cells))
+    VTK_SIZEHINT(cells, ncells);
+#endif
+  //@}
 
   /**
   * Get the array of all cell types in the grid. Each single-component