workaround for bug in itk/gdcmDict.h : gdcm headers seem to need to be included

before the itk ones, otherwise there is a conflict between stdint.h and itkIntTypes.h

diff --git a/common/clitkImageCommon.cxx b/common/clitkImageCommon.cxx
index 9386ecdda27c4998a8d631328754046054ce6e46..d3cd8d897ac87ff6e7978f85a1bf1e0777662873 100644 (file)
--- a/common/clitkImageCommon.cxx
+++ b/common/clitkImageCommon.cxx
@@ -69,7 +69,7 @@ void clitk::ReadImageDimensionAndPixelType(const std::string & filename,
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-/* Read a dicom header
+// Read a dicom header
 gdcm::File * clitk::readDicomHeader(const std::string & filename,
                                     const bool verbose)
 {
@@ -82,7 +82,7 @@ gdcm::File * clitk::readDicomHeader(const std::string & filename,
   header->Load();
   return header;
 }
-*///--------------------------------------------------------------------
+///--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
 itk::ImageIOBase::Pointer clitk::readImageHeader(const std::string & filename, bool exit_on_error)

diff --git a/common/clitkImageCommon.h b/common/clitkImageCommon.h
index d3fefb3228b153928429a1bbb2c3e486f1feec7b..e734d21bf402367538169da3d250a7a12dbb8114 100644 (file)
--- a/common/clitkImageCommon.h
+++ b/common/clitkImageCommon.h
@@ -26,8 +26,8 @@
 #include "itkImageFileReader.h"
 #include "itkImageSeriesReader.h"
 #include "itkImageFileWriter.h"
-//#include "gdcmFile.h"
-//#include "gdcmFileHelper.h"
+#include "gdcmFile.h"
+#include "gdcmFileHelper.h"
 
 
 namespace clitk {
@@ -81,7 +81,7 @@ namespace clitk {
 
   //--------------------------------------------------------------------
   // Read a dicom header  
-//  gdcm::File * readDicomHeader(const std::string & filename, const bool verbose=false);
+  gdcm::File * readDicomHeader(const std::string & filename, const bool verbose=false);
 
   //--------------------------------------------------------------------
   template<class ImageType>

diff --git a/registration/clitkAffineRegistrationGenericFilter.h b/registration/clitkAffineRegistrationGenericFilter.h
index 0702308c71d4ae90bb3c02faaedb50734a08aa64..315a61dd9a75768657e3fed03101f43d16242154 100644 (file)
--- a/registration/clitkAffineRegistrationGenericFilter.h
+++ b/registration/clitkAffineRegistrationGenericFilter.h
@@ -22,6 +22,7 @@
 // clitk include
 #include "clitkIO.h"
 #include "clitkCommon.h"
+#include "clitkImageCommon.h"
 #include "clitkAffineRegistration_ggo.h"
 #include "clitkImageArithm_ggo.h"
 #include "clitkCorrelationRatioImageToImageMetric.h"