Commit 8afdf2b2 authored by Berk Geveci's avatar Berk Geveci

ENH: Deprecated vtkTemplateMacroN(). vtkTemplateMacro() should be used instead

parent 77bef1af
......@@ -43,7 +43,7 @@
# endif
#endif
vtkCxxRevisionMacro(vtkDataArray, "1.68");
vtkCxxRevisionMacro(vtkDataArray, "1.69");
//----------------------------------------------------------------------------
// Construct object with default tuple dimension (number of components) of 1.
......@@ -94,8 +94,11 @@ void vtkDeepCopySwitchOnOutput(IT *input, vtkDataArray *da,
switch (da->GetDataType())
{
vtkTemplateMacro4(vtkDeepCopyArrayOfDifferentType,input,(VTK_TT*)output,
numTuples,nComp);
vtkTemplateMacro(
vtkDeepCopyArrayOfDifferentType (input,
(VTK_TT*)output,
numTuples,
nComp) );
default:
vtkGenericWarningMacro("Unsupported data type " << da->GetDataType()
......@@ -124,8 +127,11 @@ void vtkDataArray::DeepCopy(vtkDataArray *da)
switch (da->GetDataType())
{
vtkTemplateMacro4(vtkDeepCopySwitchOnOutput,(VTK_TT*)input,
this,numTuples,this->NumberOfComponents);
vtkTemplateMacro(
vtkDeepCopySwitchOnOutput((VTK_TT*)input,
this,
numTuples,
this->NumberOfComponents));
case VTK_BIT:
{//bit not supported, using generic double API
......@@ -679,9 +685,9 @@ void vtkCopyTuples1(IT* input, vtkDataArray* output, vtkIdList* ptIds)
{
switch (output->GetDataType())
{
vtkTemplateMacro4(vtkCopyTuples, input,
(VTK_TT *)output->GetVoidPointer(0),
output->GetNumberOfComponents(), ptIds );
vtkTemplateMacro(vtkCopyTuples(input,
(VTK_TT *)output->GetVoidPointer(0),
output->GetNumberOfComponents(), ptIds) );
default:
vtkGenericWarningMacro("Sanity check failed: Unsupported data type "
......@@ -702,8 +708,8 @@ void vtkDataArray::GetTuples(vtkIdList *ptIds, vtkDataArray *da)
switch (this->GetDataType())
{
vtkTemplateMacro3(vtkCopyTuples1, (VTK_TT *)this->GetVoidPointer(0), da,
ptIds );
vtkTemplateMacro(vtkCopyTuples1 ((VTK_TT *)this->GetVoidPointer(0), da,
ptIds ));
// This is not supported by the template macro.
// Switch to using the double interface.
case VTK_BIT:
......@@ -745,9 +751,9 @@ void vtkCopyTuples1(IT* input, vtkDataArray* output,
{
switch (output->GetDataType())
{
vtkTemplateMacro5(vtkCopyTuples, input,
(VTK_TT *)output->GetVoidPointer(0),
output->GetNumberOfComponents(), p1, p2 );
vtkTemplateMacro(vtkCopyTuples( input,
(VTK_TT *)output->GetVoidPointer(0),
output->GetNumberOfComponents(), p1, p2) );
default:
vtkGenericWarningMacro("Sanity check failed: Unsupported data type "
......@@ -769,8 +775,8 @@ void vtkDataArray::GetTuples(vtkIdType p1, vtkIdType p2, vtkDataArray *da)
switch (this->GetDataType())
{
vtkTemplateMacro4(vtkCopyTuples1, (VTK_TT *)this->GetVoidPointer(0), da,
p1, p2 );
vtkTemplateMacro(vtkCopyTuples1( (VTK_TT *)this->GetVoidPointer(0), da,
p1, p2 ) );
// This is not supported by the template macro.
// Switch to using the double interface.
case VTK_BIT:
......
......@@ -683,24 +683,25 @@ virtual double *Get##name() \
#endif
// Legacy versions of vtkTemplateMacro:
#define vtkTemplateMacro3(func, a1, a2, a3) \
vtkTemplateMacro(func (a1, a2, a3))
#define vtkTemplateMacro4(func, a1, a2, a3, a4) \
vtkTemplateMacro(func (a1, a2, a3, a4))
#define vtkTemplateMacro5(func, a1, a2, a3, a4, a5) \
vtkTemplateMacro(func (a1, a2, a3, a4, a5))
#define vtkTemplateMacro6(func, a1, a2, a3, a4, a5, a6) \
vtkTemplateMacro(func (a1, a2, a3, a4, a5, a6))
#define vtkTemplateMacro7(func, a1, a2, a3, a4, a5, a6, a7) \
vtkTemplateMacro(func (a1, a2, a3, a4, a5, a6, a7))
#define vtkTemplateMacro8(func, a1, a2, a3, a4, a5, a6, a7, a8) \
vtkTemplateMacro(func (a1, a2, a3, a4, a5, a6, a7, a8))
#define vtkTemplateMacro9(func, a1, a2, a3, a4, a5, a6, a7, a8, a9) \
vtkTemplateMacro(func (a1, a2, a3, a4, a5, a6, a7, a8, a9))
#define vtkTemplateMacro10(func,a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) \
vtkTemplateMacro(func(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10))
#define vtkTemplateMacro11(func,a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) \
vtkTemplateMacro(func(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11))
#if !defined(VTK_LEGACY_REMOVE)
# define vtkTemplateMacro3(func, a1, a2, a3) \
vtkTemplateMacro(func (a1, a2, a3))
# define vtkTemplateMacro4(func, a1, a2, a3, a4) \
vtkTemplateMacro(func (a1, a2, a3, a4))
# define vtkTemplateMacro5(func, a1, a2, a3, a4, a5) \
vtkTemplateMacro(func (a1, a2, a3, a4, a5))
# define vtkTemplateMacro6(func, a1, a2, a3, a4, a5, a6) \
vtkTemplateMacro(func (a1, a2, a3, a4, a5, a6))
# define vtkTemplateMacro7(func, a1, a2, a3, a4, a5, a6, a7) \
vtkTemplateMacro(func (a1, a2, a3, a4, a5, a6, a7))
# define vtkTemplateMacro8(func, a1, a2, a3, a4, a5, a6, a7, a8) \
vtkTemplateMacro(func (a1, a2, a3, a4, a5, a6, a7, a8))
# define vtkTemplateMacro9(func, a1, a2, a3, a4, a5, a6, a7, a8, a9) \
vtkTemplateMacro(func (a1, a2, a3, a4, a5, a6, a7, a8, a9))
# define vtkTemplateMacro10(func,a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) \
vtkTemplateMacro(func(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10))
// These are legacy macros, do not add anymore. Use vtkTemplateMacro instead
#endif
// Old-style legacy code marker macro.
#if !defined(VTK_LEGACY_REMOVE) && !defined(VTK_LEAN_AND_MEAN)
......
......@@ -32,7 +32,7 @@
#include "vtkVoxel.h"
#include "vtkInformationVector.h"
vtkCxxRevisionMacro(vtkImageData, "1.14");
vtkCxxRevisionMacro(vtkImageData, "1.15");
vtkStandardNewMacro(vtkImageData);
//----------------------------------------------------------------------------
......@@ -1621,8 +1621,12 @@ void vtkImageDataCastExecute(vtkImageData *inData, T *inPtr,
switch (outData->GetScalarType())
{
vtkTemplateMacro5(vtkImageDataCastExecute, inData, (T *)(inPtr),
outData, (VTK_TT *)(outPtr),outExt);
vtkTemplateMacro(
vtkImageDataCastExecute(inData,
(T *)(inPtr),
outData,
(VTK_TT *)(outPtr),
outExt) );
default:
vtkGenericWarningMacro("Execute: Unknown output ScalarType");
return;
......@@ -1649,8 +1653,8 @@ void vtkImageData::CopyAndCastFrom(vtkImageData *inData, int extent[6])
switch (inData->GetScalarType())
{
vtkTemplateMacro4(vtkImageDataCastExecute,inData, (VTK_TT *)(inPtr),
this, extent);
vtkTemplateMacro(vtkImageDataCastExecute(inData, (VTK_TT *)(inPtr),
this, extent) );
default:
vtkErrorMacro(<< "Execute: Unknown input ScalarType");
return;
......
......@@ -22,7 +22,7 @@
#include "vtkStructuredGrid.h"
#include "vtkUnsignedCharArray.h"
vtkCxxRevisionMacro(vtkBlankStructuredGrid, "1.12");
vtkCxxRevisionMacro(vtkBlankStructuredGrid, "1.13");
vtkStandardNewMacro(vtkBlankStructuredGrid);
// Construct object to extract all of the input data.
......@@ -128,9 +128,11 @@ int vtkBlankStructuredGrid::RequestData(
// call templated function
switch (dataArray->GetDataType())
{
vtkTemplateMacro8(vtkBlankStructuredGridExecute, this, (VTK_TT *)(dptr), numPts,
numComp, this->Component, this->MinBlankingValue,
this->MaxBlankingValue, blanking);
vtkTemplateMacro(
vtkBlankStructuredGridExecute(this, (VTK_TT *)(dptr), numPts,
numComp, this->Component,
this->MinBlankingValue,
this->MaxBlankingValue, blanking));
default:
break;
}
......
......@@ -31,7 +31,7 @@
#include <math.h>
vtkCxxRevisionMacro(vtkContourGrid, "1.31");
vtkCxxRevisionMacro(vtkContourGrid, "1.32");
vtkStandardNewMacro(vtkContourGrid);
// Construct object with initial range (0,1) and single contour value
......@@ -363,10 +363,11 @@ int vtkContourGrid::RequestData(
switch (inScalars->GetDataType())
{
vtkTemplateMacro10(vtkContourGridExecute, this, input, output, inScalars,
(VTK_TT *)(scalarArrayPtr), numContours, values,
computeScalars, useScalarTree,
scalarTree);
vtkTemplateMacro(
vtkContourGridExecute( this, input, output, inScalars,
(VTK_TT *)(scalarArrayPtr), numContours, values,
computeScalars, useScalarTree,
scalarTree));
default:
vtkErrorMacro(<< "Execute: Unknown ScalarType");
return 1;
......
......@@ -24,7 +24,7 @@
#include "vtkObjectFactory.h"
#include "vtkPointData.h"
vtkCxxRevisionMacro(vtkExtractVectorComponents, "1.50");
vtkCxxRevisionMacro(vtkExtractVectorComponents, "1.51");
vtkStandardNewMacro(vtkExtractVectorComponents);
vtkExtractVectorComponents::vtkExtractVectorComponents()
......@@ -222,11 +222,12 @@ int vtkExtractVectorComponents::RequestData(
switch (vectors->GetDataType())
{
vtkTemplateMacro5(vtkExtractComponents, numVectors,
(VTK_TT *)vectors->GetVoidPointer(0),
(VTK_TT *)vx->GetVoidPointer(0),
(VTK_TT *)vy->GetVoidPointer(0),
(VTK_TT *)vz->GetVoidPointer(0));
vtkTemplateMacro(
vtkExtractComponents(numVectors,
(VTK_TT *)vectors->GetVoidPointer(0),
(VTK_TT *)vx->GetVoidPointer(0),
(VTK_TT *)vy->GetVoidPointer(0),
(VTK_TT *)vz->GetVoidPointer(0)));
}
outVx->PassData(pd);
......@@ -270,11 +271,12 @@ int vtkExtractVectorComponents::RequestData(
switch (vectorsc->GetDataType())
{
vtkTemplateMacro5(vtkExtractComponents, numVectorsc,
(VTK_TT *)vectorsc->GetVoidPointer(0),
(VTK_TT *)vxc->GetVoidPointer(0),
(VTK_TT *)vyc->GetVoidPointer(0),
(VTK_TT *)vzc->GetVoidPointer(0));
vtkTemplateMacro(
vtkExtractComponents( numVectorsc,
(VTK_TT *)vectorsc->GetVoidPointer(0),
(VTK_TT *)vxc->GetVoidPointer(0),
(VTK_TT *)vyc->GetVoidPointer(0),
(VTK_TT *)vzc->GetVoidPointer(0)));
}
outVxc->PassData(cd);
......
......@@ -40,7 +40,7 @@
#include <math.h>
vtkCxxRevisionMacro(vtkGridSynchronizedTemplates3D, "1.5");
vtkCxxRevisionMacro(vtkGridSynchronizedTemplates3D, "1.6");
vtkStandardNewMacro(vtkGridSynchronizedTemplates3D);
//----------------------------------------------------------------------------
......@@ -742,8 +742,8 @@ void ContourGrid(vtkGridSynchronizedTemplates3D *self,
{
switch(input->GetPoints()->GetData()->GetDataType())
{
vtkTemplateMacro7(ContourGrid, self, exExt, scalars,
input, output, (VTK_TT*)0, inScalars);
vtkTemplateMacro(
ContourGrid(self, exExt, scalars, input, output, (VTK_TT*)0, inScalars));
}
}
......@@ -787,8 +787,8 @@ void vtkGridSynchronizedTemplates3D::ThreadedExecute(int *exExt, int ,
void *scalars = inScalars->GetVoidPointer(0);
switch (inScalars->GetDataType())
{
vtkTemplateMacro6(ContourGrid, this, exExt, (VTK_TT *)scalars,
input, output, inScalars);
vtkTemplateMacro(
ContourGrid(this, exExt, (VTK_TT *)scalars, input, output, inScalars));
}//switch
}
else //multiple components - have to convert
......
......@@ -23,7 +23,7 @@
#include "vtkObjectFactory.h"
#include "vtkPointData.h"
vtkCxxRevisionMacro(vtkMergeFields, "1.18");
vtkCxxRevisionMacro(vtkMergeFields, "1.19");
vtkStandardNewMacro(vtkMergeFields);
char vtkMergeFields::FieldLocationNames[3][12]
......@@ -323,10 +323,12 @@ int vtkMergeFields::MergeArray(vtkDataArray* in, vtkDataArray* out,
{
switch (out->GetDataType())
{
vtkTemplateMacro7(vtkMergeFieldsCopyTuples, (VTK_TT *)in->GetVoidPointer(0),
(VTK_TT *)out->GetVoidPointer(0), numTuples,
in->GetNumberOfComponents(),
out->GetNumberOfComponents(), inComp, outComp );
vtkTemplateMacro(
vtkMergeFieldsCopyTuples((VTK_TT *)in->GetVoidPointer(0),
(VTK_TT *)out->GetVoidPointer(0), numTuples,
in->GetNumberOfComponents(),
out->GetNumberOfComponents(),
inComp, outComp ));
// This is not supported by the template macro.
// Switch to using the float interface.
case VTK_BIT:
......
......@@ -40,7 +40,7 @@
#include <math.h>
vtkCxxRevisionMacro(vtkRectilinearSynchronizedTemplates, "1.3");
vtkCxxRevisionMacro(vtkRectilinearSynchronizedTemplates, "1.4");
vtkStandardNewMacro(vtkRectilinearSynchronizedTemplates);
//----------------------------------------------------------------------------
......@@ -696,8 +696,9 @@ int vtkRectilinearSynchronizedTemplates::RequestData(
ptr = this->GetScalarsForExtent(inScalars, this->ExecuteExtent, data);
switch (inScalars->GetDataType())
{
vtkTemplateMacro6(ContourRectilinearGrid, this, this->ExecuteExtent, data,
output, (VTK_TT *)ptr, inScalars);
vtkTemplateMacro(
ContourRectilinearGrid(this, this->ExecuteExtent, data,
output, (VTK_TT *)ptr, inScalars));
}
return 1;
......
......@@ -22,7 +22,7 @@
#include "vtkPointData.h"
#include "vtkPolyData.h"
vtkCxxRevisionMacro(vtkShrinkPolyData, "1.68");
vtkCxxRevisionMacro(vtkShrinkPolyData, "1.69");
vtkStandardNewMacro(vtkShrinkPolyData);
vtkShrinkPolyData::vtkShrinkPolyData(double sf)
......@@ -298,9 +298,10 @@ int vtkShrinkPolyData::RequestData(
// call templated function
switch (input->GetPoints()->GetDataType())
{
vtkTemplateMacro5(vtkShrinkPolyDataExecute, this,
(VTK_TT *)(inPtr), this->ShrinkFactor,
inInfo, outInfo);
vtkTemplateMacro(
vtkShrinkPolyDataExecute(this,
(VTK_TT *)(inPtr), this->ShrinkFactor,
inInfo, outInfo));
default:
break;
}
......
......@@ -22,7 +22,7 @@
#include "vtkObjectFactory.h"
#include "vtkPointData.h"
vtkCxxRevisionMacro(vtkSplitField, "1.17");
vtkCxxRevisionMacro(vtkSplitField, "1.18");
vtkStandardNewMacro(vtkSplitField);
char vtkSplitField::FieldLocationNames[3][12]
......@@ -296,9 +296,12 @@ vtkDataArray* vtkSplitField::SplitArray(vtkDataArray* da, int component)
{
switch (output->GetDataType())
{
vtkTemplateMacro5(vtkSplitFieldCopyTuples, (VTK_TT *)da->GetVoidPointer(0),
(VTK_TT *)output->GetVoidPointer(0), numTuples,
da->GetNumberOfComponents(), component );
vtkTemplateMacro(
vtkSplitFieldCopyTuples((VTK_TT *)da->GetVoidPointer(0),
(VTK_TT *)output->GetVoidPointer(0),
numTuples,
da->GetNumberOfComponents(),
component));
// This is not supported by the template macro.
// Switch to using the float interface.
case VTK_BIT:
......
......@@ -36,7 +36,7 @@
#include <math.h>
vtkCxxRevisionMacro(vtkSynchronizedTemplates2D, "1.6");
vtkCxxRevisionMacro(vtkSynchronizedTemplates2D, "1.7");
vtkStandardNewMacro(vtkSynchronizedTemplates2D);
//----------------------------------------------------------------------------
......@@ -476,8 +476,9 @@ int vtkSynchronizedTemplates2D::RequestData(
}
switch (inScalars->GetDataType())
{
vtkTemplateMacro7(vtkContourImage,this,(VTK_TT *)scalars, newPts,
newScalars, newLines, input, ext);
vtkTemplateMacro(
vtkContourImage(this,(VTK_TT *)scalars, newPts,
newScalars, newLines, input, ext));
}//switch
// Lets set the name of the scalars here.
......
......@@ -38,7 +38,7 @@
#include <math.h>
vtkCxxRevisionMacro(vtkSynchronizedTemplates3D, "1.8");
vtkCxxRevisionMacro(vtkSynchronizedTemplates3D, "1.9");
vtkStandardNewMacro(vtkSynchronizedTemplates3D);
//----------------------------------------------------------------------------
......@@ -700,8 +700,9 @@ void vtkSynchronizedTemplates3D::ThreadedExecute(vtkImageData *data,
ptr = data->GetArrayPointerForExtent(inScalars, exExt);
switch (inScalars->GetDataType())
{
vtkTemplateMacro7(ContourImage, this, exExt, inInfo, data, output,
(VTK_TT *)ptr, inScalars);
vtkTemplateMacro(
ContourImage(this, exExt, inInfo, data, output,
(VTK_TT *)ptr, inScalars));
}
}
......
......@@ -22,7 +22,7 @@
#include "vtkPointSet.h"
#include "vtkPoints.h"
vtkCxxRevisionMacro(vtkWarpVector, "1.46");
vtkCxxRevisionMacro(vtkWarpVector, "1.47");
vtkStandardNewMacro(vtkWarpVector);
vtkWarpVector::vtkWarpVector()
......@@ -79,8 +79,9 @@ void vtkWarpVectorExecute(vtkWarpVector *self,
// call templated function
switch (vectors->GetDataType())
{
vtkTemplateMacro5(vtkWarpVectorExecute2,self, inPts, outPts,
(VTK_TT *)(inVec), max);
vtkTemplateMacro(
vtkWarpVectorExecute2(self, inPts, outPts,
(VTK_TT *)(inVec), max));
default:
break;
}
......@@ -137,8 +138,9 @@ int vtkWarpVector::RequestData(
// call templated function
switch (input->GetPoints()->GetDataType())
{
vtkTemplateMacro5(vtkWarpVectorExecute, this, (VTK_TT *)(inPtr),
(VTK_TT *)(outPtr), numPts, vectors);
vtkTemplateMacro(
vtkWarpVectorExecute( this, (VTK_TT *)(inPtr),
(VTK_TT *)(outPtr), numPts, vectors) );
default:
break;
}
......
......@@ -20,7 +20,7 @@
#include "math.h"
vtkCxxRevisionMacro(vtkGridTransform, "1.29");
vtkCxxRevisionMacro(vtkGridTransform, "1.30");
vtkStandardNewMacro(vtkGridTransform);
vtkCxxSetObjectMacro(vtkGridTransform,DisplacementGrid,vtkImageData);
......@@ -127,7 +127,8 @@ inline void vtkNearestNeighborInterpolation(double point[3],
switch (gridType)
{
vtkTemplateMacro(vtkNearestHelper(displacement, static_cast<VTK_TT*>(gridPtr), increment));
vtkTemplateMacro(
vtkNearestHelper(displacement, static_cast<VTK_TT*>(gridPtr), increment));
}
}
......@@ -243,7 +244,8 @@ void vtkNearestNeighborInterpolation(double point[3], double displacement[3],
// do nearest-neighbor interpolation
switch (gridType)
{
vtkTemplateMacro(vtkNearestHelper(displacement, derivatives, static_cast<VTK_TT*>(gridPtr),
vtkTemplateMacro(
vtkNearestHelper(displacement, derivatives, static_cast<VTK_TT*>(gridPtr),
gridId, gridId0, gridId1, gridInc));
}
}
......
......@@ -39,7 +39,7 @@
#include <math.h>
vtkCxxRevisionMacro(vtkImplicitModeller, "1.97");
vtkCxxRevisionMacro(vtkImplicitModeller, "1.98");
vtkStandardNewMacro(vtkImplicitModeller);
struct vtkImplicitModellerAppendInfo
......@@ -466,10 +466,12 @@ static VTK_THREAD_RETURN_TYPE vtkImplicitModeller_ThreadedAppend( void *arg )
switch (userData->Modeller->GetOutputScalarType())
{
vtkTemplateMacro8(vtkImplicitModellerAppendExecute, userData->Modeller,
userData->Input[threadId], output, outExt,
userData->MaximumDistance, locator, threadId,
static_cast<VTK_TT *>(0));
vtkTemplateMacro(
vtkImplicitModellerAppendExecute(
userData->Modeller,
userData->Input[threadId], output, outExt,
userData->MaximumDistance, locator, threadId,
static_cast<VTK_TT *>(0)));
default:
vtkGenericWarningMacro("Execute: Unknown output ScalarType");
return VTK_THREAD_RETURN_VALUE;
......@@ -623,8 +625,12 @@ void vtkImplicitModeller::Append(vtkDataSet *input)
switch (this->OutputScalarType)
{
vtkTemplateMacro5(vtkImplicitModellerAppendExecute, this,
input, output, this->InternalMaxDistance, static_cast<VTK_TT *>(0));
vtkTemplateMacro(
vtkImplicitModellerAppendExecute( this,
input,
output,
this->InternalMaxDistance,
static_cast<VTK_TT *>(0)));
}
}
else
......
......@@ -23,7 +23,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkTransform.h"
vtkCxxRevisionMacro(vtkImageReader, "1.120");
vtkCxxRevisionMacro(vtkImageReader, "1.121");
vtkStandardNewMacro(vtkImageReader);
vtkCxxSetObjectMacro(vtkImageReader,Transform,vtkTransform);
......@@ -408,8 +408,8 @@ void vtkImageReaderUpdate1(vtkImageReader *self, vtkImageData *data, T *inPtr)
outPtr = data->GetScalarPointer();
switch (data->GetScalarType())
{
vtkTemplateMacro4(vtkImageReaderUpdate2, self, data, inPtr,
(VTK_TT *)(outPtr));
vtkTemplateMacro(vtkImageReaderUpdate2(self, data, inPtr,
(VTK_TT *)(outPtr)));
default:
vtkGenericWarningMacro("Update1: Unknown data type\n");
}
......@@ -445,7 +445,7 @@ void vtkImageReader::ExecuteData(vtkDataObject *output)
// Call the correct templated function for the output
switch (this->GetDataScalarType())
{
vtkTemplateMacro3(vtkImageReaderUpdate1, this, data, (VTK_TT *)(ptr));
vtkTemplateMacro(vtkImageReaderUpdate1(this, data, (VTK_TT *)(ptr)));
default:
vtkErrorMacro(<< "UpdateFromFile: Unknown data type");
}
......
......@@ -24,7 +24,7 @@
#include <sys/stat.h>
vtkCxxRevisionMacro(vtkImageReader2, "1.37");
vtkCxxRevisionMacro(vtkImageReader2, "1.38");
vtkStandardNewMacro(vtkImageReader2);
#ifdef read
......@@ -715,7 +715,7 @@ void vtkImageReader2::ExecuteData(vtkDataObject *output)
ptr = data->GetScalarPointer();
switch (this->GetDataScalarType())
{
vtkTemplateMacro3(vtkImageReader2Update, this, data, (VTK_TT *)(ptr));
vtkTemplateMacro(vtkImageReader2Update(this, data, (VTK_TT *)(ptr)));
default:
vtkErrorMacro(<< "UpdateFromFile: Unknown data type");
}
......
......@@ -30,7 +30,7 @@ extern "C" {
}
vtkCxxRevisionMacro(vtkJPEGReader, "1.23");
vtkCxxRevisionMacro(vtkJPEGReader, "1.24");
vtkStandardNewMacro(vtkJPEGReader);
......@@ -283,7 +283,7 @@ void vtkJPEGReader::ExecuteData(vtkDataObject *output)
outPtr = data->GetScalarPointer();
switch (data->GetScalarType())
{
vtkTemplateMacro3(vtkJPEGReaderUpdate, this, data, (VTK_TT *)(outPtr));
vtkTemplateMacro(vtkJPEGReaderUpdate(this, data, (VTK_TT *)(outPtr)));
default:
vtkErrorMacro(<< "UpdateFromFile: Unknown data type");
}
......
......@@ -19,7 +19,7 @@
#include "vtkPointData.h"
#include "vtk_png.h"
vtkCxxRevisionMacro(vtkPNGReader, "1.24");
vtkCxxRevisionMacro(vtkPNGReader, "1.25");
vtkStandardNewMacro(vtkPNGReader);
#ifdef _MSC_VER
......@@ -323,7 +323,7 @@ void vtkPNGReader::ExecuteData(vtkDataObject *output)
outPtr = data->GetScalarPointer();
switch (data->GetScalarType())
{
vtkTemplateMacro3(vtkPNGReaderUpdate, this, data, (VTK_TT *)(outPtr));
vtkTemplateMacro(vtkPNGReaderUpdate(this, data, (VTK_TT *)(outPtr)));
default:
vtkErrorMacro(<< "UpdateFromFile: Unknown data type");