Commit a9f889ef authored by Dave Demarle's avatar Dave Demarle
Browse files

BUG: Fix memory leak when reading uniform grid.

parent aad6f701
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
#define USE_IMAGE_DATA // otherwise uniformgrid #define USE_IMAGE_DATA // otherwise uniformgrid
vtkStandardNewMacro(vtkXdmfReader); vtkStandardNewMacro(vtkXdmfReader);
vtkCxxRevisionMacro(vtkXdmfReader, "1.30"); vtkCxxRevisionMacro(vtkXdmfReader, "1.31");
vtkCxxSetObjectMacro(vtkXdmfReader,Controller,vtkMultiProcessController); vtkCxxSetObjectMacro(vtkXdmfReader,Controller,vtkMultiProcessController);
...@@ -959,7 +959,6 @@ void vtkXdmfReader::EnableGrid(const char* name) ...@@ -959,7 +959,6 @@ void vtkXdmfReader::EnableGrid(const char* name)
vtkXdmfReaderGrid* grid = this->Internals->GetGrid(name); vtkXdmfReaderGrid* grid = this->Internals->GetGrid(name);
if ( !grid ) //work around an undo/redo crash if ( !grid ) //work around an undo/redo crash
{ {
cerr << "HERE" << endl;
return; return;
} }
if(!grid->Enabled) if(!grid->Enabled)
...@@ -1711,6 +1710,8 @@ int vtkXdmfReader::RequestInformation( ...@@ -1711,6 +1710,8 @@ int vtkXdmfReader::RequestInformation(
vtkXdmfReaderGrid *sptr = this->Internals->GetGrid(0); vtkXdmfReaderGrid *sptr = this->Internals->GetGrid(0);
sptr->Information = outInfo; sptr->Information = outInfo;
this->Internals->RequestGridInformation(sptr); this->Internals->RequestGridInformation(sptr);
// release reference to meta info, we do not use it again so it is save for the vtkXdmfReaderGrid to get rid of it
sptr->Information = 0;
} }
break; break;
case VTK_MULTIBLOCK_DATA_SET: case VTK_MULTIBLOCK_DATA_SET:
...@@ -1722,6 +1723,8 @@ int vtkXdmfReader::RequestInformation( ...@@ -1722,6 +1723,8 @@ int vtkXdmfReader::RequestInformation(
{ {
if ( it->second->Enabled ) if ( it->second->Enabled )
{ {
//composite data does not yet support meta info
//so we do not yet put the results into outInfo
this->Internals->RequestGridInformation(it->second); this->Internals->RequestGridInformation(it->second);
} }
} }
......
Supports Markdown
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