Commit 3f7e1d59 authored by Rusty Blue's avatar Rusty Blue
Browse files

BUG: Fixing a bug in the CopyEntry functionality of Integer keys revealed that...

BUG: Fixing a bug in the CopyEntry functionality of Integer keys revealed that MAXIMUM_NUMBER_OF_PIECES was not correctly being handled if the input was structured data.
parent a0a1c317
......@@ -28,7 +28,7 @@
#include "vtkObjectFactory.h"
#include "vtkSmartPointer.h"
vtkCxxRevisionMacro(vtkStreamingDemandDrivenPipeline, "1.27");
vtkCxxRevisionMacro(vtkStreamingDemandDrivenPipeline, "1.28");
vtkStandardNewMacro(vtkStreamingDemandDrivenPipeline);
vtkInformationKeyMacro(vtkStreamingDemandDrivenPipeline, CONTINUE_EXECUTING, Integer);
......@@ -313,9 +313,19 @@ vtkStreamingDemandDrivenPipeline
{
if (!outInfo->Has(MAXIMUM_NUMBER_OF_PIECES()))
{
// Since most unstructured filters in VTK generate all their
// data once, set the default maximum number of pieces to 1.
outInfo->Set(MAXIMUM_NUMBER_OF_PIECES(), 1);
if (this->GetNumberOfInputPorts() > 0)
{
// must have structured input; MAXIMUM_NUMBER_OF_PIECES will
// not be copied above (CopyEntry does nothing since key not set
// in inInfo); set to -1
outInfo->Set(MAXIMUM_NUMBER_OF_PIECES(), -1);
}
else
{
// Since most unstructured filters in VTK generate all their
// data once, set the default maximum number of pieces to 1.
outInfo->Set(MAXIMUM_NUMBER_OF_PIECES(), 1);
}
}
}
else if(dataInfo->Get(vtkDataObject::DATA_EXTENT_TYPE()) == VTK_3D_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