X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaVtk.h;h=c1b3c02efbecfe19ad769df9e0387467db7b62a9;hb=b4cd33464fc8cc5658da64fe75c3f689169f0cb0;hp=7eb5b18e4e75066d0385b90e394c71910ea66812;hpb=7c20ef5b6b9bcfe07f7b8e887360b70fc399962c;p=crea.git

diff --git a/src/creaVtk.h b/src/creaVtk.h
index 7eb5b18..c1b3c02 100644
--- a/src/creaVtk.h
+++ b/src/creaVtk.h
@@ -1,20 +1,50 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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);
-
+  
+  template <typename T>
+  /*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>
@@ -39,7 +69,7 @@ namespace crea
   */
 }
 
-#include <creaVtk.txx>
+#include "creaVtk.txx"
 
 
 #endif // USE_VTK