X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaVtk.h;h=636cf5cd044f47cff1825090845ad4abe67ed050;hb=c8a0837d54a0c9004e53eb92ff652a8e996a2fad;hp=3b205d1f54d935dc890b6dd5b5f181c05f843cfd;hpb=bfb05457f0fad7329768d34492a2a2149195471a;p=crea.git

diff --git a/src/creaVtk.h b/src/creaVtk.h
index 3b205d1..636cf5c 100644
--- a/src/creaVtk.h
+++ b/src/creaVtk.h
@@ -1,25 +1,55 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ 
+*/                                                                         
+
+
 #ifndef __creaVtk_h_INCLUDED__
 #define __creaVtk_h_INCLUDED__
 
 #ifdef USE_VTK
 
-#include <creaSystem.h>
+#include "creaSystem.h"
 #include <vtkImageData.h>
 
 namespace crea
 {
-
   template <class T>
-  vtkImageData* CREA_EXPORT NewVtkImageDataFromRaw( T* data,
-						    int nx, 
-						    int ny,
-						    int nz);
 
+  CREA_EXPORT vtkImageData* NewVtkImageDataFromRaw( T* data,
+                                                    int nx, 
+                                                    int ny,
+                                                    int nz,
+                                                    bool do_not_desalloc = true);
+  /*
+    // Already provided by vtkTypeTraits<T>::VTKTypeID()
   template <class T>
-  vtkIdType GetVtkIdType(T&) { return VTK_VOID; }
+  int GetVtkType(T&) { return VTK_VOID; }
 
 #define SPECIALIZE_GETVTKIDTYPE(T,R) \
-  template <> vtkIdType GetVtkIdType<T>(T&) { return R; }  
+  template <> int GetVtkType<T>(T&) { return R; }  
 
   SPECIALIZE_GETVTKIDTYPE(char,VTK_CHAR)
   SPECIALIZE_GETVTKIDTYPE(signed char,VTK_SIGNED_CHAR)
@@ -34,9 +64,10 @@ namespace crea
   SPECIALIZE_GETVTKIDTYPE(double,VTK_DOUBLE)
 
 #undef SPECIALIZE_GETVTKIDTYPE
+  */
 }
 
-#include <creaVtk.txx>
+#include "creaVtk.txx"
 
 
 #endif // USE_VTK