X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2Finclude%2Fcurve.cxx;h=bfcb43521627dad1744071ef51e42bd77f33dc7f;hb=cecf61997249f6e44a9ce798cb0cf54085473af6;hp=f7ce241ac637680c443430190a4a248502de0c8b;hpb=7cdd257ac8ad23e435cfbcd768805ccd40acdad3;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/kernel/include/curve.cxx b/lib/maracasVisuLib/src/kernel/include/curve.cxx index f7ce241..bfcb435 100644 --- a/lib/maracasVisuLib/src/kernel/include/curve.cxx +++ b/lib/maracasVisuLib/src/kernel/include/curve.cxx @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: curve.cxx,v $ Language: C++ - Date: $Date: 2010/04/20 14:42:45 $ - Version: $Revision: 1.2 $ + Date: $Date: 2010/04/20 16:11:41 $ + Version: $Revision: 1.3 $ Copyright: (c) 2002, 2003 License: @@ -103,7 +103,7 @@ kCurve& kCurve::operator=( const kCurve& r ) } // ------------------------------------------------------------------------- -uint kCurve::getClosestControlPoint( double* p ) +uint32_t kCurve::getClosestControlPoint( double* p ) { int res; // PS -> gslobj_vector vp( p, _dimension ), cp( _dimension ); //PS @@ -184,7 +184,7 @@ void kCurve::getNormal( double* n, double s ) void kCurve::getBinormal( double* b, double s ) { // PS -> //gslobj_vector tg( _dimension ), n( _dimension ); //PS - marVector tg( _dimension ), n( _dimension ); + marVector tg( _dimension ), n( _dimension ); double t; int i; @@ -311,7 +311,7 @@ double kCurve::projectOverControlPoints( double* pr, double* pt ) marVector xpr( pr, 3 ); double sina, sinn, cosa, cosn, tha, thn; double d, e, t, l, tca, tcn, lca, lcn; - uint icp = getClosestControlPoint( pt ); + uint32_t icp = getClosestControlPoint( pt ); getControlPoint( icp, ( double* )xpc, NULL );