Commit 79e45098 authored by Ken Martin's avatar Ken Martin

BUG: fix compile warning

parent 6f4a6f3d
......@@ -24,7 +24,7 @@
#include "vtkPointData.h"
#include "vtkStreamingDemandDrivenPipeline.h"
vtkCxxRevisionMacro(vtkImageAlgorithm, "1.2");
vtkCxxRevisionMacro(vtkImageAlgorithm, "1.3");
//----------------------------------------------------------------------------
vtkImageAlgorithm::vtkImageAlgorithm()
......@@ -148,7 +148,7 @@ int vtkImageAlgorithm::ProcessRequest(vtkInformation* request,
// propagate update extent
if(request->Has(vtkStreamingDemandDrivenPipeline::REQUEST_UPDATE_EXTENT()))
{
this->ComputeInputUpdateExtent(request, inputVector, outputVector);
this->RequestUpdateExtent(request, inputVector, outputVector);
return 1;
}
......@@ -177,7 +177,7 @@ void vtkImageAlgorithm::ExecuteInformation(
// do nothing let subclasses handle it
}
void vtkImageAlgorithm::ComputeInputUpdateExtent(
void vtkImageAlgorithm::RequestUpdateExtent(
vtkInformation * vtkNotUsed(request),
vtkInformationVector * vtkNotUsed(inputVector),
vtkInformationVector * vtkNotUsed(outputVector))
......
......@@ -64,9 +64,9 @@ protected:
virtual void ExecuteInformation(vtkInformation *request,
vtkInformationVector *inputVector,
vtkInformationVector *outputVector);
virtual void ComputeInputUpdateExtent(vtkInformation *,
vtkInformationVector *,
vtkInformationVector *);
virtual void RequestUpdateExtent(vtkInformation *,
vtkInformationVector *,
vtkInformationVector *);
// This is called by the superclass.
// This is the method you should override.
......
......@@ -22,7 +22,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkPointData.h"
vtkCxxRevisionMacro(vtkExtractVOI, "1.38");
vtkCxxRevisionMacro(vtkExtractVOI, "1.39");
vtkStandardNewMacro(vtkExtractVOI);
//-----------------------------------------------------------------------------
......@@ -37,7 +37,7 @@ vtkExtractVOI::vtkExtractVOI()
//-----------------------------------------------------------------------------
// Get ALL of the input.
void vtkExtractVOI::ComputeInputUpdateExtent (
void vtkExtractVOI::RequestUpdateExtent (
vtkInformation * vtkNotUsed(request),
vtkInformationVector *inputVector,
vtkInformationVector *vtkNotUsed( outputVector ))
......
......@@ -67,9 +67,9 @@ protected:
vtkExtractVOI();
~vtkExtractVOI() {};
virtual void ComputeInputUpdateExtent (vtkInformation *,
vtkInformationVector *,
vtkInformationVector *);
virtual void RequestUpdateExtent (vtkInformation *,
vtkInformationVector *,
vtkInformationVector *);
void ExecuteInformation (vtkInformation *,
vtkInformationVector *,
vtkInformationVector *);
......
......@@ -22,7 +22,7 @@
#include <math.h>
vtkCxxRevisionMacro(vtkImageDivergence, "1.28");
vtkCxxRevisionMacro(vtkImageDivergence, "1.29");
vtkStandardNewMacro(vtkImageDivergence);
vtkImageDivergence::vtkImageDivergence()
......@@ -45,7 +45,7 @@ void vtkImageDivergence::ExecuteInformation(
//----------------------------------------------------------------------------
// Just clip the request. The subclass may need to overwrite this method.
void vtkImageDivergence::ComputeInputUpdateExtent (
void vtkImageDivergence::RequestUpdateExtent (
vtkInformation * vtkNotUsed(request),
vtkInformationVector *inputVector,
vtkInformationVector *outputVector)
......
......@@ -36,8 +36,8 @@ protected:
vtkImageDivergence();
~vtkImageDivergence() {};
void ComputeInputUpdateExtent (vtkInformation *, vtkInformationVector *,
vtkInformationVector *);
void RequestUpdateExtent (vtkInformation *, vtkInformationVector *,
vtkInformationVector *);
void ExecuteInformation (vtkInformation *, vtkInformationVector *,
vtkInformationVector *);
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
......
......@@ -24,7 +24,7 @@
#include <math.h>
vtkCxxRevisionMacro(vtkImageGradient, "1.44");
vtkCxxRevisionMacro(vtkImageGradient, "1.45");
vtkStandardNewMacro(vtkImageGradient);
//----------------------------------------------------------------------------
......@@ -92,7 +92,7 @@ void vtkImageGradient::ExecuteInformation (
//----------------------------------------------------------------------------
// This method computes the input extent necessary to generate the output.
void vtkImageGradient::ComputeInputUpdateExtent (
void vtkImageGradient::RequestUpdateExtent (
vtkInformation * vtkNotUsed(request),
vtkInformationVector *inputVector,
vtkInformationVector *outputVector)
......
......@@ -64,7 +64,8 @@ protected:
int Dimensionality;
void ExecuteInformation (vtkInformation *, vtkInformationVector *, vtkInformationVector *);
void ComputeInputUpdateExtent (vtkInformation *, vtkInformationVector *, vtkInformationVector *);
void RequestUpdateExtent (vtkInformation *,
vtkInformationVector *, vtkInformationVector *);
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
int extent[6], int id);
......
......@@ -24,7 +24,7 @@
#include <math.h>
vtkCxxRevisionMacro(vtkImageGradientMagnitude, "1.37");
vtkCxxRevisionMacro(vtkImageGradientMagnitude, "1.38");
vtkStandardNewMacro(vtkImageGradientMagnitude);
//----------------------------------------------------------------------------
......@@ -89,7 +89,7 @@ void vtkImageGradientMagnitude::ExecuteInformation (
//----------------------------------------------------------------------------
// This method computes the input extent necessary to generate the output.
void vtkImageGradientMagnitude::ComputeInputUpdateExtent (
void vtkImageGradientMagnitude::RequestUpdateExtent (
vtkInformation * vtkNotUsed(request),
vtkInformationVector *inputVector,
vtkInformationVector *outputVector)
......
......@@ -63,7 +63,7 @@ protected:
int Dimensionality;
void ExecuteInformation (vtkInformation *, vtkInformationVector *, vtkInformationVector *);
void ComputeInputUpdateExtent (vtkInformation *, vtkInformationVector *, vtkInformationVector *);
void RequestUpdateExtent (vtkInformation *, vtkInformationVector *, vtkInformationVector *);
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
int extent[6], int id);
......
......@@ -20,7 +20,7 @@
#include "vtkObjectFactory.h"
#include "vtkStreamingDemandDrivenPipeline.h"
vtkCxxRevisionMacro(vtkImagePadFilter, "1.29");
vtkCxxRevisionMacro(vtkImagePadFilter, "1.30");
vtkStandardNewMacro(vtkImagePadFilter);
//----------------------------------------------------------------------------
......@@ -147,7 +147,7 @@ void vtkImagePadFilter::ComputeInputUpdateExtent (int inExt[6],
//----------------------------------------------------------------------------
// Just clip the request. The subclass may need to overwrite this method.
void vtkImagePadFilter::ComputeInputUpdateExtent (
void vtkImagePadFilter::RequestUpdateExtent (
vtkInformation * vtkNotUsed(request),
vtkInformationVector *inputVector,
vtkInformationVector *outputVector)
......
......@@ -54,8 +54,8 @@ protected:
void ExecuteInformation (vtkInformation *, vtkInformationVector *,
vtkInformationVector *);
void ComputeInputUpdateExtent (vtkInformation *, vtkInformationVector *,
vtkInformationVector *);
void RequestUpdateExtent (vtkInformation *, vtkInformationVector *,
vtkInformationVector *);
virtual void ComputeInputUpdateExtent (int inExt[6], int outExt[6],
int wExt[6]);
......
......@@ -56,7 +56,7 @@ STRING (REGEX REPLACE
STRING (REGEX REPLACE
"ComputeInputUpdateExtent[ \t]*\\([^,]*,[^,\)]*\\)"
"ComputeInputUpdateExtent (vtkInformation *, vtkInformationVector *, vtkInformationVector *)"
"RequestUpdateExtent (vtkInformation *, vtkInformationVector *, vtkInformationVector *)"
H_CONTENTS "${H_CONTENTS}")
FILE (WRITE ${H_FILE} "${H_CONTENTS}")
......@@ -83,16 +83,16 @@ ENDIF (NOT "${CXX_CONTENTS}" MATCHES ".*::ExecuteInformation[^{]*{\n // get the
STRING (REGEX REPLACE
"::ComputeInputUpdateExtent[ \t]*\\([^,\)]*,[^,\)]*\\)"
"::ComputeInputUpdateExtent (\n vtkInformation * vtkNotUsed(request),\n vtkInformationVector *inputVector,\n vtkInformationVector *outputVector)"
"::RequestUpdateExtent (\n vtkInformation * vtkNotUsed(request),\n vtkInformationVector *inputVector,\n vtkInformationVector *outputVector)"
CXX_CONTENTS "${CXX_CONTENTS}")
# add outInfo only once
IF (NOT "${CXX_CONTENTS}" MATCHES ".*::ComputeInputUpdateExtent[^{]*{\n // get the info objects.*")
IF (NOT "${CXX_CONTENTS}" MATCHES ".*::RequestUpdateExtent[^{]*{\n // get the info objects.*")
STRING (REGEX REPLACE
"::ComputeInputUpdateExtent[ \t]*\\([^{]*{"
"::ComputeInputUpdateExtent (\n vtkInformation * vtkNotUsed(request),\n vtkInformationVector *inputVector,\n vtkInformationVector *outputVector)\n{\n // get the info objects\n vtkInformation* outInfo = outputVector->GetInformationObject(0);\n vtkInformation *inInfo =\n this->GetInputConnectionInformation(inputVector,0,0);\n"
"::RequestUpdateExtent[ \t]*\\([^{]*{"
"::RequestUpdateExtent (\n vtkInformation * vtkNotUsed(request),\n vtkInformationVector *inputVector,\n vtkInformationVector *outputVector)\n{\n // get the info objects\n vtkInformation* outInfo = outputVector->GetInformationObject(0);\n vtkInformation *inInfo =\n this->GetInputConnectionInformation(inputVector,0,0);\n"
CXX_CONTENTS "${CXX_CONTENTS}")
ENDIF (NOT "${CXX_CONTENTS}" MATCHES ".*::ComputeInputUpdateExtent[^{]*{\n // get the info objects.*")
ENDIF (NOT "${CXX_CONTENTS}" MATCHES ".*::RequestUpdateExtent[^{]*{\n // get the info objects.*")
STRING (REGEX REPLACE
"this->GetInput\\(\\)->GetWholeExtent\\("
......
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