Skip to content

Fix USE_OpenCLMovingdGenericPyramid typo, restore virtual, improve "ITKimprovements" #include's#1427

Merged
N-Dekker merged 3 commits into
mainfrom
OpenCL-fixes
Apr 9, 2026
Merged

Fix USE_OpenCLMovingdGenericPyramid typo, restore virtual, improve "ITKimprovements" #include's#1427
N-Dekker merged 3 commits into
mainfrom
OpenCL-fixes

Conversation

@N-Dekker
Copy link
Copy Markdown
Member

@N-Dekker N-Dekker commented Apr 9, 2026

N-Dekker added 3 commits April 9, 2026 18:41
Avoided potential confusion with original ITK header files.

Using Notepad++, Replace in Files, doing:

    Find what: "itk(GPUDataManager|GPUFunctorBase|GPUImage|GPUImageDataManager|GPUImageToImageFilter|GPUInPlaceImageFilter|GPUUnaryFunctorImageFilter|OpenCL|OpenCLBuffer|OpenCLCommandQueue|OpenCLContext|OpenCLContextScopeGuard|OpenCLDevice|OpenCLEvent|OpenCLEventList|OpenCLExport|OpenCLExtension|OpenCLGlobal|OpenCLImage|OpenCLImageFormat|OpenCLKernel|OpenCLKernelManager|OpenCLKernelToImageBridge|OpenCLLogger|OpenCLMacro|OpenCLMemoryObject|OpenCLOstreamSupport|OpenCLPlatform|OpenCLProfilingTimeProbe|OpenCLProgram|OpenCLSampler|OpenCLSize|OpenCLStringUtils|OpenCLUserEvent|OpenCLUtil|OpenCLVector|OpenCLVectorBase)\.h"
    Replace with: "\.\./ITKimprovements/itk$1\.h"
    Filters: *.h;*.cxx;*.hxx
    Search Mode: Regular expression
Restored the `virtual` keyword for `AdvancedBSplineDeformableTransformBase::SetCoefficientImages`. which was removed by pull request #1357 commit a533dd9 "STYLE: Make Get/Set CoefficientImages non-virtual, in BSpline Base", merged on Sep 3, 2025, included with 5.3.0 and 5.3.1.

Aims to fix:

    elastix\Common\OpenCL\Filters\itkGPUAdvancedBSplineDeformableTransform.h(70,3): error C3668: 'itk::GPUAdvancedBSplineDeformableTransform::SetCoefficientImages': method with override specifier 'override' did not override any base class methods
The typo was introduced with commit 2ce0a0a "ENH: Added support for the use of OpenCL in elastix", Jan 22, 2015.
@N-Dekker N-Dekker merged commit 638bdb1 into main Apr 9, 2026
7 of 8 checks passed
@N-Dekker N-Dekker deleted the OpenCL-fixes branch April 9, 2026 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant