X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitk%2Fsrc%2FbbitkImage.h;h=f44317be61c87dbf9f906b146dbe9be6e3ecc8ac;hb=22ad7fa08e3dac717011143e08e10c8435c3c7c2;hp=2e674625dfdc4fe6e9d6722a4d888f6447bfd809;hpb=d73a7833a28e6111e1e805efae5df3ab18a240e2;p=bbtk.git

diff --git a/packages/itk/src/bbitkImage.h b/packages/itk/src/bbitkImage.h
index 2e67462..f44317b 100644
--- 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: 2008/10/17 08:18:21 $
+  Version:   $Revision: 1.4 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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__
@@ -344,7 +375,9 @@ namespace bbitk
     else 
       {
 		//bbtkGlobalError("GetImageTypeInfoFromPixelTypeInfo : itk::Images not compiled for dim "<<dim);
+	return typeid(void);
       }
+    return typeid(void);
   }
 
 
@@ -532,6 +565,18 @@ n += std::string("ptr"); \
  n+= HumanTypeName<TYPE>(); \
 	n += std::string(#DIM); \
 n+= std::string("ptr"); \
+	return n; }							\
+template <> inline std::string HumanTypeName< bbitk::Image_##TYPE##_##DIM##_cptr >()		\
+  { std::string n("itkImage"); \
+	n+= HumanTypeName<TYPE>();\
+ n += std::string(#DIM);\
+n += std::string("cptr"); \
+	return n; }							\
+    template <> inline std::string HumanTypeName< bbitk::Image_##TYPE##_##DIM##_cptr >(const bbitk::Image_##TYPE##_##DIM##_cptr &)	\
+    { std::string n("itkImage");\
+ n+= HumanTypeName<TYPE>(); \
+	n += std::string(#DIM); \
+n+= std::string("cptr"); \
 	return n; }
 
 //BBTK_HUMAN_READABLE_ITK_IMAGE(int8_t,2);