Merge topic 'AllowEmptyCellsInXMLReader' into master

ce953409 Small fixes to allow empty cells.

Merge topic 'AllowEmptyCellsInXMLReader' into master
ce953409 Small fixes to allow empty cells.
8a23675b · Joachim Pouderoux · Code Review · c9f37a26 · ce953409 · 8a23675b
Commit 8a23675b authored Jan 26, 2015 by Joachim Pouderoux Committed by Code Review Jan 26, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

Filters/Core/vtkTriangleFilter.cxx Filters/Core/vtkTriangleFilter.cxx +4 -0

IO/XML/vtkXMLUnstructuredDataReader.cxx IO/XML/vtkXMLUnstructuredDataReader.cxx +1 -1

No files found.
--- a/Filters/Core/vtkTriangleFilter.cxx
+++ b/Filters/Core/vtkTriangleFilter.cxx
@@ -157,6 +157,10 @@ int vtkTriangleFilter::RequestData(
        this->UpdateProgress ((float)cellNum / numCells);
        abort = this->GetAbortExecute();
        }
+      if ( npts ==  0 )
+        {
+        continue;
+        }
      if ( npts == 3 )
        {
        newPolys->InsertNextCell(3,pts);

--- a/IO/XML/vtkXMLUnstructuredDataReader.cxx
+++ b/IO/XML/vtkXMLUnstructuredDataReader.cxx
@@ -601,7 +601,7 @@ int vtkXMLUnstructuredDataReader::ReadCellArray(vtkIdType numberOfCells,
  vtkIdType i;
  for(i=0; i < numberOfCells; ++i)
    {
-    if(coffset[i] <= lastOffset)
+    if(coffset[i] < lastOffset)
      {
      vtkErrorMacro("Cannot read cell connectivity from " << eCells->GetName()
                    << " in piece " << this->Piece