Commit 83c70265 authored by Chris Harris's avatar Chris Harris
Browse files

Merge remote-tracking branch 'gitorious/master' into pv

Conflicts:
	vtk/Testing/Cxx/XdmfTestVTKIO.cxx
	vtk/vtkXdmfReader.cxx
	vtk/vtkXdmfWriter.cxx
parents 4b16219c a4174e69
...@@ -94,11 +94,13 @@ bool DoDataObjectsDiffer(vtkDataObject *dobj1, vtkDataObject *dobj2) ...@@ -94,11 +94,13 @@ bool DoDataObjectsDiffer(vtkDataObject *dobj1, vtkDataObject *dobj2)
cerr << "Number of field arrays test failed" << endl; cerr << "Number of field arrays test failed" << endl;
return true; return true;
} }
// if (dobj1->GetEstimatedMemorySize()!=dobj2->GetEstimatedMemorySize()) if (!dobj1->IsA("vtkPolyData") &&
// { !dobj1->IsA("vtkMultiBlockDataSet") &&
// cerr << "Mem size test failed" << endl; dobj1->GetActualMemorySize()!=dobj2->GetActualMemorySize())
// return true; {
// } cerr << "Mem size test failed" << endl;
return true;
}
vtkDataSet *ds1 = vtkDataSet::SafeDownCast(dobj1); vtkDataSet *ds1 = vtkDataSet::SafeDownCast(dobj1);
vtkDataSet *ds2 = vtkDataSet::SafeDownCast(dobj2); vtkDataSet *ds2 = vtkDataSet::SafeDownCast(dobj2);
if (ds1 && ds2) if (ds1 && ds2)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment