X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitk%2Fsrc%2FbbitkImageRegion.cxx;h=66277c97ff40e3a620ed184f3dee70f47b119bc7;hb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;hp=e2890b4177ae3bd806e85ef60230769826b4bdb0;hpb=17ac9460f5ea5600d1065fbe3ee4ad826d7bb4fc;p=bbtk.git

diff --git a/packages/itk/src/bbitkImageRegion.cxx b/packages/itk/src/bbitkImageRegion.cxx
index e2890b4..66277c9 100644
--- a/packages/itk/src/bbitkImageRegion.cxx
+++ b/packages/itk/src/bbitkImageRegion.cxx
@@ -1,32 +1,39 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbitkImageRegion.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/15 14:57:58 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2012/11/16 08:50:39 $
+  Version:   $Revision: 1.7 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  This software is governed by the CeCILL-B license under French law and 
-*  abiding by the rules of distribution of free software. You can  use, 
-*  modify and/ or redistribute the software under the terms of the CeCILL-B 
-*  license as circulated by CEA, CNRS and INRIA at the following URL 
-*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-*  or in the file LICENSE.txt.
-*
-*  As a counterpart to the access to the source code and  rights to copy,
-*  modify and redistribute granted by the license, users are provided only
-*  with a limited warranty  and the software's author,  the holder of the
-*  economic rights,  and the successive licensors  have only  limited
-*  liability. 
-*
-*  The fact that you are presently reading this means that you have had
-*  knowledge of the CeCILL-B license and that you accept its terms.
-* ------------------------------------------------------------------------ */                                                                         
+
 
 
 #ifdef _USE_ITK_
@@ -42,21 +49,15 @@ namespace bbitk
 
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(itk,ImageRegionCreator);
 
-	/*
-	void ImageRegionCreator::bbUserSetDefaultValues()		{	}	
-	void ImageRegionCreator::bbUserInitializeProcessing()	{	}
-	void ImageRegionCreator::bbUserFinalizeProcessing()		{	}	
-	
-	template <unsigned int Dimension>
-	void ImageRegionCreator::bbUserSetDefaultValues()		{	}
-	
-	template <unsigned int Dimension>
-	void ImageRegionCreator::bbUserInitializeProcessing()	{	}
-	
-	template <unsigned int Dimension>
-	void ImageRegionCreator::bbUserFinalizeProcessing()		{	}	
-	*/
+  
+  void ImageRegionCreator::bbUserSetDefaultValues()		
+  {	}
+  void ImageRegionCreator::bbUserInitializeProcessing()	
+  {	}
+  void ImageRegionCreator::bbUserFinalizeProcessing()		
+  {	}
 	
+  
   void ImageRegionCreator::DoIt()
   {
     const std::vector<long>& index = bbGetInputIndex();
@@ -66,9 +67,9 @@ namespace bbitk
     unsigned long maxs = index.size() > size.size() ? index.size() : size.size();
     switch (maxs) 
       {
-      case 2 : DoIt<2>(); break;
-      case 3 : DoIt<3>(); break;
-      case 4 : DoIt<4>(); break;
+      case 2 : DoItForDimension<2>(); break;
+      case 3 : DoItForDimension<3>(); break;
+      case 4 : DoItForDimension<4>(); break;
       default : bbtkError("ImageRegionCreator : cannot build a region of dimension "<<maxs);
       }
      
@@ -76,7 +77,7 @@ namespace bbitk
   }
 
   template <unsigned int Dimension>
-  void ImageRegionCreator::DoIt()
+  void ImageRegionCreator::DoItForDimension()
   {
     std::vector<long> index = bbGetInputIndex();
     std::vector<long> size = bbGetInputSize();