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

Common/OpenCL/Factories/itkGPUImageFactory.h

@@ -19,7 +19,7 @@
 #define itkGPUImageFactory_h
 
 #include "itkGPUObjectFactoryBase.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
 namespace itk
 {

Common/OpenCL/Factories/itkGPUObjectFactoryBase.hxx

@@ -19,7 +19,7 @@
 #define itkGPUObjectFactoryBase_hxx
 
 #include "itkGPUObjectFactoryBase.h"
-#include "itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
 
 namespace itk
 {

Common/OpenCL/Filters/itkGPUAdvancedBSplineDeformableTransform.hxx

@@ -21,7 +21,7 @@
 #include "itkGPUAdvancedBSplineDeformableTransform.h"
 
 #include "itkGPUMatrixOffsetTransformBase.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
 namespace itk
 {

Common/OpenCL/Filters/itkGPUBSplineBaseTransform.h

@@ -18,8 +18,8 @@
 #ifndef itkGPUBSplineBaseTransform_h
 #define itkGPUBSplineBaseTransform_h
 
-#include "itkGPUDataManager.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUDataManager.h"
+#include "../ITKimprovements/itkGPUImage.h"
 #include "itkGPUTransformBase.h"
 
 namespace itk

Common/OpenCL/Filters/itkGPUBSplineDecompositionImageFilter.h

@@ -19,7 +19,7 @@
 #define itkGPUBSplineDecompositionImageFilter_h
 
 #include "itkBSplineDecompositionImageFilter.h"
-#include "itkGPUInPlaceImageFilter.h"
+#include "../ITKimprovements/itkGPUInPlaceImageFilter.h"
 
 namespace itk
 {

Common/OpenCL/Filters/itkGPUBSplineDecompositionImageFilter.hxx

@@ -20,8 +20,8 @@
 
 #include "itkGPUBSplineDecompositionImageFilter.h"
 #include "itkGPUCastImageFilter.h"
-#include "itkOpenCLUtil.h"
-#include "itkOpenCLDevice.h"
+#include "../ITKimprovements/itkOpenCLUtil.h"
+#include "../ITKimprovements/itkOpenCLDevice.h"
 
 namespace itk
 {

Common/OpenCL/Filters/itkGPUBSplineInterpolateImageFunction.h

@@ -19,8 +19,8 @@
 #define itkGPUBSplineInterpolateImageFunction_h
 
 #include "itkGPUInterpolateImageFunction.h"
-#include "itkGPUDataManager.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUDataManager.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
 #include "itkBSplineInterpolateImageFunction.h"
 #include "itkVersion.h"

Common/OpenCL/Filters/itkGPUBSplineTransform.hxx

@@ -21,7 +21,7 @@
 #include "itkGPUBSplineTransform.h"
 
 #include "itkGPUMatrixOffsetTransformBase.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
 namespace itk
 {

Common/OpenCL/Filters/itkGPUCastImageFilter.h

@@ -21,9 +21,9 @@
 #include "itkCastImageFilter.h"
 #include "itkSimpleDataObjectDecorator.h"
 
-#include "itkGPUFunctorBase.h"
-#include "itkOpenCLKernelManager.h"
-#include "itkGPUUnaryFunctorImageFilter.h"
+#include "../ITKimprovements/itkGPUFunctorBase.h"
+#include "../ITKimprovements/itkOpenCLKernelManager.h"
+#include "../ITKimprovements/itkGPUUnaryFunctorImageFilter.h"
 
 namespace itk
 {

Common/OpenCL/Filters/itkGPUCastImageFilter.hxx

@@ -19,7 +19,7 @@
 #define itkGPUCastImageFilter_hxx
 
 #include "itkGPUCastImageFilter.h"
-#include "itkOpenCLUtil.h"
+#include "../ITKimprovements/itkOpenCLUtil.h"
 
 namespace itk
 {

Common/OpenCL/Filters/itkGPUInterpolateImageFunction.hxx

@@ -19,7 +19,7 @@
 #define itkGPUInterpolateImageFunction_hxx
 
 #include "itkGPUInterpolateImageFunction.h"
-#include "itkOpenCLOstreamSupport.h"
+#include "../ITKimprovements/itkOpenCLOstreamSupport.h"
 
 // begin of unnamed namespace
 namespace

Common/OpenCL/Filters/itkGPUInterpolatorBase.h

@@ -18,7 +18,7 @@
 #ifndef itkGPUInterpolatorBase_h
 #define itkGPUInterpolatorBase_h
 
-#include "itkGPUDataManager.h"
+#include "../ITKimprovements/itkGPUDataManager.h"
 
 namespace itk
 {

Common/OpenCL/Filters/itkGPUInterpolatorCopier.h

@@ -19,7 +19,7 @@
 #define itkGPUInterpolatorCopier_h
 
 #include "itkInterpolateImageFunction.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
 namespace itk
 {

Common/OpenCL/Filters/itkGPULinearInterpolateImageFunction.h

@@ -22,7 +22,7 @@
 #include "itkVersion.h"
 
 #include "itkGPUInterpolateImageFunction.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
 namespace itk
 {

Common/OpenCL/Filters/itkGPURecursiveGaussianImageFilter.h

@@ -19,7 +19,7 @@
 #define itkGPURecursiveGaussianImageFilter_h
 
 #include "itkRecursiveGaussianImageFilter.h"
-#include "itkGPUInPlaceImageFilter.h"
+#include "../ITKimprovements/itkGPUInPlaceImageFilter.h"
 
 namespace itk
 {

Common/OpenCL/Filters/itkGPURecursiveGaussianImageFilter.hxx

@@ -19,9 +19,9 @@
 #define itkGPURecursiveGaussianImageFilter_hxx
 
 #include "itkGPURecursiveGaussianImageFilter.h"
-#include "itkOpenCLUtil.h"
-#include "itkOpenCLEvent.h"
-#include "itkOpenCLDevice.h"
+#include "../ITKimprovements/itkOpenCLUtil.h"
+#include "../ITKimprovements/itkOpenCLEvent.h"
+#include "../ITKimprovements/itkOpenCLDevice.h"
 
 namespace itk
 {

Common/OpenCL/Filters/itkGPUResampleImageFilter.h

@@ -20,7 +20,7 @@
 
 #include "itkResampleImageFilter.h"
 
-#include "itkGPUImageToImageFilter.h"
+#include "../ITKimprovements/itkGPUImageToImageFilter.h"
 #include "itkGPUInterpolateImageFunction.h"
 #include "itkGPUBSplineInterpolateImageFunction.h"
 #include "itkGPUBSplineBaseTransform.h"

Common/OpenCL/Filters/itkGPUResampleImageFilter.hxx

@@ -28,8 +28,8 @@
 #include "itkTimeProbe.h"
 #include "itkImageRegionSplitterSlowDimension.h"
 
-#include "itkOpenCLUtil.h"
-#include "itkOpenCLKernelToImageBridge.h"
+#include "../ITKimprovements/itkOpenCLUtil.h"
+#include "../ITKimprovements/itkOpenCLKernelToImageBridge.h"
 
 namespace
 {

Common/OpenCL/Filters/itkGPUShrinkImageFilter.h

@@ -20,8 +20,8 @@
 
 #include "itkShrinkImageFilter.h"
 
-#include "itkGPUImageToImageFilter.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImageToImageFilter.h"
+#include "../ITKimprovements/itkGPUImage.h"
 #include "itkVersion.h"
 
 namespace itk

Common/OpenCL/Filters/itkGPUShrinkImageFilter.hxx

@@ -19,7 +19,7 @@
 #define itkGPUShrinkImageFilter_hxx
 
 #include "itkGPUShrinkImageFilter.h"
-#include "itkOpenCLUtil.h"
+#include "../ITKimprovements/itkOpenCLUtil.h"
 
 namespace itk
 {

Common/OpenCL/Filters/itkGPUTransformBase.h

@@ -18,7 +18,7 @@
 #ifndef itkGPUTransformBase_h
 #define itkGPUTransformBase_h
 
-#include "itkGPUDataManager.h"
+#include "../ITKimprovements/itkGPUDataManager.h"
 
 namespace itk
 {

Common/OpenCL/ITKimprovements/itkGPUDataManager.cxx

@@ -32,7 +32,7 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkGPUDataManager.h"
+#include "../ITKimprovements/itkGPUDataManager.h"
 
 namespace itk
 {

Common/OpenCL/ITKimprovements/itkGPUDataManager.h

@@ -38,7 +38,7 @@
 #include "itkObject.h"
 #include "itkDataObject.h"
 #include "itkObjectFactory.h"
-#include "itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
 #include <mutex>
 
 namespace itk

Common/OpenCL/ITKimprovements/itkGPUFunctorBase.h

@@ -35,7 +35,7 @@
 #ifndef itkGPUFunctorBase_h
 #define itkGPUFunctorBase_h
 
-#include "itkOpenCLKernelManager.h"
+#include "../ITKimprovements/itkOpenCLKernelManager.h"
 
 namespace itk
 {

Common/OpenCL/ITKimprovements/itkGPUImage.h

@@ -36,7 +36,7 @@
 #define itkGPUImage_h
 
 #include "itkImage.h"
-#include "itkGPUImageDataManager.h"
+#include "../ITKimprovements/itkGPUImageDataManager.h"
 #include "itkVersion.h"
 #include "itkObjectFactoryBase.h"
 

Common/OpenCL/ITKimprovements/itkGPUImage.hxx

@@ -35,7 +35,7 @@
 #ifndef itkGPUImage_hxx
 #define itkGPUImage_hxx
 
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
 namespace itk
 {

Common/OpenCL/ITKimprovements/itkGPUImageDataManager.h

@@ -39,8 +39,8 @@
 #include <itkTimeStamp.h>
 #include <itkLightObject.h>
 #include <itkObjectFactory.h>
-#include "itkGPUImage.h"
-#include "itkGPUDataManager.h"
+#include "../ITKimprovements/itkGPUImage.h"
+#include "../ITKimprovements/itkGPUDataManager.h"
 
 namespace itk
 {

Common/OpenCL/ITKimprovements/itkGPUImageDataManager.hxx

@@ -35,7 +35,7 @@
 #ifndef itkGPUImageDataManager_hxx
 #define itkGPUImageDataManager_hxx
 
-#include "itkGPUImageDataManager.h"
+#include "../ITKimprovements/itkGPUImageDataManager.h"
 
 // #define VERBOSE
 

Common/OpenCL/ITKimprovements/itkGPUImageToImageFilter.h

@@ -36,7 +36,7 @@
 #define itkGPUImageToImageFilter_h
 
 #include "itkImageToImageFilter.h"
-#include "itkOpenCLKernelManager.h"
+#include "../ITKimprovements/itkOpenCLKernelManager.h"
 
 namespace itk
 {

Common/OpenCL/ITKimprovements/itkGPUImageToImageFilter.hxx

@@ -35,8 +35,8 @@
 #ifndef itkGPUImageToImageFilter_hxx
 #define itkGPUImageToImageFilter_hxx
 
-#include "itkGPUImageToImageFilter.h"
-#include "itkGPUImage.h"
+#include "../ITKimprovements/itkGPUImageToImageFilter.h"
+#include "../ITKimprovements/itkGPUImage.h"
 
 namespace itk
 {

Common/OpenCL/ITKimprovements/itkGPUInPlaceImageFilter.h

@@ -36,7 +36,7 @@
 #define itkGPUInPlaceImageFilter_h
 
 #include "itkInPlaceImageFilter.h"
-#include "itkGPUImageToImageFilter.h"
+#include "../ITKimprovements/itkGPUImageToImageFilter.h"
 
 namespace itk
 {

Common/OpenCL/ITKimprovements/itkGPUInPlaceImageFilter.hxx

@@ -35,7 +35,7 @@
 #ifndef itkGPUInPlaceImageFilter_hxx
 #define itkGPUInPlaceImageFilter_hxx
 
-#include "itkGPUInPlaceImageFilter.h"
+#include "../ITKimprovements/itkGPUInPlaceImageFilter.h"
 
 namespace itk
 {

Common/OpenCL/ITKimprovements/itkGPUUnaryFunctorImageFilter.h

@@ -35,8 +35,8 @@
 #ifndef itkGPUUnaryFunctorImageFilter_h
 #define itkGPUUnaryFunctorImageFilter_h
 
-#include "itkGPUFunctorBase.h"
-#include "itkGPUInPlaceImageFilter.h"
+#include "../ITKimprovements/itkGPUFunctorBase.h"
+#include "../ITKimprovements/itkGPUInPlaceImageFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
 
 namespace itk

Common/OpenCL/ITKimprovements/itkGPUUnaryFunctorImageFilter.hxx

@@ -35,8 +35,8 @@
 #ifndef itkGPUUnaryFunctorImageFilter_hxx
 #define itkGPUUnaryFunctorImageFilter_hxx
 
-#include "itkGPUUnaryFunctorImageFilter.h"
-#include "itkOpenCLUtil.h"
+#include "../ITKimprovements/itkGPUUnaryFunctorImageFilter.h"
+#include "../ITKimprovements/itkOpenCLUtil.h"
 
 namespace itk
 {

Common/OpenCL/ITKimprovements/itkOpenCL.h

@@ -18,7 +18,7 @@
 #ifndef itkOpenCL_h
 #define itkOpenCL_h
 
-#include "itkOpenCLExport.h"
+#include "../ITKimprovements/itkOpenCLExport.h"
 
 #ifndef CL_TARGET_OPENCL_VERSION
 #  define CL_TARGET_OPENCL_VERSION 120

Common/OpenCL/ITKimprovements/itkOpenCLBuffer.cxx

@@ -15,10 +15,10 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLBuffer.h"
-#include "itkOpenCLImage.h"
-#include "itkOpenCLContext.h"
-#include "itkOpenCLExtension.h"
+#include "../ITKimprovements/itkOpenCLBuffer.h"
+#include "../ITKimprovements/itkOpenCLImage.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLExtension.h"
 
 namespace itk
 {

Common/OpenCL/ITKimprovements/itkOpenCLBuffer.h

@@ -35,8 +35,8 @@
 #ifndef itkOpenCLBuffer_h
 #define itkOpenCLBuffer_h
 
-#include "itkOpenCLMemoryObject.h"
-#include "itkOpenCLEvent.h"
+#include "../ITKimprovements/itkOpenCLMemoryObject.h"
+#include "../ITKimprovements/itkOpenCLEvent.h"
 
 namespace itk
 {

Common/OpenCL/ITKimprovements/itkOpenCLCommandQueue.cxx

@@ -15,8 +15,8 @@
  *  limitations under the License.
  *
  *=========================================================================*/
-#include "itkOpenCLCommandQueue.h"
-#include "itkOpenCLContext.h"
+#include "../ITKimprovements/itkOpenCLCommandQueue.h"
+#include "../ITKimprovements/itkOpenCLContext.h"
 
 namespace itk
 {

Common/OpenCL/ITKimprovements/itkOpenCLCommandQueue.h

@@ -18,7 +18,7 @@
 #ifndef itkOpenCLCommandQueue_h
 #define itkOpenCLCommandQueue_h
 
-#include "itkOpenCL.h"
+#include "../ITKimprovements/itkOpenCL.h"
 #include <ostream>
 
 namespace itk