X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvMesh.h;h=d661af971a1ded705cb094c136cf0841383dd367;hb=HEAD;hp=ce5db14b9830d1b8c5a0665b8ccf250bbb91a3b8;hpb=931a42358442f4ee4f314613c991c838d4b4e3b7;p=clitk.git

diff --git a/vv/vvMesh.h b/vv/vvMesh.h
index ce5db14..d661af9 100644
--- a/vv/vvMesh.h
+++ b/vv/vvMesh.h
@@ -1,30 +1,22 @@
 /*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
- Program:   vv
- Language:  C++
- Author :   Joel Schaerer (joel.schaerer@insa-lyon.fr)
- Program:   vv
+  Authors belong to: 
+  - University of LYON              http://www.universite-lyon.fr/
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
+  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
-Copyright (C) 2008
-Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
-CREATIS-LRMN http://www.creatis.insa-lyon.fr
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 3 of the License.
+  It is distributed under dual licence
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-=========================================================================*/
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+===========================================================================**/
 #ifndef vvMesh_h
 #define vvMesh_h
-
 #include <string>
 #include <utility>
 #include <vector>
@@ -55,12 +47,12 @@ public:
     void AddMesh(vtkPolyData* p);
     ///Removes all meshes in the object
     void RemoveMeshes();
-    unsigned int GetNumberOfMeshes() { return meshes.size(); }
+    unsigned int GetNumberOfMeshes() { return (unsigned int)meshes.size(); }
 
     vtkImageData* GetMask(unsigned int i) const {return masks[i];}
     void AddMask(vtkImageData* im);
     void RemoveMasks();
-    unsigned int GetNumberOfMasks() { return masks.size(); }
+    unsigned int GetNumberOfMasks() { return (unsigned int)masks.size(); }
 
     ///Pretty-print information about the mesh
     void Print() const;