Updates will be applied - 12:30pm EDT (UTC -400). Site will be down for around 30

Commit 1a59b0a2 authored by Berk Geveci's avatar Berk Geveci

BUG: Fixed multiple instances where vtkDataObject::DATA_EXTENT_TYPE() was used wrong.

vtkDataObject::DATA_EXTENT_TYPE() needs to be only set on a data
object's information object. This is usually done in the constructor
of the data object's class. Those that are implementing algorithms
do not have to worry about this key.
parent d2d978ce
......@@ -27,7 +27,7 @@
#include "vtkStructuredPoints.h"
#include "vtkUnstructuredGrid.h"
vtkCxxRevisionMacro(vtkDataSetAlgorithm, "1.15");
vtkCxxRevisionMacro(vtkDataSetAlgorithm, "1.16");
vtkStandardNewMacro(vtkDataSetAlgorithm);
//----------------------------------------------------------------------------
......@@ -211,9 +211,6 @@ int vtkDataSetAlgorithm::RequestDataObject(
if (input)
{
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), input->GetExtentType());
// for each output
for(int i=0; i < this->GetNumberOfOutputPorts(); ++i)
{
......
......@@ -23,7 +23,7 @@
#include "vtkUnstructuredGrid.h"
#include "vtkRectilinearGrid.h"
vtkCxxRevisionMacro(vtkDataSetToDataSetFilter, "1.70");
vtkCxxRevisionMacro(vtkDataSetToDataSetFilter, "1.71");
// Construct object.
vtkDataSetToDataSetFilter::vtkDataSetToDataSetFilter()
......@@ -59,8 +59,6 @@ int vtkDataSetToDataSetFilter::RequestDataObject(vtkInformation*,
output = input->NewInstance();
output->SetPipelineInformation(info);
output->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), output->GetExtentType());
}
return 1;
}
......
......@@ -29,7 +29,7 @@
#include "vtkTable.h"
#include "vtkUnstructuredGrid.h"
vtkCxxRevisionMacro(vtkPassInputTypeAlgorithm, "1.3");
vtkCxxRevisionMacro(vtkPassInputTypeAlgorithm, "1.4");
vtkStandardNewMacro(vtkPassInputTypeAlgorithm);
//----------------------------------------------------------------------------
......@@ -218,8 +218,6 @@ int vtkPassInputTypeAlgorithm::RequestDataObject(
vtkDataObject* newOutput = input->NewInstance();
newOutput->SetPipelineInformation(info);
newOutput->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), newOutput->GetExtentType());
}
}
return 1;
......
......@@ -24,7 +24,7 @@
#include "vtkStructuredGrid.h"
#include "vtkUnstructuredGrid.h"
vtkCxxRevisionMacro(vtkPointSetAlgorithm, "1.3");
vtkCxxRevisionMacro(vtkPointSetAlgorithm, "1.4");
vtkStandardNewMacro(vtkPointSetAlgorithm);
//----------------------------------------------------------------------------
......@@ -193,8 +193,6 @@ int vtkPointSetAlgorithm::RequestDataObject(
output = input->NewInstance();
output->SetPipelineInformation(info);
output->Delete();
this->GetOutputPortInformation(i)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), output->GetExtentType());
}
}
return 1;
......
......@@ -30,7 +30,7 @@
#include "vtkPolyData.h"
#include "vtkUnstructuredGrid.h"
vtkCxxRevisionMacro(vtkAppendCompositeDataLeaves, "1.1");
vtkCxxRevisionMacro(vtkAppendCompositeDataLeaves, "1.2");
vtkStandardNewMacro(vtkAppendCompositeDataLeaves);
//----------------------------------------------------------------------------
......@@ -91,9 +91,6 @@ int vtkAppendCompositeDataLeaves::RequestDataObject(
if ( input )
{
this->GetOutputPortInformation( 0 )->Set(
vtkDataObject::DATA_EXTENT_TYPE(), input->GetExtentType() );
// for each output
for ( int i = 0; i < this->GetNumberOfOutputPorts(); ++ i )
{
......
......@@ -41,7 +41,7 @@
#include <vtkstd/vector>
vtkCxxRevisionMacro(vtkDataObjectGenerator, "1.15");
vtkCxxRevisionMacro(vtkDataObjectGenerator, "1.16");
vtkStandardNewMacro(vtkDataObjectGenerator);
//============================================================================
......@@ -341,7 +341,6 @@ int vtkDataObjectGenerator::RequestDataObject(vtkInformation *,
if (outData)
{
outData->SetPipelineInformation(outInfo);
outInfo->Set(vtkDataObject::DATA_EXTENT_TYPE(), outData->GetExtentType());
outInfo->Set(vtkDataObject::DATA_OBJECT(), outData);
outData->Delete();
}
......
......@@ -27,7 +27,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkObjectFactory.h"
vtkCxxRevisionMacro(vtkDataObjectToDataSetFilter, "1.47");
vtkCxxRevisionMacro(vtkDataObjectToDataSetFilter, "1.48");
vtkStandardNewMacro(vtkDataObjectToDataSetFilter);
//----------------------------------------------------------------------------
......@@ -1518,8 +1518,6 @@ int vtkDataObjectToDataSetFilter::RequestDataObject(
{
output->SetPipelineInformation(outInfo);
output->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), output->GetExtentType());
}
}
return 1;
......
......@@ -25,7 +25,7 @@
#include <vtkstd/set>
vtkStandardNewMacro(vtkExtractSelectedBlock);
vtkCxxRevisionMacro(vtkExtractSelectedBlock, "1.3");
vtkCxxRevisionMacro(vtkExtractSelectedBlock, "1.4");
//----------------------------------------------------------------------------
vtkExtractSelectedBlock::vtkExtractSelectedBlock()
{
......@@ -79,8 +79,6 @@ int vtkExtractSelectedBlock::RequestDataObject(
output = vtkMultiBlockDataSet::New();
output->SetPipelineInformation(outInfo);
output->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), output->GetExtentType());
}
return 1;
}
......
......@@ -36,7 +36,7 @@
#include "vtkSelection.h"
#include "vtkSelectionNode.h"
vtkCxxRevisionMacro(vtkExtractSelectedFrustum, "1.19");
vtkCxxRevisionMacro(vtkExtractSelectedFrustum, "1.20");
vtkStandardNewMacro(vtkExtractSelectedFrustum);
vtkCxxSetObjectMacro(vtkExtractSelectedFrustum,Frustum,vtkPlanes);
......@@ -196,8 +196,6 @@ int vtkExtractSelectedFrustum::RequestDataObject(
vtkUnstructuredGrid* newOutput = vtkUnstructuredGrid::New();
newOutput->SetPipelineInformation(info);
newOutput->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), newOutput->GetExtentType());
}
}
......
......@@ -33,7 +33,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkTable.h"
vtkCxxRevisionMacro(vtkExtractSelection, "1.27");
vtkCxxRevisionMacro(vtkExtractSelection, "1.28");
vtkStandardNewMacro(vtkExtractSelection);
//----------------------------------------------------------------------------
......@@ -210,8 +210,6 @@ int vtkExtractSelection::RequestDataObject(
output = vtkMultiBlockDataSet::New();
output->SetPipelineInformation(outInfo);
output->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), output->GetExtentType());
}
return 1;
}
......
......@@ -22,7 +22,7 @@
#include "vtkTable.h"
#include "vtkUnstructuredGrid.h"
vtkCxxRevisionMacro(vtkExtractSelectionBase, "1.4");
vtkCxxRevisionMacro(vtkExtractSelectionBase, "1.5");
//----------------------------------------------------------------------------
vtkExtractSelectionBase::vtkExtractSelectionBase()
{
......@@ -95,8 +95,6 @@ int vtkExtractSelectionBase::RequestDataObject(
}
newOutput->SetPipelineInformation(outInfo);
newOutput->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), newOutput->GetExtentType());
}
return 1;
}
......
......@@ -46,7 +46,7 @@
#define BUFFER_SIZE 32768
vtkCxxRevisionMacro(vtkMatlabEngineFilter, "1.1");
vtkCxxRevisionMacro(vtkMatlabEngineFilter, "1.2");
vtkStandardNewMacro(vtkMatlabEngineFilter);
class ArrNames
......@@ -273,8 +273,6 @@ int vtkMatlabEngineFilter::RequestDataObject(
vtkDataObject* newOutput = input->NewInstance();
newOutput->SetPipelineInformation(info);
newOutput->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), newOutput->GetExtentType());
}
}
return 1;
......
......@@ -47,7 +47,7 @@
#define BUFFER_SIZE 32768
vtkCxxRevisionMacro(vtkRCalculatorFilter, "1.1");
vtkCxxRevisionMacro(vtkRCalculatorFilter, "1.2");
vtkStandardNewMacro(vtkRCalculatorFilter);
class ArrNames
......@@ -272,8 +272,6 @@ int vtkRCalculatorFilter::RequestDataObject(
vtkDataObject* newOutput = input->NewInstance();
newOutput->SetPipelineInformation(info);
newOutput->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), newOutput->GetExtentType());
}
}
return 1;
......
......@@ -27,7 +27,7 @@
#include "vtkSmartPointer.h"
#include "vtkUnstructuredGrid.h"
vtkCxxRevisionMacro(vtkReflectionFilter, "1.19");
vtkCxxRevisionMacro(vtkReflectionFilter, "1.20");
vtkStandardNewMacro(vtkReflectionFilter);
//---------------------------------------------------------------------------
......@@ -388,8 +388,6 @@ int vtkReflectionFilter::RequestDataObject(
}
newOutput->SetPipelineInformation(outInfo);
newOutput->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), newOutput->GetExtentType());
}
return 1;
}
......
......@@ -44,7 +44,7 @@
#include <vtkstd/algorithm>
//=============================================================================
vtkCxxRevisionMacro(vtkTemporalStatistics, "1.5");
vtkCxxRevisionMacro(vtkTemporalStatistics, "1.6");
vtkStandardNewMacro(vtkTemporalStatistics);
//=============================================================================
......@@ -236,8 +236,6 @@ int vtkTemporalStatistics::RequestDataObject(
if (newOutput)
{
newOutput->SetPipelineInformation(outInfo);
this->GetOutputPortInformation(0)->Set(vtkDataObject::DATA_EXTENT_TYPE(),
newOutput->GetExtentType());
}
return 1;
......
......@@ -31,7 +31,7 @@
#include "vtkstd/algorithm"
#include "vtkstd/vector"
vtkCxxRevisionMacro(vtkTemporalInterpolator, "1.12");
vtkCxxRevisionMacro(vtkTemporalInterpolator, "1.13");
vtkStandardNewMacro(vtkTemporalInterpolator);
//----------------------------------------------------------------------------
......@@ -90,8 +90,6 @@ int vtkTemporalInterpolator::RequestDataObject(
vtkDataObject* newOutput = input->NewInstance();
newOutput->SetPipelineInformation(outInfo);
newOutput->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), newOutput->GetExtentType());
}
}
return 1;
......
......@@ -29,7 +29,7 @@
#include "vtkUnstructuredGrid.h"
#include "vtkUnstructuredGridReader.h"
vtkCxxRevisionMacro(vtkDataSetReader, "1.70");
vtkCxxRevisionMacro(vtkDataSetReader, "1.71");
vtkStandardNewMacro(vtkDataSetReader);
vtkDataSetReader::vtkDataSetReader()
......@@ -89,8 +89,6 @@ int vtkDataSetReader::RequestDataObject(
this->GetExecutive()->SetOutputData(0, output);
output->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), output->GetExtentType());
}
return 1;
......
......@@ -83,7 +83,7 @@ static int NetCDFTypeToVTKType(nc_type type)
}
//=============================================================================
vtkCxxRevisionMacro(vtkNetCDFReader, "1.3");
vtkCxxRevisionMacro(vtkNetCDFReader, "1.4");
vtkStandardNewMacro(vtkNetCDFReader);
//-----------------------------------------------------------------------------
......@@ -134,9 +134,6 @@ int vtkNetCDFReader::RequestDataObject(
output->Delete(); // Not really deleted.
}
this->GetOutputPortInformation(0)->Set(vtkDataObject::DATA_EXTENT_TYPE(),
output->GetExtentType());
return 1;
}
......
......@@ -50,7 +50,7 @@
#include <vtksys/stl/map>
#include <vtkstd/vector>
vtkCxxRevisionMacro(vtkExtractSelectedGraph, "1.32");
vtkCxxRevisionMacro(vtkExtractSelectedGraph, "1.33");
vtkStandardNewMacro(vtkExtractSelectedGraph);
//----------------------------------------------------------------------------
vtkExtractSelectedGraph::vtkExtractSelectedGraph()
......@@ -134,8 +134,6 @@ int vtkExtractSelectedGraph::RequestDataObject(
}
output->SetPipelineInformation(info);
output->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), output->GetExtentType());
}
return 1;
}
......
......@@ -27,7 +27,7 @@
#include <vtkstd/map>
vtkCxxRevisionMacro(vtkGenerateIndexArray, "1.3");
vtkCxxRevisionMacro(vtkGenerateIndexArray, "1.4");
vtkStandardNewMacro(vtkGenerateIndexArray);
vtkGenerateIndexArray::vtkGenerateIndexArray() :
......@@ -91,8 +91,6 @@ int vtkGenerateIndexArray::RequestDataObject(
vtkDataObject* newOutput = input->NewInstance();
newOutput->SetPipelineInformation(info);
newOutput->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), newOutput->GetExtentType());
}
}
return 1;
......
......@@ -32,7 +32,7 @@
#include <vtksys/stl/utility>
#include <vtksys/stl/vector>
vtkCxxRevisionMacro(vtkPassArrays, "1.3");
vtkCxxRevisionMacro(vtkPassArrays, "1.4");
vtkStandardNewMacro(vtkPassArrays);
class vtkPassArrays::Internals
......@@ -213,8 +213,6 @@ int vtkPassArrays::RequestDataObject(
vtkDataObject* newOutput = input->NewInstance();
newOutput->SetPipelineInformation(info);
newOutput->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), newOutput->GetExtentType());
}
}
return 1;
......
......@@ -36,7 +36,7 @@
#include <vtksys/stl/set>
vtkCxxRevisionMacro(vtkStringToCategory, "1.4");
vtkCxxRevisionMacro(vtkStringToCategory, "1.5");
vtkStandardNewMacro(vtkStringToCategory);
vtkStringToCategory::vtkStringToCategory()
......@@ -182,8 +182,6 @@ int vtkStringToCategory::RequestDataObject(
vtkDataObject* newOutput = input->NewInstance();
newOutput->SetPipelineInformation(info);
newOutput->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), newOutput->GetExtentType());
}
}
return 1;
......
......@@ -36,7 +36,7 @@
#include "vtkUnicodeStringArray.h"
#include "vtkVariant.h"
vtkCxxRevisionMacro(vtkStringToNumeric, "1.7");
vtkCxxRevisionMacro(vtkStringToNumeric, "1.8");
vtkStandardNewMacro(vtkStringToNumeric);
vtkStringToNumeric::vtkStringToNumeric()
......@@ -246,8 +246,6 @@ int vtkStringToNumeric::RequestDataObject(
vtkDataObject* newOutput = input->NewInstance();
newOutput->SetPipelineInformation(info);
newOutput->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), newOutput->GetExtentType());
}
}
return 1;
......
......@@ -34,7 +34,7 @@
#include "vtkTimePointUtility.h"
#include "vtkTypeUInt64Array.h"
vtkCxxRevisionMacro(vtkStringToTimePoint, "1.4");
vtkCxxRevisionMacro(vtkStringToTimePoint, "1.5");
vtkStandardNewMacro(vtkStringToTimePoint);
vtkStringToTimePoint::vtkStringToTimePoint()
......@@ -220,8 +220,6 @@ int vtkStringToTimePoint::RequestDataObject(
vtkDataObject* newOutput = input->NewInstance();
newOutput->SetPipelineInformation(info);
newOutput->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), newOutput->GetExtentType());
}
}
return 1;
......
......@@ -35,7 +35,7 @@
#include "vtkTimePointUtility.h"
#include "vtkTypeUInt64Array.h"
vtkCxxRevisionMacro(vtkTimePointToString, "1.6");
vtkCxxRevisionMacro(vtkTimePointToString, "1.7");
vtkStandardNewMacro(vtkTimePointToString);
vtkTimePointToString::vtkTimePointToString()
......@@ -276,8 +276,6 @@ int vtkTimePointToString::RequestDataObject(
vtkDataObject* newOutput = input->NewInstance();
newOutput->SetPipelineInformation(info);
newOutput->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), newOutput->GetExtentType());
}
}
return 1;
......
......@@ -45,7 +45,7 @@ using vtksys_stl::map;
using vtksys_stl::pair;
using vtksys_stl::vector;
vtkCxxRevisionMacro(vtkCollectGraph, "1.6");
vtkCxxRevisionMacro(vtkCollectGraph, "1.7");
vtkStandardNewMacro(vtkCollectGraph);
vtkCxxSetObjectMacro(vtkCollectGraph,Controller, vtkMultiProcessController);
......@@ -136,8 +136,6 @@ int vtkCollectGraph::RequestDataObject(
vtkInformation *info = outputVector->GetInformationObject(0);
output->SetPipelineInformation(info);
output->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), output->GetExtentType());
return 1;
}
......
......@@ -60,7 +60,7 @@
#include <vtkstd/vector>
vtkCxxRevisionMacro(vtkDistributedDataFilter, "1.53")
vtkCxxRevisionMacro(vtkDistributedDataFilter, "1.54")
vtkStandardNewMacro(vtkDistributedDataFilter)
......@@ -4708,8 +4708,6 @@ int vtkDistributedDataFilter::RequestDataObject(vtkInformation*,
}
newOutput->SetPipelineInformation(outInfo);
newOutput->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), newOutput->GetExtentType());
}
return 1;
}
......
......@@ -32,7 +32,7 @@
#include "vtkStructuredGrid.h"
#include "vtkUnstructuredGrid.h"
vtkCxxRevisionMacro(vtkExtractPiece, "1.2");
vtkCxxRevisionMacro(vtkExtractPiece, "1.3");
vtkStandardNewMacro(vtkExtractPiece);
//=============================================================================
......@@ -74,7 +74,6 @@ int vtkExtractPiece::RequestDataObject(
{
vtkDataObject* outData = input->NewInstance();
outData->SetPipelineInformation(outInfo);
outInfo->Set(vtkDataObject::DATA_EXTENT_TYPE(), outData->GetExtentType());
outInfo->Set(vtkDataObject::DATA_OBJECT(), outData);
outData->Delete();
}
......
......@@ -34,7 +34,7 @@
#include "vtkUnstructuredGrid.h"
#include "vtkExtentTranslator.h"
vtkCxxRevisionMacro(vtkPDataSetReader, "1.39");
vtkCxxRevisionMacro(vtkPDataSetReader, "1.40");
vtkStandardNewMacro(vtkPDataSetReader);
//----------------------------------------------------------------------------
......@@ -200,8 +200,6 @@ int vtkPDataSetReader::RequestDataObject(
}
newOutput->SetPipelineInformation(info);
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), newOutput->GetExtentType());
newOutput->Delete();
return 1;
......
......@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
vtkCxxRevisionMacro(vtkPieceRequestFilter, "1.2");
vtkCxxRevisionMacro(vtkPieceRequestFilter, "1.3");
vtkStandardNewMacro(vtkPieceRequestFilter);
//----------------------------------------------------------------------------
......@@ -116,8 +116,6 @@ int vtkPieceRequestFilter::RequestDataObject(
vtkDataObject* newOutput = input->NewInstance();
newOutput->SetPipelineInformation(info);
newOutput->Delete();
this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), newOutput->GetExtentType());
}
}
return 1;
......
......@@ -22,7 +22,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkTrivialProducer.h"
vtkCxxRevisionMacro(vtkLabelHierarchyAlgorithm, "1.1");
vtkCxxRevisionMacro(vtkLabelHierarchyAlgorithm, "1.2");
vtkStandardNewMacro(vtkLabelHierarchyAlgorithm);
//----------------------------------------------------------------------------
......@@ -145,8 +145,6 @@ int vtkLabelHierarchyAlgorithm::RequestDataObject(
outInfo->Set( vtkDataObject::DATA_OBJECT(), output );
output->FastDelete();
output->SetPipelineInformation( outInfo );
this->GetOutputPortInformation( i )->Set(
vtkDataObject::DATA_EXTENT_TYPE(), output->GetExtentType() );
}
}
return 1;
......
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