STYLE: Let signature of MakeOutput member functions match with ITK

N-Dekker · N-Dekker · commit 5e47bcc138a9 · 2024-05-10T18:19:52.000+02:00
Fixed the parameter type of the `MakeOutput` member functions of ImageSamplerBase, VectorContainerSource, and MultiResolutionImageRegistrationMethod2, to ensure that they properly override ITK's `ProcessObject::MakeOutput(DataObjectPointerArraySizeType)`. Following ITK commit InsightSoftwareConsortium/ITK@b066b36 "COMP: Fix VisualStudio warning int possible loss of data.", Matt McCormick, 2011-11-17, by using `DataObjectPointerArraySizeType`.
diff --git a/Common/ImageSamplers/itkImageSamplerBase.h b/Common/ImageSamplers/itkImageSamplerBase.h
@@ -89,7 +89,7 @@ class ITK_TEMPLATE_EXPORT ImageSamplerBase
 
   /** Create a valid output. */
   DataObject::Pointer
-  MakeOutput(unsigned int idx) override;
+  MakeOutput(ProcessObject::DataObjectPointerArraySizeType idx) override;
 
   /** Set the input image of this process object.  */
   void
diff --git a/Common/ImageSamplers/itkImageSamplerBase.hxx b/Common/ImageSamplers/itkImageSamplerBase.hxx
@@ -420,7 +420,7 @@ ImageSamplerBase<TInputImage>::ImageSamplerBase()
 
 template <class TInputImage>
 DataObject::Pointer
-ImageSamplerBase<TInputImage>::MakeOutput(unsigned int itkNotUsed(idx))
+ImageSamplerBase<TInputImage>::MakeOutput(ProcessObject::DataObjectPointerArraySizeType itkNotUsed(idx))
 {
   OutputVectorContainerPointer outputVectorContainer = OutputVectorContainerType::New();
   return outputVectorContainer.GetPointer();
diff --git a/Common/ImageSamplers/itkVectorContainerSource.h b/Common/ImageSamplers/itkVectorContainerSource.h
@@ -68,8 +68,8 @@ class ITK_TEMPLATE_EXPORT VectorContainerSource : public ProcessObject
   GraftNthOutput(unsigned int idx, DataObject * output);
 
   /** Make a DataObject of the correct type to used as the specified output. */
-  virtual DataObjectPointer
-  MakeOutput(unsigned int idx);
+  DataObjectPointer
+  MakeOutput(ProcessObject::DataObjectPointerArraySizeType idx) override;
 
 protected:
   /** The constructor. */
diff --git a/Common/ImageSamplers/itkVectorContainerSource.hxx b/Common/ImageSamplers/itkVectorContainerSource.hxx
@@ -49,7 +49,8 @@ VectorContainerSource<TOutputVectorContainer>::VectorContainerSource()
 
 template <class TOutputVectorContainer>
 auto
-VectorContainerSource<TOutputVectorContainer>::MakeOutput(unsigned int itkNotUsed(idx)) -> DataObjectPointer
+VectorContainerSource<TOutputVectorContainer>::MakeOutput(ProcessObject::DataObjectPointerArraySizeType itkNotUsed(idx))
+  -> DataObjectPointer
 {
   return static_cast<DataObject *>(TOutputVectorContainer::New().GetPointer());
 } // end MakeOutput()
diff --git a/Common/itkMultiResolutionImageRegistrationMethod2.h b/Common/itkMultiResolutionImageRegistrationMethod2.h
@@ -233,8 +233,8 @@ class ITK_TEMPLATE_EXPORT MultiResolutionImageRegistrationMethod2 : public Proce
   /** Make a DataObject of the correct type to be used as the specified
    * output.
    */
-  virtual DataObjectPointer
-  MakeOutput(unsigned int idx);
+  DataObjectPointer
+  MakeOutput(ProcessObject::DataObjectPointerArraySizeType idx) override;
 
   /** Method to return the latest modified time of this object or
    * any of its cached ivars.
diff --git a/Common/itkMultiResolutionImageRegistrationMethod2.hxx b/Common/itkMultiResolutionImageRegistrationMethod2.hxx
@@ -458,7 +458,8 @@ MultiResolutionImageRegistrationMethod2<TFixedImage, TMovingImage>::GetOutput()
 
 template <typename TFixedImage, typename TMovingImage>
 DataObject::Pointer
-MultiResolutionImageRegistrationMethod2<TFixedImage, TMovingImage>::MakeOutput(unsigned int output)
+MultiResolutionImageRegistrationMethod2<TFixedImage, TMovingImage>::MakeOutput(
+  ProcessObject::DataObjectPointerArraySizeType output)
 {
   if (output > 0)
   {

Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ ImageSamplerBase<TInputImage>::ImageSamplerBase()`
`420`	`420`
`421`	`421`	`template <class TInputImage>`
`422`	`422`	`DataObject::Pointer`
`423`		`-ImageSamplerBase<TInputImage>::MakeOutput(unsigned int itkNotUsed(idx))`
	`423`	`+ImageSamplerBase<TInputImage>::MakeOutput(ProcessObject::DataObjectPointerArraySizeType itkNotUsed(idx))`
`424`	`424`	`{`
`425`	`425`	`OutputVectorContainerPointer outputVectorContainer = OutputVectorContainerType::New();`
`426`	`426`	`return outputVectorContainer.GetPointer();`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@ VectorContainerSource<TOutputVectorContainer>::VectorContainerSource()`
`49`	`49`
`50`	`50`	`template <class TOutputVectorContainer>`
`51`	`51`	`auto`
`52`		`-VectorContainerSource<TOutputVectorContainer>::MakeOutput(unsigned int itkNotUsed(idx)) -> DataObjectPointer`
	`52`	`+VectorContainerSource<TOutputVectorContainer>::MakeOutput(ProcessObject::DataObjectPointerArraySizeType itkNotUsed(idx))`
	`53`	`+ -> DataObjectPointer`
`53`	`54`	`{`
`54`	`55`	`return static_cast<DataObject *>(TOutputVectorContainer::New().GetPointer());`
`55`	`56`	`} // end MakeOutput()`
Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,8 @@ MultiResolutionImageRegistrationMethod2<TFixedImage, TMovingImage>::GetOutput()`
`458`	`458`
`459`	`459`	`template <typename TFixedImage, typename TMovingImage>`
`460`	`460`	`DataObject::Pointer`
`461`		`-MultiResolutionImageRegistrationMethod2<TFixedImage, TMovingImage>::MakeOutput(unsigned int output)`
	`461`	`+MultiResolutionImageRegistrationMethod2<TFixedImage, TMovingImage>::MakeOutput(`
	`462`	`+ ProcessObject::DataObjectPointerArraySizeType output)`
`462`	`463`	`{`
`463`	`464`	`if (output > 0)`
`464`	`465`	`{`