Change of include order to fix #82

If statismo is used with an external ITK, the order of the headers need to be such that itk's itk_hdf5.h is included first. If not, duplicate imports and/or duplicate symbols during linking can occur.
statismo · Sep 1, 2015 · 5357bda · 5357bda
1 parent 0473773
commit 5357bda
Show file tree

Hide file tree

Showing 29 changed files with 96 additions and 57 deletions.
diff --git a/modules/ITK/examples/itkBuildDeformationModel.cxx b/modules/ITK/examples/itkBuildDeformationModel.cxx
@@ -39,14 +39,15 @@
 #include <errno.h>
 #include <iostream>
 
-#include <itkDirectory.h>
-#include <itkImageFileReader.h>
-
 #include "itkDataManager.h"
 #include "itkPCAModelBuilder.h"
 #include "itkStandardImageRepresenter.h"
 #include "itkStatisticalModel.h"
 
+#include <itkDirectory.h>
+#include <itkImageFileReader.h>
+
+
 /*
  * This example shows the ITK Wrapping of statismo can be used to build a deformation model.
  */

diff --git a/modules/ITK/examples/itkBuildGaussianProcessDeformationModel.cxx b/modules/ITK/examples/itkBuildGaussianProcessDeformationModel.cxx
@@ -38,14 +38,14 @@
 #include <errno.h>
 #include <iostream>
 
-#include <itkDirectory.h>
-#include <itkImageFileReader.h>
-
 #include "itkDataManager.h"
 #include "itkLowRankGPModelBuilder.h"
 #include "itkStandardImageRepresenter.h"
 #include "itkStatisticalModel.h"
 
+#include <itkDirectory.h>
+#include <itkImageFileReader.h>
+
 #include "Kernels.h"
 #include "KernelCombinators.h"
 

diff --git a/modules/ITK/examples/itkBuildShapeModel.cxx b/modules/ITK/examples/itkBuildShapeModel.cxx
@@ -39,16 +39,16 @@
 #include <errno.h>
 #include <iostream>
 
-#include <itkDirectory.h>
-#include <itkMesh.h>
-#include <itkMeshFileWriter.h>
-#include <itkMeshFileReader.h>
-
 #include "itkDataManager.h"
 #include "itkPCAModelBuilder.h"
 #include "itkStandardMeshRepresenter.h"
 #include "itkStatisticalModel.h"
 
+#include <itkDirectory.h>
+#include <itkMesh.h>
+#include <itkMeshFileWriter.h>
+#include <itkMeshFileReader.h>
+
 /*
  * This example shows the ITK Wrapping of statismo can be used to build a shape model.
  */

diff --git a/modules/ITK/examples/itkBuildShapeModel_75pcvar.cxx b/modules/ITK/examples/itkBuildShapeModel_75pcvar.cxx
@@ -39,17 +39,19 @@
 #include <errno.h>
 #include <iostream>
 
-#include <itkDirectory.h>
-#include <itkMesh.h>
-#include <itkMeshFileWriter.h>
-#include <itkMeshFileReader.h>
-
 #include "itkDataManager.h"
 #include "itkPCAModelBuilder.h"
 #include "itkReducedVarianceModelBuilder.h"
 #include "itkStandardMeshRepresenter.h"
 #include "itkStatisticalModel.h"
 
+
+#include <itkDirectory.h>
+#include <itkMesh.h>
+#include <itkMeshFileWriter.h>
+#include <itkMeshFileReader.h>
+
+
 /*
  * This example shows the ITK Wrapping of statismo can be used to build a shape model.
  */

diff --git a/modules/ITK/examples/itkDeformationModelFitting.cxx b/modules/ITK/examples/itkDeformationModelFitting.cxx
@@ -39,6 +39,11 @@
  * This example shows how the fitting of a statistical deformation model can be performed with statismo.
  */
 
+#include "itkInterpolatingStatisticalDeformationModelTransform.h"
+#include "itkStandardImageRepresenter.h"
+#include "itkStatisticalModel.h"
+
+
 #include <itkCommand.h>
 #include <itkImageFileReader.h>
 #include <itkImageRegistrationMethod.h>
@@ -47,10 +52,6 @@
 #include <itkMeanSquaresImageToImageMetric.h>
 #include <itkNormalizedCorrelationImageToImageMetric.h>
 
-#include "itkInterpolatingStatisticalDeformationModelTransform.h"
-#include "itkStandardImageRepresenter.h"
-#include "itkStatisticalModel.h"
-
 const unsigned Dimensions = 2;
 typedef itk::Image<unsigned short int, Dimensions> ImageType;
 typedef itk::Image< itk::Vector<float, ImageType::ImageDimension> , ImageType::ImageDimension > VectorImageType;

diff --git a/modules/ITK/examples/itkLandmarkConstrainedShapeModelFitting.cxx b/modules/ITK/examples/itkLandmarkConstrainedShapeModelFitting.cxx
@@ -47,6 +47,13 @@
  *
  */
 
+#include "itkPosteriorModelBuilder.h"
+#include "itkStandardMeshRepresenter.h"
+#include "itkStatisticalModel.h"
+#include "itkStatisticalShapeModelTransform.h"
+
+
+
 #include <itkBinaryThresholdImageFilter.h>
 #include <itkCannyEdgeDetectionImageFilter.h>
 #include <itkCastImageFilter.h>
@@ -67,11 +74,6 @@
 #include <itkSignedDanielssonDistanceMapImageFilter.h>
 #include <itkTransformMeshFilter.h>
 
-#include "itkPosteriorModelBuilder.h"
-#include "itkStandardMeshRepresenter.h"
-#include "itkStatisticalModel.h"
-#include "itkStatisticalShapeModelTransform.h"
-
 const unsigned Dimensions = 3;
 typedef itk::PointSet<float, Dimensions  > PointSetType;
 typedef itk::Mesh<float, Dimensions  > MeshType;

diff --git a/modules/ITK/examples/itkLowRankGaussianProcessImageToImageRegistration.cxx b/modules/ITK/examples/itkLowRankGaussianProcessImageToImageRegistration.cxx
@@ -55,6 +55,14 @@
 #include <iomanip>
 #include <string>
 
+#include "itkDataManager.h"
+#include "itkInterpolatingStatisticalDeformationModelTransform.h"
+#include "itkLowRankGPModelBuilder.h"
+#include "itkPosteriorModelBuilder.h"
+#include "itkStandardImageRepresenter.h"
+#include "itkStatisticalModel.h"
+
+
 #include <itkCommand.h>
 #include <itkDirectory.h>
 #include <itkImage.h>
@@ -70,12 +78,6 @@
 #include "Kernels.h"
 #include "KernelCombinators.h"
 
-#include "itkDataManager.h"
-#include "itkInterpolatingStatisticalDeformationModelTransform.h"
-#include "itkLowRankGPModelBuilder.h"
-#include "itkPosteriorModelBuilder.h"
-#include "itkStandardImageRepresenter.h"
-#include "itkStatisticalModel.h"
 
 /**
  * A scalar valued gaussian kernel.

diff --git a/modules/ITK/examples/itkShapeModelFitting.cxx b/modules/ITK/examples/itkShapeModelFitting.cxx
@@ -38,16 +38,19 @@
 /*
  * This example shows how the fitting of a statistical shape model to a Mesh can be performed with Statismo and the itk Registration framework.
  */
+
+#include "itkStandardMeshRepresenter.h"
+#include "itkStatisticalModel.h"
+#include "itkStatisticalShapeModelTransform.h"
+
+
 #include <itkCommand.h>
 #include <itkEuclideanDistancePointMetric.h>
 #include <itkLevenbergMarquardtOptimizer.h>
 #include <itkMesh.h>
 #include <itkMeshFileReader.h>
 #include <itkPointSetToPointSetRegistrationMethod.h>
 
-#include "itkStandardMeshRepresenter.h"
-#include "itkStatisticalModel.h"
-#include "itkStatisticalShapeModelTransform.h"
 
 
 const unsigned Dimensions = 3;

diff --git a/modules/ITK/examples/itkSimpleGaussianProcessImageToImageRegistration.cxx b/modules/ITK/examples/itkSimpleGaussianProcessImageToImageRegistration.cxx
@@ -44,6 +44,12 @@
 #include <iomanip>
 #include <string>
 
+#include "itkDataManager.h"
+#include "itkInterpolatingStatisticalDeformationModelTransform.h"
+#include "itkLowRankGPModelBuilder.h"
+#include "itkStandardImageRepresenter.h"
+#include "itkStatisticalModel.h"
+
 
 #include "itkCommand.h"
 #include "itkDirectory.h"
@@ -58,12 +64,6 @@
 #include "Kernels.h"
 #include "KernelCombinators.h"
 
-#include "itkDataManager.h"
-#include "itkInterpolatingStatisticalDeformationModelTransform.h"
-#include "itkLowRankGPModelBuilder.h"
-#include "itkStandardImageRepresenter.h"
-#include "itkStatisticalModel.h"
-
 #define GaussianSigma 70
 #define GaussianScale 100
 #define NumBasisFunctions 100

diff --git a/modules/ITK/include/itkConditionalModelBuilder.h b/modules/ITK/include/itkConditionalModelBuilder.h
@@ -39,13 +39,15 @@
 #ifndef ITKMODELBUILDER_H_
 #define ITKMODELBUILDER_H_
 
+#include "statismoITKConfig.h"
+
 #include <itkObject.h>
 #include <itkObjectFactory.h>
 
 #include "itkDataManager.h"
 #include "itkStatisticalModel.h"
 #include "ConditionalModelBuilder.h"
-#include "statismoITKConfig.h"
+
 
 namespace itk {
 

diff --git a/modules/ITK/include/itkDataManager.h b/modules/ITK/include/itkDataManager.h
@@ -42,11 +42,13 @@
 #include <boost/bind.hpp>
 #include <boost/utility/result_of.hpp>
 
+#include "statismoITKConfig.h"
+
 #include <itkObject.h>
 #include <itkObjectFactory.h>
 
 #include "DataManager.h"
-#include "statismoITKConfig.h"
+
 
 namespace itk {
 

diff --git a/modules/ITK/include/itkDataManagerWithSurrogates.h b/modules/ITK/include/itkDataManagerWithSurrogates.h
@@ -42,11 +42,13 @@
 #include <boost/bind.hpp>
 #include <boost/utility/result_of.hpp>
 
+#include "statismoITKConfig.h"
+
 #include <itkObject.h>
 #include <itkObjectFactory.h>
 
 #include "DataManagerWithSurrogates.h"
-#include "statismoITKConfig.h"
+
 
 namespace itk {
 

diff --git a/modules/ITK/include/itkInterpolatingStatisticalDeformationModelTransform.h b/modules/ITK/include/itkInterpolatingStatisticalDeformationModelTransform.h
@@ -40,6 +40,7 @@
 
 #include <iostream>
 
+#include "statismoITKConfig.h"
 #include <itkImage.h>
 #include <itkVector.h>
 #include <itkVectorLinearInterpolateImageFunction.h>

diff --git a/modules/ITK/include/itkLowRankGPModelBuilder.h b/modules/ITK/include/itkLowRankGPModelBuilder.h
@@ -38,6 +38,8 @@
 #ifndef ITKLOWRANKMODELBUILDER_H_
 #define ITKLOWRANKMODELBUILDER_H_
 
+#include "statismoITKConfig.h"
+
 #include <itkObject.h>
 #include <itkObjectFactory.h>
 
@@ -46,7 +48,7 @@
 #include "Kernels.h"
 #include "LowRankGPModelBuilder.h"
 #include "Representer.h"
-#include "statismoITKConfig.h"
+
 
 namespace itk {
 

diff --git a/modules/ITK/include/itkPCAModelBuilder.h b/modules/ITK/include/itkPCAModelBuilder.h
@@ -39,14 +39,16 @@
 #ifndef ITKMODELBUILDER_H_
 #define ITKMODELBUILDER_H_
 
+#include "statismoITKConfig.h"
+
 #include <itkObject.h>
 #include <itkObjectFactory.h>
 
 #include "itkDataManager.h"
 #include "itkStatisticalModel.h"
 
 #include "PCAModelBuilder.h"
-#include "statismoITKConfig.h"
+
 
 namespace itk {
 

diff --git a/modules/ITK/include/itkPixelConversionTraits.h b/modules/ITK/include/itkPixelConversionTraits.h
@@ -39,6 +39,8 @@
 #ifndef __ITK_TYPE_CONVERSION_TRAIT
 #define __ITK_TYPE_CONVERSION_TRAIT
 
+#include "statismoITKConfig.h"
+
 #include <itkVector.h>
 
 #include "Exceptions.h"

diff --git a/modules/ITK/include/itkPosteriorModelBuilder.h b/modules/ITK/include/itkPosteriorModelBuilder.h
@@ -39,13 +39,15 @@
 #ifndef ITK_POSTERIOR_MODELBUILDER_H_
 #define ITK_POSTERIOR_MODELBUILDER_H_
 
+#include "statismoITKConfig.h"
+
 #include <itkObject.h>
 
 #include "itkDataManager.h"
 #include "itkStatisticalModel.h"
 
 #include "PosteriorModelBuilder.h"
-#include "statismoITKConfig.h"
+
 
 namespace itk {
 

diff --git a/modules/ITK/include/itkReducedVarianceModelBuilder.h b/modules/ITK/include/itkReducedVarianceModelBuilder.h
@@ -39,13 +39,15 @@
 #ifndef ITK_PARTIALLY_FIXED_MODELBUILDER_H_
 #define ITK_PARTIALLY_FIXED_MODELBUILDER_H_
 
+#include "statismoITKConfig.h"
+
 #include <itkObject.h>
 
 #include "itkDataManager.h"
 #include "itkStatisticalModel.h"
 
 #include "ReducedVarianceModelBuilder.h"
-#include "statismoITKConfig.h"
+
 #include "StatismoUtils.h"
 
 namespace itk {

diff --git a/modules/ITK/include/itkStandardImageRepresenter.hxx b/modules/ITK/include/itkStandardImageRepresenter.hxx
@@ -40,6 +40,7 @@
 
 
 #include <iostream>
+#include "statismoITKConfig.h"
 
 #include <itkImageDuplicator.h>
 #include <itkImageIterator.h>

diff --git a/modules/ITK/include/itkStandardImageRepresenterTraits.h b/modules/ITK/include/itkStandardImageRepresenterTraits.h
@@ -38,6 +38,7 @@
 #ifndef __itkStandardImageRepresenterTraits_h
 #define __itkStandardImageRepresenterTraits_h
 
+#include "statismoITKConfig.h"
 #include "itkImage.h"
 #include "itkVector.h"
 #include "Representer.h"

diff --git a/modules/ITK/include/itkStandardMeshRepresenter.h b/modules/ITK/include/itkStandardMeshRepresenter.h
@@ -42,11 +42,11 @@
 
 #include <boost/unordered_map.hpp>
 
+#include "statismoITKConfig.h" // this needs to be the first include file
+
 #include <itkMesh.h>
 #include <itkObject.h>
 
-#include "statismoITKConfig.h" // this needs to be the first include file
-
 #include "CommonTypes.h"
 #include "Exceptions.h"
 #include "Representer.h"

diff --git a/modules/ITK/include/itkStandardMeshRepresenter.hxx b/modules/ITK/include/itkStandardMeshRepresenter.hxx
@@ -38,6 +38,8 @@
 #ifndef __itkStandardMeshRepresenter_hxx
 #define __itkStandardMeshRepresenter_hxx
 
+#include "statismoITKConfig.h" // this needs to be the first include file
+
 #include "itkStandardMeshRepresenter.h"
 
 #include <iostream>

diff --git a/modules/ITK/include/itkStatisticalDeformationModelTransform.h b/modules/ITK/include/itkStatisticalDeformationModelTransform.h
@@ -40,6 +40,7 @@
 
 #include <iostream>
 
+#include "statismoITKConfig.h" 
 #include <itkImage.h>
 #include <itkVector.h>