X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkImageCommon.h;h=38800c4c8e4796aae31254da5ac0cf6b9578b5bc;hb=1f2793a945d2ea05308d61d79513de5d664f092f;hp=11ddaba67441645957ac8f1aa2aa4e13917626fc;hpb=0083c3fb2c66812489631c7551709d121de51625;p=clitk.git

diff --git a/common/clitkImageCommon.h b/common/clitkImageCommon.h
index 11ddaba..38800c4 100644
--- a/common/clitkImageCommon.h
+++ b/common/clitkImageCommon.h
@@ -1,17 +1,25 @@
-#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
+/*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
+
+  Authors belong to: 
+  - University of LYON              http://www.universite-lyon.fr/
+  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
+
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
 
- * @brief  
+  It is distributed under dual licence
 
- -------------------------------------------------------------------*/
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+======================================================================-====*/
+#ifndef CLITKIMAGECOMMON_H
+#define CLITKIMAGECOMMON_H
 
 // clitk
-#include "clitkCommon.h"
+//#include "clitkCommon.h"
 
 // itk
 #include "itkImage.h"
@@ -19,8 +27,11 @@
 #include "itkImageSeriesReader.h"
 #include "itkImageFileWriter.h"
 #include "gdcmFile.h"
-#include "gdcmFileHelper.h"
-
+#if GDCM_MAJOR_VERSION == 2
+  #include "gdcmReader.h"
+#else
+  #include "gdcmFileHelper.h"
+#endif
 
 namespace clitk {
   
@@ -35,6 +46,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)
 
@@ -81,6 +97,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