#3418 creaMaracasVisu Feature New Normal - ManualPaint_model with openmp

[creaMaracasVisu.git] / lib / maracasVisuLib / src / kernel / include / curve.hxx

diff --git a/lib/maracasVisuLib/src/kernel/include/curve.hxx b/lib/maracasVisuLib/src/kernel/include/curve.hxx
index d8118af669e42cd5eb519e4e665aa9bb004bd8fb..692c3f94ea31903b675ea2852d84d4f0a9d60eee 100644 (file)
--- a/lib/maracasVisuLib/src/kernel/include/curve.hxx
+++ b/lib/maracasVisuLib/src/kernel/include/curve.hxx
@@ -1,10 +1,35 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 /*=========================================================================
 
   Program:   wxMaracas
   Module:    $RCSfile: curve.hxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 13:55:07 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2012/11/15 14:15:31 $
+  Version:   $Revision: 1.3 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -34,17 +59,17 @@ class MAR_KERNEL_EXPORT kCurve
 
     kCurve& operator=( const kCurve& r );
 
-    uint getDimension( ) const
+    uint32_t getDimension( ) const
     {
       return( _dimension );
     }
 
-    uint getStateDimension( ) const
+    uint32_t getStateDimension( ) const
     {
       return( _stateDim );
     }
 
-    uint getClosestControlPoint( double* p );
+    uint32_t getClosestControlPoint( double* p );
 
     void getPoint( double* p, double s );
     void getState( double* st, double s );
@@ -55,7 +80,7 @@ class MAR_KERNEL_EXPORT kCurve
     void addControlPoint( double* cp, double* sp );
     void getControlPoint( int i, double* cp, double* sp );
     void setControlPoint( int i, double* cp, double* sp );
-    uint getNumberOfControlPoints( )
+    uint32_t getNumberOfControlPoints( )
     {
       return( _controlPoints.size( ) );
     }
@@ -82,8 +107,8 @@ class MAR_KERNEL_EXPORT kCurve
     
     std::vector< double* > _controlPoints;
     std::vector< double* > _controlState;
-    uint _dimension;
-    uint _stateDim;
+    uint32_t _dimension;
+    uint32_t _stateDim;
 
     private: