X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=common%2FclitkImageCommon.h;h=d3fefb3228b153928429a1bbb2c3e486f1feec7b;hb=f1016340d797dbe6e0672e6e06a583baaafc738b;hp=e320e16cf5128461b7c3526ec248b4aaad6323ba;hpb=0b7c9b1e1215634b02cbd38d4e4ba101d6111ba8;p=clitk.git

diff --git a/common/clitkImageCommon.h b/common/clitkImageCommon.h
index e320e16..d3fefb3 100644
--- a/common/clitkImageCommon.h
+++ b/common/clitkImageCommon.h
@@ -17,15 +17,6 @@
 ======================================================================-====*/
 #ifndef CLITKIMAGECOMMON_H
 #define CLITKIMAGECOMMON_H
-/**
- -------------------------------------------------------------------
- * @file   clitkImageCommon.h
- * @author David Sarrut <David.Sarrut@creatis.insa-lyon.fr>
- * @date   07 Sep 2007 11:30:10
-
- * @brief  
-
- -------------------------------------------------------------------*/
 
 // clitk
 #include "clitkCommon.h"
@@ -35,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 {
@@ -52,6 +43,11 @@ namespace clitk {
   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)
 
@@ -85,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>
@@ -98,6 +94,24 @@ namespace clitk {
 				   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);
+
 #include "clitkImageCommon.txx"
 
 } // end namespace