Commit d10d7093 authored by Berk Geveci's avatar Berk Geveci

More progress. Everything compiles now

parent 56788e10
......@@ -38,9 +38,7 @@ int TestHistogram2D(int, char * [])
vtkNew<vtkImageData> data;
data->SetExtent(0, size-1, 0, size-1, 0, 0);
data->SetNumberOfScalarComponents(1);
data->SetScalarTypeToDouble();
data->AllocateScalars();
data->AllocateScalars(VTK_DOUBLE, 1);
data->SetOrigin(100.0, 0.0, 0.0);
data->SetSpacing(2.0, 1.0, 1.0);
......
......@@ -170,9 +170,7 @@ void vtkColorLegend::ComputeTexture()
this->ImageData->SetExtent(0, 0,
0, dimension-1,
0, 0);
this->ImageData->SetNumberOfScalarComponents(3);
this->ImageData->SetScalarTypeToUnsignedChar();
this->ImageData->AllocateScalars();
this->ImageData->AllocateScalars(VTK_UNSIGNED_CHAR, 3);
for (int i = 0; i < dimension; ++i)
{
......
......@@ -106,9 +106,7 @@ void vtkColorTransferFunctionItem::ComputeTexture()
this->Texture->SetExtent(0, dimension-1,
0, 0,
0, 0);
this->Texture->SetNumberOfScalarComponents(4);
this->Texture->SetScalarTypeToUnsignedChar();
this->Texture->AllocateScalars();
this->Texture->AllocateScalars(VTK_UNSIGNED_CHAR, 4);
for (int i = 0; i < dimension; ++i)
{
......
......@@ -96,9 +96,7 @@ void vtkLookupTableItem::ComputeTexture()
this->Texture->SetExtent(0, dimension - 1,
0,0,
0,0);
this->Texture->SetNumberOfScalarComponents(4);
this->Texture->SetScalarTypeToUnsignedChar();
this->Texture->AllocateScalars();
this->Texture->AllocateScalars(VTK_UNSIGNED_CHAR, 4);
// TODO: Support log scale ?
double bounds[4];
this->GetBounds(bounds);
......
......@@ -108,9 +108,7 @@ void vtkPiecewiseFunctionItem::ComputeTexture()
this->Texture->SetExtent(0, dimension-1,
0, 0,
0, 0);
this->Texture->SetNumberOfScalarComponents(4);
this->Texture->SetScalarTypeToUnsignedChar();
this->Texture->AllocateScalars();
this->Texture->AllocateScalars(VTK_UNSIGNED_CHAR, 4);
this->PiecewiseFunction->GetTable(bounds[0], bounds[1], dimension, values);
unsigned char* ptr =
......
......@@ -126,9 +126,7 @@ void vtkPlotHistogram2D::GenerateHistogram()
this->Output = vtkSmartPointer<vtkImageData>::New();
}
this->Output->SetExtent(this->Input->GetExtent());
this->Output->SetNumberOfScalarComponents(4);
this->Output->SetScalarTypeToUnsignedChar();
this->Output->AllocateScalars();
this->Output->AllocateScalars(VTK_UNSIGNED_CHAR, 4);
int dimension = this->Input->GetDimensions()[0] * this->Input->GetDimensions()[1];
double *input = reinterpret_cast<double *>(this->Input->GetScalarPointer());
......
......@@ -228,8 +228,6 @@ void vtkPlotPoints::GeneraterMarker(int width, bool highlight)
if (!this->Marker)
{
this->Marker = vtkImageData::New();
this->Marker->SetScalarTypeToUnsignedChar();
this->Marker->SetNumberOfScalarComponents(4);
}
else
{
......@@ -247,8 +245,6 @@ void vtkPlotPoints::GeneraterMarker(int width, bool highlight)
if (!this->HighlightMarker)
{
this->HighlightMarker = vtkImageData::New();
this->HighlightMarker->SetScalarTypeToUnsignedChar();
this->HighlightMarker->SetNumberOfScalarComponents(4);
data = this->HighlightMarker;
}
else
......@@ -264,7 +260,7 @@ void vtkPlotPoints::GeneraterMarker(int width, bool highlight)
}
data->SetExtent(0, width-1, 0, width-1, 0, 0);
data->AllocateScalars();
data->AllocateScalars(VTK_UNSIGNED_CHAR, 4);
unsigned char* image =
static_cast<unsigned char*>(data->GetScalarPointer());
......
......@@ -122,7 +122,6 @@ int ComparePointLocators(vtkAbstractPointLocator* locator1, vtkAbstractPointLoca
}
}
sgrid->SetPoints(points);
sgrid->Update();
points->Delete();
locator1->SetDataSet(sgrid);
......
......@@ -1338,6 +1338,17 @@ void vtkAlgorithm::Update()
this->GetExecutive()->Update();
}
//----------------------------------------------------------------------------
void vtkAlgorithm::PropagateUpdateExtent()
{
vtkStreamingDemandDrivenPipeline* sddp =
vtkStreamingDemandDrivenPipeline::SafeDownCast(this->GetExecutive());
if (sddp)
{
sddp->PropagateUpdateExtent(-1);
}
}
//----------------------------------------------------------------------------
void vtkAlgorithm::UpdateInformation()
{
......@@ -1532,3 +1543,53 @@ double vtkAlgorithm::ComputePriority()
return sddp->ComputePriority(0);
}
//-------------------------------------------------------------
int vtkAlgorithm::SetUpdateExtentToWholeExtent(
int port, int connection)
{
if (this->GetInputInformation(port, connection))
{
return
vtkStreamingDemandDrivenPipeline::SetUpdateExtentToWholeExtent(
this->GetInputInformation(port, connection));
}
else
{
return 0;
}
}
//-------------------------------------------------------------
int vtkAlgorithm::SetUpdateExtentToWholeExtent()
{
return this->SetUpdateExtentToWholeExtent(0, 0);
}
//-------------------------------------------------------------
void vtkAlgorithm::SetUpdateExtent(int port, int connection,
int piece,
int numPieces,
int ghostLevel)
{
if (this->GetInputInformation(port, connection))
{
vtkStreamingDemandDrivenPipeline::SetUpdateExtent(
this->GetInputInformation(port, connection),
piece,
numPieces,
ghostLevel);
}
}
//-------------------------------------------------------------
void vtkAlgorithm::SetUpdateExtent(int port,
int connection,
int extent[6])
{
if (this->GetInputInformation(port, connection))
{
vtkStreamingDemandDrivenPipeline::SetUpdateExtent(
this->GetInputInformation(port, connection),
extent);
}
}
......@@ -371,9 +371,13 @@ public:
virtual void Update();
// Description:
// Backward compatibility method to invoke UpdateInformation on executive.
// Bring the algorithm's information up-to-date.
virtual void UpdateInformation();
// Description::
// Propagate meta-data upstream.
virtual void PropagateUpdateExtent();
// Description:
// Bring this algorithm's outputs up-to-date.
virtual void UpdateWholeExtent();
......@@ -427,6 +431,47 @@ public:
static vtkInformationIntegerKey* PRESERVES_ATTRIBUTES();
static vtkInformationIntegerKey* PRESERVES_RANGES();
// Description:
// If the whole input extent is required to generate the requested output
// extent, this method can be called to set the input update extent to the
// whole input extent. This method assumes that the whole extent is known
// (that UpdateInformation has been called).
// This function has no effect is input connection is not established.
int SetUpdateExtentToWholeExtent(int port, int connection);
// Description:
// Convenience function equivalent to SetUpdateExtentToWholeExtent(0, 0)
// This function has no effect is input connection is not established.
int SetUpdateExtentToWholeExtent();
// Description:
// Set the update extent in terms of piece and ghost levels.
// This function has no effect is input connection is not established.
void SetUpdateExtent(int port, int connection,
int piece,int numPieces, int ghostLevel);
// Description:
// Convenience function equivalent to SetUpdateExtent(0, 0, piece,
// numPieces, ghostLevel)
// This function has no effect is input connection is not established.
void SetUpdateExtent(int piece,int numPieces, int ghostLevel)
{
this->SetUpdateExtent(0, 0, piece, numPieces, ghostLevel);
}
// Description:
// Set the update extent for data objects that use 3D extents
// This function has no effect is input connection is not established.
void SetUpdateExtent(int port, int connection, int extent[6]);
// Description:
// Convenience function equivalent to SetUpdateExtent(0, 0, extent)
// This function has no effect is input connection is not established.
void SetUpdateExtent(int extent[6])
{
this->SetUpdateExtent(0, 0, extent);
}
protected:
vtkAlgorithm();
~vtkAlgorithm();
......
......@@ -752,7 +752,7 @@ void vtkDataObject::InternalDataObjectCopy(vtkDataObject *src)
//----------------------------------------------------------------------------
// This should be a pure virutal method.
void vtkDataObject::Crop()
void vtkDataObject::Crop(const int* updateExtent)
{
}
......
......@@ -249,7 +249,7 @@ public:
// Description:
// This method crops the data object (if necesary) so that the extent
// matches the update extent.
virtual void Crop();
virtual void Crop(const int* updateExtent);
//BTX
// Description:
......
......@@ -78,9 +78,9 @@ vtkInformationKeyMacro(vtkStreamingDemandDrivenPipeline, PREVIOUS_FAST_PATH_ID_T
class vtkStreamingDemandDrivenPipelineToDataObjectFriendship
{
public:
static void Crop(vtkDataObject* obj)
static void Crop(vtkDataObject* obj, const int* extent)
{
obj->Crop();
obj->Crop(extent);
}
};
......@@ -270,7 +270,8 @@ int vtkStreamingDemandDrivenPipeline
if(info->Has(EXACT_EXTENT()) && info->Get(EXACT_EXTENT()))
{
vtkDataObject* data = info->Get(vtkDataObject::DATA_OBJECT());
vtkStreamingDemandDrivenPipelineToDataObjectFriendship::Crop(data);
vtkStreamingDemandDrivenPipelineToDataObjectFriendship::Crop(
data, info->Get(UPDATE_EXTENT()));
}
// Clear combined update extent, since the update cycle has completed
if (info->Has(COMBINED_UPDATE_EXTENT()))
......
......@@ -371,8 +371,7 @@ void vtkGeoAlignedImageSource::CropImageForNode(vtkGeoImageNode* node, vtkImageD
vtkSmartPointer<vtkImageData> cropped = vtkSmartPointer<vtkImageData>::New();
cropped->ShallowCopy(image);
cropped->SetUpdateExtent(ext);
cropped->Crop();
cropped->Crop(ext);
// Now set the longitude and latitude range based on the actual image size.
double lonRange[2];
......
......@@ -160,8 +160,7 @@ void vtkGeoImageNode::CropImageForTile(
this->Image = vtkSmartPointer<vtkImageData>::New();
}
this->Image->ShallowCopy(image);
this->Image->SetUpdateExtent(ext);
this->Image->Crop();
this->Image->Crop(ext);
// Now set the longitude and latitude range based on the actual image size.
this->LongitudeRange[0] = origin[0] + ext[0]*spacing[0];
......
......@@ -118,8 +118,6 @@ public:
static void CheckWinding(vtkUnstructuredGrid *data)
{
data->Update();
vtkPoints *points = data->GetPoints();
vtkCellArray *cells = data->GetCells();
......
......@@ -124,9 +124,10 @@ class BoxClipTriangulateFailed { };
//-----------------------------------------------------------------------------
static void CheckWinding(vtkUnstructuredGrid *data)
static void CheckWinding(vtkBoxClipDataSet* alg)
{
data->Update();
alg->Update();
vtkUnstructuredGrid* data = alg->GetOutput();
vtkPoints *points = data->GetPoints();
......@@ -307,7 +308,7 @@ static void Check3DPrimitive(int type, vtkIdType numcells,
iren->Start();
#endif
CheckWinding(output);
CheckWinding(clipper);
VTK_CREATE(vtkDataSetSurfaceFilter, surface);
surface->SetInput(output);
......
......@@ -151,7 +151,6 @@ int TestBareScalarsToColors(int argc, char *argv[])
vtkNew<vtkImageData> image;
image->SetDimensions(80, 80, 1);
image->SetScalarTypeToUnsignedChar();
vtkUnsignedCharArray *colors =
table2->MapScalars(outputs[i], VTK_COLOR_MODE_DEFAULT, outputc);
image->GetPointData()->SetScalars(colors);
......
......@@ -156,7 +156,6 @@ int TestExtraction(int argc, char *argv[])
sampleData->SetSpacing(1.0,1.0,1.0);
sampleData->SetOrigin(0.0,0.0,0.0);
sampleData->SetDimensions(XCELLS+1,YCELLS+1,ZCELLS+1);
sampleData->SetWholeExtent(0,XCELLS+1,0,YCELLS+1,0,ZCELLS+1);
sampleData->AllocateScalars();
vtkIdTypeArray *pia = vtkIdTypeArray::New();
......
......@@ -135,7 +135,6 @@ int TestMapVectorsAsRGBColors(int argc, char *argv[])
vtkSmartPointer<vtkImageData> image =
vtkSmartPointer<vtkImageData>::New();
image->SetDimensions(80, 80, 1);
image->SetScalarTypeToUnsignedChar();
vtkUnsignedCharArray *colors =
table2->MapScalars(outputs[i], VTK_COLOR_MODE_DEFAULT, outputc);
image->GetPointData()->SetScalars(colors);
......
......@@ -81,13 +81,13 @@ int TestQuadraturePoints(int argc,char *argv[])
if (xusgr->CanReadFile(inputFileName.c_str()))
{
input=xusgr->GetOutput();
input->Update();
xusgr->Update();
}
else if (lusgr->IsFileValid("unstructured_grid"))
{
lusgr->SetFileName(inputFileName.c_str());
input=lusgr->GetOutput();
input->Update();
lusgr->Update();
}
if (input==0)
{
......@@ -129,7 +129,7 @@ int TestQuadraturePoints(int argc,char *argv[])
xusgr->SetFileName(tempFile.c_str());
input=xusgr->GetOutput();*/
input = vtkUnstructuredGrid::SafeDownCast(fieldInterp->GetOutput());
input->Update();
fieldInterp->Update();
input->GetPointData()->SetActiveVectors(warpName.c_str());
input->GetPointData()->SetActiveScalars(threshName.c_str());
// Demonstrate warp by vector.
......@@ -155,7 +155,7 @@ int TestQuadraturePoints(int argc,char *argv[])
pointGen->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_CELLS, "QuadratureOffset");
pointGen->SetInputConnection(thresholder->GetOutputPort());
vtkPolyData *output=vtkPolyData::SafeDownCast(pointGen->GetOutput());
output->Update();
pointGen->Update();
const char* activeScalars = "pressure";
output->GetPointData()->SetActiveScalars(activeScalars);
......
......@@ -29,6 +29,7 @@
#include "vtkMatrixToLinearTransform.h"
#include "vtkTransformPolyDataFilter.h"
#include "vtkMatrix4x4.h"
#include "vtkTrivialProducer.h"
#include "vtkTesting.h"
......@@ -82,8 +83,7 @@ CreateBoxStencilData(double d1, double d2 )
image->SetOrigin( 0.0, 0.0, 0.0 );
image->SetExtent(static_cast<int>(d1)-2,static_cast<int>(d2)+2,
static_cast<int>(d1)-2,static_cast<int>(d2)+2, 0, 0 );
image->SetScalarTypeToUnsignedChar();
image->AllocateScalars();
image->AllocateScalars(VTK_UNSIGNED_CHAR, 1);
vtkImageStencil *stencil = vtkImageStencil::New();
stencil->SetInput( image );
......@@ -112,9 +112,7 @@ static void GetStencilDataAsImageData(
extent[5] = extent[4]; // Otherwise we cannot write it out as a PNG!
int extent1[6] = {0,50,0,50,0,0};
image->SetExtent(extent1);
image->SetScalarTypeToUnsignedChar();
image->SetNumberOfScalarComponents(3);
image->AllocateScalars();
image->AllocateScalars(VTK_UNSIGNED_CHAR, 3);
// Fill image with zeroes
for (int y=extent1[2]; y <= extent1[3]; y++)
......@@ -205,7 +203,10 @@ int TestImageStencilData( int argc, char * argv [] )
return EXIT_FAILURE;
}
int retval = testing->RegressionTest( image, 10 );
vtkSmartPointer< vtkTrivialProducer > producer =
vtkSmartPointer< vtkTrivialProducer >::New();
producer->SetOutput(image);
int retval = testing->RegressionTest( producer, 10 );
testing->Delete();
image->Delete();
......
......@@ -607,10 +607,10 @@ void vtkAxesActor::UpdateProps()
SetInputConnection( this->UserDefinedTip->GetProducerPort() );
}
(vtkPolyDataMapper::SafeDownCast(this->XAxisTip->GetMapper()))->
GetInput()->Update();
(vtkPolyDataMapper::SafeDownCast(this->XAxisShaft->GetMapper()))->
GetInput()->Update();
vtkPolyDataMapper::SafeDownCast(this->XAxisTip->GetMapper())->
GetInputAlgorithm()->Update();
vtkPolyDataMapper::SafeDownCast(this->XAxisShaft->GetMapper())->
GetInputAlgorithm()->Update();
if ( this->GetUserTransform() )
{
......
......@@ -332,8 +332,6 @@ int vtkBarChartActor::BuildPlot(vtkViewport *viewport)
}
// Check modified time to see whether we have to rebuild.
this->Input->Update();
if (positionsHaveChanged ||
this->GetMTime() > this->BuildTime ||
this->Input->GetMTime() > this->BuildTime ||
......
......@@ -396,7 +396,6 @@ int vtkCaptionActor2D::RenderOpaqueGeometry(vtkViewport *viewport)
if ( this->LeaderGlyph )
{
// compute the scale
this->LeaderGlyph->Update();
double length = this->LeaderGlyph->GetLength();
int *sze = viewport->GetSize();
int numPixels = static_cast<int> (this->LeaderGlyphSize *
......@@ -433,7 +432,6 @@ int vtkCaptionActor2D::RenderOpaqueGeometry(vtkViewport *viewport)
{
this->LeaderMapper2D->SetInput(this->LeaderPolyData);
this->LeaderMapper3D->SetInput(this->LeaderPolyData);
this->LeaderPolyData->Update();
}
// assign properties
......
......@@ -684,7 +684,6 @@ void vtkCubeAxesActor2D::GetBounds(double bounds[6])
if ( this->Input )
{
this->Input->Update();
this->Input->GetBounds(bounds);
for (i=0; i< 6; i++)
{
......
......@@ -802,10 +802,12 @@ unsigned long vtkGridTransform::GetMTime()
result = vtkWarpTransform::GetMTime();
if (this->DisplacementGrid)
{
/*
this->DisplacementGrid->UpdateInformation();
mtime = this->DisplacementGrid->GetPipelineMTime();
result = ( mtime > result ? mtime : result );
*/
mtime = this->DisplacementGrid->GetMTime();
result = ( mtime > result ? mtime : result );
......@@ -1227,7 +1229,7 @@ void vtkGridTransform::InternalUpdate()
return;
}
grid->UpdateInformation();
//grid->UpdateInformation();
if (grid->GetNumberOfScalarComponents() != 3)
{
......@@ -1245,8 +1247,8 @@ void vtkGridTransform::InternalUpdate()
return;
}
grid->SetUpdateExtent(grid->GetWholeExtent());
grid->Update();
//grid->SetUpdateExtent(grid->GetWholeExtent());
//grid->Update();
this->GridPointer = grid->GetScalarPointer();
this->GridScalarType = grid->GetScalarType();
......
......@@ -585,8 +585,7 @@ int vtkImageDataLIC2D::RequestData(
// hence we allocate the output using the GPU extent and then crop it.
output->SetExtent(gpuExtent);
output->SetNumberOfScalarComponents(3);
output->AllocateScalars();
output->AllocateScalars(VTK_FLOAT, 3);
outputBus->SetCPUExtent(gpuExtent);
outputBus->SetGPUExtent(gpuExtent);
outputBus->SetTexture(internal->GetLIC());
......@@ -599,7 +598,7 @@ int vtkImageDataLIC2D::RequestData(
noiseBus->Delete();
// Ensures that the output extent is exactly same as what was asked for.
output->Crop();
output->Crop(outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_EXTENT()));
return 1;
}
......
......@@ -177,7 +177,9 @@ void vtkImplicitModeller::StartAppend(int internal)
// it has been called.
this->UpdateInformation();
}
this->GetOutput()->SetUpdateExtent(this->GetOutput()->GetWholeExtent());
vtkStreamingDemandDrivenPipeline::SetUpdateExtent(
this->GetOutputInformation(0),
vtkStreamingDemandDrivenPipeline::GetWholeExtent(this->GetOutputInformation(0)));
vtkDebugMacro(<< "Initializing data");
this->AllocateOutputData(this->GetOutput());
......
......@@ -688,7 +688,7 @@ int vtkLegendBoxActor::RenderOpaqueGeometry(vtkViewport *viewport)
if ( this->Symbol[i] ) //if there is a symbol
{
symbolExists = true;
this->Symbol[i]->Update();
//this->Symbol[i]->Update();
bounds = this->Symbol[i]->GetBounds();
if ( (bounds[3]-bounds[2]) == 0.0 )
{
......
......@@ -758,7 +758,7 @@ int vtkMNITransformReader::ReadGridTransform(
}
// Read the minc file now, rather than later
reader->GetOutput()->Update();
reader->Update();
// Create the transform
vtkGridTransform *transform = vtkGridTransform::New();
......
......@@ -327,7 +327,7 @@ int vtkPieChartActor::BuildPlot(vtkViewport *viewport)
}
// Check modified time to see whether we have to rebuild.
this->Input->Update();
//this->Input->Update();
if (positionsHaveChanged ||
this->GetMTime() > this->BuildTime ||
......
......@@ -1225,7 +1225,7 @@ void vtkRIBExporter::WriteTexture (vtkTexture *aTexture)
vtkErrorMacro(<< "texture has no input!\n");
return;
}
aTexture->GetInput()->Update();
aTexture->Update();
size = aTexture->GetInput()->GetDimensions();
scalars = aTexture->GetInput()->GetPointData()->GetScalars();
......@@ -1296,11 +1296,8 @@ void vtkRIBExporter::WriteTexture (vtkTexture *aTexture)
vtkStructuredPoints *anImage = vtkStructuredPoints::New();
anImage->SetDimensions (xsize, ysize, 1);
anImage->SetUpdateExtent(0,xsize-1,0,ysize-1, 0, 0);
anImage->SetScalarType(mappedScalars->GetDataType());
anImage->GetPointData()->SetScalars (mappedScalars);
int bpp = mappedScalars->GetNumberOfComponents();
anImage->SetNumberOfScalarComponents (bpp);
// renderman and bmrt seem to require r,g,b and alpha in all their
// texture maps. So if our tmap doesn't have the right components
......
......@@ -201,7 +201,8 @@ void vtkRenderLargeImage::RequestData(
}
// Get the requested extents.
this->GetOutput()->GetUpdateExtent(inExtent);
outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_EXTENT(),
inExtent);
// get and transform the increments
data->GetIncrements(inIncr);
......
......@@ -342,7 +342,7 @@ int vtkSpiderPlotActor::BuildPlot(vtkViewport *viewport)
}
// Check modified time to see whether we have to rebuild.
this->Input->Update();
//this->Input->Update();
if (positionsHaveChanged ||
this->GetMTime() > this->BuildTime ||
......
......@@ -325,8 +325,7 @@ void vtkStructuredGridLIC2D::AllocateOutputData(vtkDataObject *output,
vtkWarningMacro( "Not enough output ports." );
return;
}
out2->SetNumberOfScalarComponents(3);
out2->AllocateScalars();
out2->AllocateScalars(VTK_FLOAT, 3);
}
}
}
......
......@@ -739,7 +739,7 @@ void vtkX3DExporter::WriteATexture(vtkActor *anActor,
vtkErrorMacro(<< "texture has no input!\n");
return;
}
aTexture->GetInput()->Update();
aTexture->Update();
size = aTexture->GetInput()->GetDimensions();
scalars = aTexture->GetInput()->GetPointData()->GetScalars();
......
......@@ -573,7 +573,7 @@ int vtkXYPlotActor::RenderOpaqueGeometry(vtkViewport *viewport)
for (mtime=0, this->InputList->InitTraversal(dsit);
(ds = this->InputList->GetNextDataSet(dsit)); )
{
ds->Update();
//ds->Update();
dsMtime = ds->GetMTime();
if ( dsMtime > mtime )
{
......@@ -588,7 +588,7 @@ int vtkXYPlotActor::RenderOpaqueGeometry(vtkViewport *viewport)
for (mtime=0, this->DataObjectInputList->InitTraversal(doit);
(dobj = this->DataObjectInputList->GetNextDataObject(doit)); )
{
dobj->Update();
//dobj->Update();
dsMtime = dobj->GetMTime();
if ( dsMtime > mtime )
{
......@@ -2262,7 +2262,7 @@ void vtkXYPlotActor::GenerateClipPlanes(int *pos, int *pos2)
double vtkXYPlotActor::ComputeGlyphScale(int i, int *pos, int *pos2)
{
vtkPolyData *pd=this->LegendActor->GetEntrySymbol(i);
pd->Update();
//pd->Update();
double length=pd->GetLength();
double sf = this->GlyphSize * sqrt((double)(pos[0]-pos2[0])*(pos[0]-pos2[0]) +
(pos[1]-pos2[1])*(pos[1]-pos2[1])) / length;
......
......@@ -62,7 +62,7 @@ int TestMetaIO(int argc, char *argv[])
readerNew->Update();
double error = 0;
int * ext = readerStd->GetOutput()->GetWholeExtent();
int * ext = readerStd->GetOutput()->GetExtent();
for(int z=ext[4]; z<=ext[5]; z+=2)
{
for(int y=ext[2]; y<=ext[3]; y++)
......