From: tbaudier Date: Thu, 28 Feb 2019 10:10:16 +0000 (+0100) Subject: Change header includion from .h to .cxx file X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff_plain;h=5578995d9a82792833333eeb3dd5c8ecac967293 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 --- 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 {