vcpkg/ports/itk/python_gpu_wrapping.patch
Mengna Li 838d3ef6b7
[ITK] update to v5.2.1 (#23158)
* update itk to v5.2.1

* Add license

* update
2022-02-22 12:44:13 -08:00

144 lines
7.2 KiB
Diff

diff --git a/Modules/Core/Common/include/itkMacro.h b/Modules/Core/Common/include/itkMacro.h
index 7d2072af..44fb5246 100644
--- a/Modules/Core/Common/include/itkMacro.h
+++ b/Modules/Core/Common/include/itkMacro.h
@@ -1212,7 +1212,7 @@ compilers.
virtual type * Get##name() const { return this->m_##name; } \
ITK_MACROEND_NOOP_STATEMENT
-/**\def itkGPUKernelClassMacro
+/**\def class itkGPUKernelClassMacro
* Construct a non-templatized helper class that
* provides the GPU kernel source code as a const char*
*/
diff --git a/Modules/Core/GPUCommon/include/itkGPUImageOps.h b/Modules/Core/GPUCommon/include/itkGPUImageOps.h
index 28403144..c5813397 100644
--- a/Modules/Core/GPUCommon/include/itkGPUImageOps.h
+++ b/Modules/Core/GPUCommon/include/itkGPUImageOps.h
@@ -23,7 +23,7 @@
namespace itk
{
/** Create a helper GPU Kernel class for GPUImageOps */
-itkGPUKernelClassMacro(GPUImageOpsKernel);
+class itkGPUKernelClassMacro(GPUImageOpsKernel);
/** \class GPUImageOps
*
diff --git a/Modules/Core/GPUCommon/include/itkGPUReduction.h b/Modules/Core/GPUCommon/include/itkGPUReduction.h
index f01c7244..fec31b51 100644
--- a/Modules/Core/GPUCommon/include/itkGPUReduction.h
+++ b/Modules/Core/GPUCommon/include/itkGPUReduction.h
@@ -26,7 +26,7 @@
namespace itk
{
/** Create a helper GPU Kernel class for GPUReduction */
-itkGPUKernelClassMacro(GPUReductionKernel);
+class itkGPUKernelClassMacro(GPUReductionKernel);
/**
* \class GPUReduction
diff --git a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientNDAnisotropicDiffusionFunction.h b/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientNDAnisotropicDiffusionFunction.h
index c89eec7d..783c61ef 100644
--- a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientNDAnisotropicDiffusionFunction.h
+++ b/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientNDAnisotropicDiffusionFunction.h
@@ -54,7 +54,7 @@ namespace itk
*/
/** Create a helper GPU Kernel class for GPUGradientNDAnisotropicDiffusionFunction */
-itkGPUKernelClassMacro(GPUGradientNDAnisotropicDiffusionFunctionKernel);
+class itkGPUKernelClassMacro(GPUGradientNDAnisotropicDiffusionFunctionKernel);
template <typename TImage>
class ITK_TEMPLATE_EXPORT GPUGradientNDAnisotropicDiffusionFunction
diff --git a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUScalarAnisotropicDiffusionFunction.h b/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUScalarAnisotropicDiffusionFunction.h
index c44ac788..6e342b3c 100644
--- a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUScalarAnisotropicDiffusionFunction.h
+++ b/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUScalarAnisotropicDiffusionFunction.h
@@ -32,7 +32,7 @@ namespace itk
* */
/** Create a helper GPU Kernel class for GPUScalarAnisotropicDiffusionFunction */
-itkGPUKernelClassMacro(GPUScalarAnisotropicDiffusionFunctionKernel);
+class itkGPUKernelClassMacro(GPUScalarAnisotropicDiffusionFunctionKernel);
template <typename TImage>
class ITK_TEMPLATE_EXPORT GPUScalarAnisotropicDiffusionFunction : public GPUAnisotropicDiffusionFunction<TImage>
diff --git a/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.h b/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.h
index 63e1a6d3..ab4bf3e7 100644
--- a/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.h
+++ b/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.h
@@ -29,7 +29,7 @@ namespace itk
{
/** Create a helper GPU Kernel class for GPUCastImageFilter */
-itkGPUKernelClassMacro(GPUCastImageFilterKernel);
+class itkGPUKernelClassMacro(GPUCastImageFilterKernel);
/** \class GPUCastImageFilter
* \brief GPU version of CastImageFilter.
diff --git a/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h b/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h
index f43025ac..8bdced34 100644
--- a/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h
+++ b/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h
@@ -41,7 +41,7 @@ namespace itk
*/
/** Create a helper GPU Kernel class for GPUNeighborhoodOperatorImageFilter */
-itkGPUKernelClassMacro(GPUNeighborhoodOperatorImageFilterKernel);
+class itkGPUKernelClassMacro(GPUNeighborhoodOperatorImageFilterKernel);
template <typename TInputImage,
typename TOutputImage,
diff --git a/Modules/Filtering/GPUSmoothing/include/itkGPUMeanImageFilter.h b/Modules/Filtering/GPUSmoothing/include/itkGPUMeanImageFilter.h
index 50dabce0..487e61bd 100644
--- a/Modules/Filtering/GPUSmoothing/include/itkGPUMeanImageFilter.h
+++ b/Modules/Filtering/GPUSmoothing/include/itkGPUMeanImageFilter.h
@@ -37,7 +37,7 @@ namespace itk
*/
/** Create a helper GPU Kernel class for GPUMeanImageFilter */
-itkGPUKernelClassMacro(GPUMeanImageFilterKernel);
+class itkGPUKernelClassMacro(GPUMeanImageFilterKernel);
template <typename TInputImage, typename TOutputImage>
class ITK_TEMPLATE_EXPORT GPUMeanImageFilter
diff --git a/Modules/Filtering/GPUThresholding/include/itkGPUBinaryThresholdImageFilter.h b/Modules/Filtering/GPUThresholding/include/itkGPUBinaryThresholdImageFilter.h
index ce6526db..48ad3b04 100644
--- a/Modules/Filtering/GPUThresholding/include/itkGPUBinaryThresholdImageFilter.h
+++ b/Modules/Filtering/GPUThresholding/include/itkGPUBinaryThresholdImageFilter.h
@@ -85,7 +85,7 @@ private:
} // end of namespace Functor
/** Create a helper GPU Kernel class for GPUBinaryThresholdImageFilter */
-itkGPUKernelClassMacro(GPUBinaryThresholdImageFilterKernel);
+class itkGPUKernelClassMacro(GPUBinaryThresholdImageFilterKernel);
/**
* \class GPUBinaryThresholdImageFilter
diff --git a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h
index 008ed396..ae3b0cb0 100644
--- a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h
+++ b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h
@@ -51,7 +51,7 @@ namespace itk
* \ingroup ITKGPUPDEDeformableRegistration
*/
/** Create a helper GPU Kernel class for GPUDemonsRegistrationFunction */
-itkGPUKernelClassMacro(GPUDemonsRegistrationFunctionKernel);
+class itkGPUKernelClassMacro(GPUDemonsRegistrationFunctionKernel);
template <typename TFixedImage, typename TMovingImage, typename TDisplacementField>
class ITK_TEMPLATE_EXPORT GPUDemonsRegistrationFunction
diff --git a/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.h b/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.h
index 13a00667..9f2a66ec 100644
--- a/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.h
+++ b/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.h
@@ -73,7 +73,7 @@ namespace itk
*/
/** Create a helper GPU Kernel class for GPUPDEDeformableRegistrationFilter */
-itkGPUKernelClassMacro(GPUPDEDeformableRegistrationFilterKernel);
+class itkGPUKernelClassMacro(GPUPDEDeformableRegistrationFilterKernel);
template <typename TFixedImage,
typename TMovingImage,