X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkImageCommon.h;h=32bba4916c1ec25244a09655bd1a3dcdf6cd54d2;hb=d55f025b18f68066a52b8f33c2dc6481e82c2580;hp=9559a80cdc49de39f666bdc59f9e9fd35ef2ce5a;hpb=765020625fbc092d283e221e36c83e60a1844cb7;p=clitk.git

diff --git a/common/clitkImageCommon.h b/common/clitkImageCommon.h
index 9559a80..32bba49 100644
--- a/common/clitkImageCommon.h
+++ b/common/clitkImageCommon.h
@@ -1,7 +1,7 @@
 /*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Authors belong to: 
+  Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
   - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
@@ -26,94 +26,94 @@
 #include "itkImageFileReader.h"
 #include "itkImageSeriesReader.h"
 #include "itkImageFileWriter.h"
-#include "gdcmFile.h"
-#if GDCM_MAJOR_VERSION == 2
-  #include "gdcmReader.h"
-#else
-  #include "gdcmFileHelper.h"
-#endif
-
-namespace clitk {
-  
-  //--------------------------------------------------------------------
-  // New Image creation (no allocation)
-  template<class PixelType>
-  typename itk::Image<PixelType,1>::Pointer NewImage1D(int size, double spacing=1.0);
-  template<class PixelType>
-  typename itk::Image<PixelType,2>::Pointer NewImage2D(int sx, int sy, double dx=1.0, double dy=1.0);
-  template<class PixelType>
-  typename itk::Image<PixelType,3>::Pointer NewImage3D(int sx, int sy, int sz, double dx=1.0, double dy=1.0, double dz=1.0);
-  template<class PixelType>
-  typename itk::Image<PixelType,4>::Pointer NewImage4D(int sx, int sy, int sz, int st, double dx=1.0, double dy=1.0, double dz=1.0, double dt=1.0);
-
-  template<class ImageType>
-  typename ImageType::Pointer NewImageLike(const typename ImageType::Pointer input, bool allocate=true);
-
-  template<class ImageType>
-  void CopyValues(const typename ImageType::Pointer input, typename ImageType::Pointer output);
-  //--------------------------------------------------------------------
-  // New Image creation (with allocation)
-
-  //--------------------------------------------------------------------
-  // Read an Write image
-  // template<class ImageType>
-  //   typename ImageType::Pointer ReadImage(const std::string & filename, const bool verbose=false);
-  template<typename ImageType>
-  typename ImageType::Pointer readImage(const std::string & filename, const bool verbose=false);  
-  template<typename ImageType>
-  typename ImageType::Pointer readImage(const std::vector<std::string> & filenames, const bool verbose=false);
-  template<class ImageType>
-  void writeImage(const typename ImageType::Pointer image, const std::string & filename, const bool verbose=false);
-//   template<class ImageType>  
+
+namespace clitk
+{
+
+//--------------------------------------------------------------------
+// New Image creation (no allocation)
+template<class PixelType>
+typename itk::Image<PixelType,1>::Pointer NewImage1D(int size, double spacing=1.0);
+template<class PixelType>
+typename itk::Image<PixelType,2>::Pointer NewImage2D(int sx, int sy, double dx=1.0, double dy=1.0);
+template<class PixelType>
+typename itk::Image<PixelType,3>::Pointer NewImage3D(int sx, int sy, int sz, double dx=1.0, double dy=1.0, double dz=1.0);
+template<class PixelType>
+typename itk::Image<PixelType,4>::Pointer NewImage4D(int sx, int sy, int sz, int st, double dx=1.0, double dy=1.0, double dz=1.0, double dt=1.0);
+
+template<class ImageType>
+typename ImageType::Pointer NewImageLike(const typename ImageType::Pointer input, bool allocate=true);
+
+template<class ImageType>
+void CopyValues(const typename ImageType::Pointer input, typename ImageType::Pointer output);
+//--------------------------------------------------------------------
+// New Image creation (with allocation)
+
+//--------------------------------------------------------------------
+// Read an Write image
+// template<class ImageType>
+//   typename ImageType::Pointer ReadImage(const std::string & filename, const bool verbose=false);
+template<typename ImageType>
+typename ImageType::Pointer readImage(const std::string & filename, const bool verbose=false);
+template<typename ImageType>
+typename ImageType::Pointer readImage(const std::vector<std::string> & filenames, const bool verbose=false);
+template<class ImageType>
+void writeImage(const typename ImageType::Pointer image, const std::string & filename, const bool verbose=false, const bool compression=false);
+//   template<class ImageType>
 //   void writeConstImage(const typename ImageType::ConstPointer image, const std::string & filename, const bool verbose=false);
-  template<class ImageType>  
-  void writeImage(const ImageType* image, const std::string & filename, const bool verbose=false);
-
-  //--------------------------------------------------------------------
-  // Read/print image header
-  itk::ImageIOBase::Pointer readImageHeader(const std::string & filename,bool exit_on_error=true);
-  void printImageHeader(itk::ImageIOBase::Pointer header, std::ostream & os, const int level=0);
-
-  //--------------------------------------------------------------------
-  // Determine pixetype and dimension of an image file
-  void ReadImageDimensionAndPixelType(const std::string & filename, int & dimension, std::string & pixeType);
-
-  //--------------------------------------------------------------------
-  // Determine pixetype, dimension and number of pixel components  of an image file
-  void ReadImageDimensionAndPixelType(const std::string & filename, int & dimension, std::string & pixeType, int & components);
-
-  //--------------------------------------------------------------------
-  // Read a dicom header  
-  gdcm::File * readDicomHeader(const std::string & filename, const bool verbose=false);
-
-  //--------------------------------------------------------------------
-  template<class ImageType>
-  int ComputeHowManyDifferentIntensity(const typename ImageType::Pointer & image, 
-				       std::vector<typename ImageType::PixelType> & listOfIntensities);
-  template<class InputImageType, class MaskImageType>
-  void ComputeWeightsOfEachClasses(const typename InputImageType::Pointer & input, 
-				   const typename MaskImageType::Pointer & mask,
-				   const std::vector<typename MaskImageType::PixelType> & listOfIntensities, 
-				   std::map<typename MaskImageType::PixelType, 
-				   std::map<typename InputImageType::PixelType, double> > & mapOfLabelsAndWeights);
-
-  //--------------------------------------------------------------------
-  template<class ImageType1, class ImageType2>
-  bool HaveSameSizeAndSpacing(typename ImageType1::ConstPointer A, 
-                             typename ImageType2::ConstPointer B);
-
-  template<class ImageType1, class ImageType2>
-  bool HaveSameSizeAndSpacing(typename ImageType1::Pointer A, 
-                             typename ImageType2::Pointer B);
-
-  //--------------------------------------------------------------------
-  template<class ImageType1, class ImageType2>
-  bool HaveSameSpacing(typename ImageType1::ConstPointer A, 
-                       typename ImageType2::ConstPointer B);
-
-  template<class ImageType1, class ImageType2>
-  bool HaveSameSpacing(typename ImageType1::Pointer A, 
-                       typename ImageType2::Pointer B);
+template<class ImageType>
+void writeImage(const ImageType* image, const std::string & filename, const bool verbose=false, const bool compression=false);
+
+//--------------------------------------------------------------------
+// Read/print image header
+itk::ImageIOBase::Pointer readImageHeader(const std::string & filename,bool exit_on_error=true);
+void printImageHeader(itk::ImageIOBase::Pointer header, std::ostream & os, const int level=0);
+
+//--------------------------------------------------------------------
+// Determine pixetype and dimension of an image file
+void ReadImageDimensionAndPixelType(const std::string & filename, int & dimension, std::string & pixeType);
+
+//--------------------------------------------------------------------
+// Determine pixetype, dimension and number of pixel components  of an image file
+void ReadImageDimensionAndPixelType(const std::string & filename, int & dimension, std::string & pixeType, int & components);
+
+//--------------------------------------------------------------------
+template<class ImageType>
+int ComputeHowManyDifferentIntensity(const typename ImageType::Pointer & image,
+                                     std::vector<typename ImageType::PixelType> & listOfIntensities);
+template<class InputImageType, class MaskImageType>
+void ComputeWeightsOfEachClasses(const typename InputImageType::Pointer & input,
+                                 const typename MaskImageType::Pointer & mask,
+                                 const std::vector<typename MaskImageType::PixelType> & listOfIntensities,
+                                 std::map<typename MaskImageType::PixelType,
+                                 std::map<typename InputImageType::PixelType, double> > & mapOfLabelsAndWeights);
+
+//--------------------------------------------------------------------
+template<class ImageType1, class ImageType2>
+bool HaveSameSpacing(typename ImageType1::ConstPointer A,
+                     typename ImageType2::ConstPointer B);
+
+template<class ImageType1, class ImageType2>
+bool HaveSameSpacing(typename ImageType1::Pointer A,
+                     typename ImageType2::Pointer B);
+
+//--------------------------------------------------------------------
+template<class ImageType1, class ImageType2>
+bool HaveSameSize(typename ImageType1::ConstPointer A,
+                  typename ImageType2::ConstPointer B);
+
+template<class ImageType1, class ImageType2>
+bool HaveSameSize(typename ImageType1::Pointer A,
+                  typename ImageType2::Pointer B);
+
+//--------------------------------------------------------------------
+template<class ImageType1, class ImageType2>
+bool HaveSameSizeAndSpacing(typename ImageType1::ConstPointer A,
+                            typename ImageType2::ConstPointer B);
+
+template<class ImageType1, class ImageType2>
+bool HaveSameSizeAndSpacing(typename ImageType1::Pointer A,
+                            typename ImageType2::Pointer B);
 
 #include "clitkImageCommon.txx"