From 5578995d9a82792833333eeb3dd5c8ecac967293 Mon Sep 17 00:00:00 2001 From: tbaudier Date: Thu, 28 Feb 2019 11:10:16 +0100 Subject: [PATCH] Change header includion from .h to .cxx file With ITK5, it was not possible to compile clitkAffineRegistrationGenericFilter with the included file clitkTransformUtilities.h when the include were in the .h file With include in the .cxx file it works --- .../clitkAffineRegistrationGenericFilter.cxx | 39 +++++++++++++++++++ .../clitkAffineRegistrationGenericFilter.h | 34 +--------------- 2 files changed, 40 insertions(+), 33 deletions(-) diff --git a/registration/clitkAffineRegistrationGenericFilter.cxx b/registration/clitkAffineRegistrationGenericFilter.cxx index d034912..2c94379 100644 --- a/registration/clitkAffineRegistrationGenericFilter.cxx +++ b/registration/clitkAffineRegistrationGenericFilter.cxx @@ -20,6 +20,45 @@ #define CLITKAFFINEREGISTRATIONGENERICFILTER_CXX #include "clitkAffineRegistrationGenericFilter.h" +// clitk include +#include "clitkIO.h" +#include "clitkCommon.h" +#include "clitkImageCommon.h" +#include "clitkAffineRegistration_ggo.h" +#include "clitkImageArithm_ggo.h" +#include "clitkCorrelationRatioImageToImageMetric.h" +#include "clitkTransformUtilities.h" +#include "clitkGenericMetric.h" +#include "clitkGenericOptimizer.h" +#include "clitkGenericInterpolator.h" +#include "clitkGenericAffineTransform.h" +#include "clitkImageToImageGenericFilter.h" + + +//itk include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// other includes +#include +#include +#include + namespace clitk { diff --git a/registration/clitkAffineRegistrationGenericFilter.h b/registration/clitkAffineRegistrationGenericFilter.h index 22b9f52..94890dd 100644 --- a/registration/clitkAffineRegistrationGenericFilter.h +++ b/registration/clitkAffineRegistrationGenericFilter.h @@ -20,43 +20,11 @@ #define CLITKAFFINEREGISTRATIONGENERICFILTER_H // clitk include -#include "clitkIO.h" -#include "clitkCommon.h" -#include "clitkImageCommon.h" #include "clitkAffineRegistration_ggo.h" -#include "clitkImageArithm_ggo.h" -#include "clitkCorrelationRatioImageToImageMetric.h" -#include "clitkTransformUtilities.h" -#include "clitkGenericMetric.h" -#include "clitkGenericOptimizer.h" -#include "clitkGenericInterpolator.h" -#include "clitkGenericAffineTransform.h" #include "clitkImageToImageGenericFilter.h" -//itk include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// other includes -#include -#include -#include + namespace clitk { -- 2.45.0