Commit ca2cf9db authored by Berk Geveci's avatar Berk Geveci

ENH: Do not rely on ShallowCopy to copy pipeline information

parent 635957a1
......@@ -35,7 +35,7 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkStructuredGrid.h"
#include "vtkUniformGrid.h"
vtkCxxRevisionMacro(vtkCompositeDataPipeline, "1.8");
vtkCxxRevisionMacro(vtkCompositeDataPipeline, "1.9");
vtkStandardNewMacro(vtkCompositeDataPipeline);
vtkInformationKeyMacro(vtkCompositeDataPipeline,BEGIN_LOOP,Integer);
......@@ -376,6 +376,7 @@ int vtkCompositeDataPipeline::ExecuteInformationForBlock(vtkInformation* request
if (dobj && dobjCopy)
{
dobjCopy->ShallowCopy(dobj);
dobjCopy->CopyInformation(dobj);
}
}
}
......
......@@ -30,7 +30,7 @@
#include <assert.h>
#include <ctype.h> /* isspace */
vtkCxxRevisionMacro(vtkGenericEnSightReader, "1.69");
vtkCxxRevisionMacro(vtkGenericEnSightReader, "1.70");
vtkStandardNewMacro(vtkGenericEnSightReader);
vtkCxxSetObjectMacro(vtkGenericEnSightReader,TimeSets,
......@@ -225,6 +225,7 @@ void vtkGenericEnSightReader::Execute()
output = tmp->NewInstance();
this->SetNthOutput(i, output); // law: this causes the extra partid bug
output->ShallowCopy(tmp);
output->CopyInformation(tmp);
output->Delete();
// Used later.
//output = NULL;
......
......@@ -22,7 +22,7 @@
#include "vtkInformation.h"
#include "vtkStreamingDemandDrivenPipeline.h"
vtkCxxRevisionMacro(vtkXMLImageDataReader, "1.7");
vtkCxxRevisionMacro(vtkXMLImageDataReader, "1.8");
vtkStandardNewMacro(vtkXMLImageDataReader);
//----------------------------------------------------------------------------
......@@ -116,10 +116,10 @@ void vtkXMLImageDataReader::SetupOutputInformation(vtkInformation *outInfo)
//----------------------------------------------------------------------------
void vtkXMLImageDataReader::CopyOutputInformation(vtkInformation *outInfo, int port)
{
{
this->Superclass::CopyOutputInformation(outInfo, port);
vtkInformation *localInfo = this->GetExecutive()->GetOutputInformation( port );
if ( localInfo->Has(vtkDataObject::ORIGIN()) )
{
outInfo->CopyEntry( localInfo, vtkDataObject::ORIGIN() );
......@@ -128,7 +128,11 @@ void vtkXMLImageDataReader::CopyOutputInformation(vtkInformation *outInfo, int p
{
outInfo->CopyEntry( localInfo, vtkDataObject::SPACING() );
}
}
if ( localInfo->Has(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT()) )
{
outInfo->CopyEntry( localInfo, vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT() );
}
}
//----------------------------------------------------------------------------
......
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