X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitk%2Fsrc%2FbbitkImage.h;h=9f74cec6f3aa7bdc203351eb5837c1f17c8086de;hb=79d06fa7c6441e99291ad3a1949d241f336573d5;hp=974582786df4a539432119bd9b90937c5882cde8;hpb=78bef0c5fcf50c4d4ba779abf2ba88e6a80851b3;p=bbtk.git

diff --git a/packages/itk/src/bbitkImage.h b/packages/itk/src/bbitkImage.h
index 9745827..9f74cec 100644
--- a/packages/itk/src/bbitkImage.h
+++ b/packages/itk/src/bbitkImage.h
@@ -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: bbitkImage.h,v $
   Language:  C++
-  Date:      $Date: 2009/06/24 08:08:57 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2012/11/16 08:50:39 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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_
@@ -294,7 +301,9 @@ namespace bbitk
     BBTK_SWITCH_ITK_IMAGE_uint32_t_4(TYPE_INFO,FUN,)	\
     BBTK_SWITCH_ITK_IMAGE_float_4(TYPE_INFO,FUN,)	\
     BBTK_SWITCH_ITK_IMAGE_double_4(TYPE_INFO,FUN,)	\
-    BBTK_END_TEMPLATE_SWITCH(TYPE_INFO)			       
+  BBTK_END_TEMPLATE_SWITCH(TYPE_INFO)
+
+
 
   /// General macro which calls the template function FUN instanciated 
   /// on the right type of itk image depending on the value of TYPE_INFO (which must be of type type_info). 
@@ -308,7 +317,7 @@ namespace bbitk
     BBTK_SWITCH_ITK_IMAGE_uint32_t_3(TYPE_INFO,FUN,)	\
     BBTK_SWITCH_ITK_IMAGE_float_3(TYPE_INFO,FUN,)	\
     BBTK_SWITCH_ITK_IMAGE_double_3(TYPE_INFO,FUN,)	\
-    BBTK_END_TEMPLATE_SWITCH_MESSAGE(TYPE_INFO,ERROR_MESSAGE)
+  BBTK_END_TEMPLATE_SWITCH_MESSAGE(TYPE_INFO,ERROR_MESSAGE)
 
 
   /// General macro which calls the template function FUN instanciated 
@@ -340,7 +349,7 @@ namespace bbitk
     BBTK_SWITCH_ITK_IMAGE_uint32_t_4(TYPE_INFO,FUN,c)	\
     BBTK_SWITCH_ITK_IMAGE_float_4(TYPE_INFO,FUN,c)	\
     BBTK_SWITCH_ITK_IMAGE_double_4(TYPE_INFO,FUN,c)	\
-    BBTK_END_TEMPLATE_SWITCH(TYPE_INFO)      
+  BBTK_END_TEMPLATE_SWITCH(TYPE_INFO)      
 
 #define BBTK_GITIFPTI_DIM(DIM)				\
   if (pti == typeid(unsigned char))			\
@@ -419,7 +428,7 @@ protected:
 };
 
 #define BBTK_BUILD_ITK_IMAGE_FUNCTION_MAPPING(MAP,FUN)                         \
-  MAP.value<bbtk::Image_int8_t_2_ptr>() = FUN<bbtk::Image_int8_t_2_ptr>;       \
+    MAP.value<bbtk::Image_int8_t_2_ptr>() = FUN<bbtk::Image_int8_t_2_ptr>;     \
     MAP.value<bbtk::Image_int16_t_2_ptr>() = FUN<bbtk::Image_int16_t_2_ptr>;   \
     MAP.value<bbtk::Image_int32_t_2_ptr>() = FUN<bbtk::Image_int32_t_2_ptr>;   \
     MAP.value<bbtk::Image_uint8_t_2_ptr>() = FUN<bbtk::Image_uint8_t_2_ptr>;   \