*** empty log message ***

[bbtk.git] / packages / itk / src / bbitkImage.h

diff --git a/packages/itk/src/bbitkImage.h b/packages/itk/src/bbitkImage.h
index 88eea1af5f5bf80ce391580fd1e8bd07f8db1d04..000c95bbd5d88d341e9a4a8ac970f405c2d569ef 100644 (file)
--- a/packages/itk/src/bbitkImage.h
+++ b/packages/itk/src/bbitkImage.h
@@ -1,3 +1,34 @@
+/*=========================================================================                                                                               
+  Program:   bbtk
+  Module:    $RCSfile: bbitkImage.h,v $
+  Language:  C++
+  Date:      $Date: 2009/05/18 10:45:43 $
+  Version:   $Revision: 1.6 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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_
 
 #ifndef __BBITKIMAGE_H_INCLUDED__
@@ -206,7 +237,7 @@ namespace bbitk
 #    define BBTK_SWITCH_ITK_IMAGE_uint16_t_4(TYPE_INFO,FUN,CONST)
 #  endif
 #  ifdef BBTK_ITK_IMAGE_TYPE_uint32_t
-#    define BBTK_SWITCH_ITK_IMAGE_uint32_t_4(TYPE_INFO,FUN,CONST)              \
+#    define BBTK_SWITCH_ITK_IMAGE_uint32_t_4(TYPE_INFO,FUN,CONST)      \
   TEMPLATE_SWITCH(TYPE_INFO,Image_uint32_t_4_##CONST##ptr,FUN,Image_uint32_t_4)
 #  else
 #    define BBTK_SWITCH_ITK_IMAGE_uint32_t_4(TYPE_INFO,FUN,CONST)
@@ -344,7 +375,9 @@ namespace bbitk
     else 
       {
                //bbtkGlobalError("GetImageTypeInfoFromPixelTypeInfo : itk::Images not compiled for dim "<<dim);
+       return typeid(void);
       }
+    return typeid(void);
   }
 
 
@@ -552,13 +585,13 @@ n+= std::string("cptr"); \
 
        
 #define BBTK_HUMAN_READABLE_ITK_IMAGES_DIM(DIM)        \
-  BBTK_HUMAN_READABLE_ITK_IMAGE(int8_t,DIM);           \
+  BBTK_HUMAN_READABLE_ITK_IMAGE(int8_t,DIM);   \
     BBTK_HUMAN_READABLE_ITK_IMAGE(uint8_t,DIM);        \
     BBTK_HUMAN_READABLE_ITK_IMAGE(int16_t,DIM);        \
-    BBTK_HUMAN_READABLE_ITK_IMAGE(uint16_t,DIM);       \
+    BBTK_HUMAN_READABLE_ITK_IMAGE(uint16_t,DIM);\
     BBTK_HUMAN_READABLE_ITK_IMAGE(int32_t,DIM);        \
-    BBTK_HUMAN_READABLE_ITK_IMAGE(uint32_t,DIM);       \
-    BBTK_HUMAN_READABLE_ITK_IMAGE(float,DIM);          \
+    BBTK_HUMAN_READABLE_ITK_IMAGE(uint32_t,DIM);\
+    BBTK_HUMAN_READABLE_ITK_IMAGE(float,DIM);  \
     BBTK_HUMAN_READABLE_ITK_IMAGE(double,DIM)
   
   BBTK_HUMAN_READABLE_ITK_IMAGES_DIM(2);