From 6143f12f365f6f3b1ef6c4b7b5380d15b75c77cb Mon Sep 17 00:00:00 2001 From: aml Date: Thu, 17 Mar 2016 14:22:22 +0300 Subject: [PATCH] 0027275: Unused formal parameter in BSplCLib::EvalBsplineBasis Unused formal parameter is deleted. --- src/BSplCLib/BSplCLib.cxx | 6 ++---- src/BSplCLib/BSplCLib.hxx | 8 +++++++- src/BSplCLib/BSplCLib_2.cxx | 7 ++----- src/BSplCLib/BSplCLib_CurveComputation.gxx | 3 +-- src/BSplSLib/BSplSLib.cxx | 6 ++---- src/FairCurve/FairCurve_DistributionOfJerk.cxx | 2 +- src/FairCurve/FairCurve_DistributionOfSagging.cxx | 2 +- src/FairCurve/FairCurve_DistributionOfTension.cxx | 2 +- src/GeomLib/GeomLib_DenominatorMultiplier.cxx | 5 +---- 9 files changed, 18 insertions(+), 23 deletions(-) diff --git a/src/BSplCLib/BSplCLib.cxx b/src/BSplCLib/BSplCLib.cxx index e4ab7f5870..f6a7a298d8 100644 --- a/src/BSplCLib/BSplCLib.cxx +++ b/src/BSplCLib/BSplCLib.cxx @@ -3211,8 +3211,7 @@ void BSplCLib::Eval BSplCLib_LocalMatrix BsplineBasis (LocalRequest, Order); ErrorCode = - BSplCLib::EvalBsplineBasis(1, - LocalRequest, + BSplCLib::EvalBsplineBasis(LocalRequest, Order, FlatKnots, LocalParameter, @@ -3410,8 +3409,7 @@ void BSplCLib::Eval BSplCLib_LocalMatrix BsplineBasis (LocalRequest, Order); ErrorCode = - BSplCLib::EvalBsplineBasis(1, - LocalRequest, + BSplCLib::EvalBsplineBasis(LocalRequest, Order, FlatKnots, LocalParameter, diff --git a/src/BSplCLib/BSplCLib.hxx b/src/BSplCLib/BSplCLib.hxx index f1dba6fddb..b2f9478384 100644 --- a/src/BSplCLib/BSplCLib.hxx +++ b/src/BSplCLib/BSplCLib.hxx @@ -702,7 +702,13 @@ public: //! value of Nth derivative of first non vanishing //! Bspline function which has Index FirstNonZeroBsplineIndex //! if N <= DerivativeOrder + 1 - Standard_EXPORT static Standard_Integer EvalBsplineBasis (const Standard_Integer Side, const Standard_Integer DerivativeOrder, const Standard_Integer Order, const TColStd_Array1OfReal& FlatKnots, const Standard_Real Parameter, Standard_Integer& FirstNonZeroBsplineIndex, math_Matrix& BsplineBasis, const Standard_Boolean isPeriodic = Standard_False); + Standard_EXPORT static Standard_Integer EvalBsplineBasis (const Standard_Integer DerivativeOrder, + const Standard_Integer Order, + const TColStd_Array1OfReal& FlatKnots, + const Standard_Real Parameter, + Standard_Integer& FirstNonZeroBsplineIndex, + math_Matrix& BsplineBasis, + const Standard_Boolean isPeriodic = Standard_False); //! This Builds a fully blown Matrix of //! (ni) diff --git a/src/BSplCLib/BSplCLib_2.cxx b/src/BSplCLib/BSplCLib_2.cxx index 575753d1f8..41b0835a30 100644 --- a/src/BSplCLib/BSplCLib_2.cxx +++ b/src/BSplCLib/BSplCLib_2.cxx @@ -346,8 +346,7 @@ BSplCLib::BuildBSpMatrix(const TColStd_Array1OfReal& Parameters, for (ii = Parameters.Lower() ; ii <= Parameters.Upper() ; ii++) { ErrorCode = - BSplCLib::EvalBsplineBasis(1, - ContactOrderArray(ii), + BSplCLib::EvalBsplineBasis(ContactOrderArray(ii), Order, FlatKnots, Parameters(ii), @@ -433,9 +432,7 @@ BSplCLib::FactorBandedMatrix(math_Matrix& Matrix, Standard_Integer BSplCLib::EvalBsplineBasis -//(const Standard_Integer Side, // = 1 rigth side, -1 left side -(const Standard_Integer , // = 1 rigth side, -1 left side - const Standard_Integer DerivativeRequest, +(const Standard_Integer DerivativeRequest, const Standard_Integer Order, const TColStd_Array1OfReal& FlatKnots, const Standard_Real Parameter, diff --git a/src/BSplCLib/BSplCLib_CurveComputation.gxx b/src/BSplCLib/BSplCLib_CurveComputation.gxx index 3a4abb0fb4..d9201e2c77 100644 --- a/src/BSplCLib/BSplCLib_CurveComputation.gxx +++ b/src/BSplCLib/BSplCLib_CurveComputation.gxx @@ -1230,8 +1230,7 @@ void BSplCLib::MovePoint (const Standard_Real U, math_Matrix BSplineBasis(1, 1, 1, Degree+1); Standard_Integer ErrorCode = - BSplCLib::EvalBsplineBasis(1, - 0, + BSplCLib::EvalBsplineBasis(0, Degree+1, FlatKnots, U, diff --git a/src/BSplSLib/BSplSLib.cxx b/src/BSplSLib/BSplSLib.cxx index 877e17b084..da58821e0d 100644 --- a/src/BSplSLib/BSplSLib.cxx +++ b/src/BSplSLib/BSplSLib.cxx @@ -2805,8 +2805,7 @@ void BSplSLib::MovePoint (const Standard_Real U, Standard_Integer UFirstNonZeroBsplineIndex; math_Matrix UBSplineBasis(1, 1, 1, UDegree+1); - Standard_Integer ErrorCod1 = BSplCLib::EvalBsplineBasis(1, - 0, + Standard_Integer ErrorCod1 = BSplCLib::EvalBsplineBasis(0, UDegree+1, UFlatKnots, U, @@ -2816,8 +2815,7 @@ void BSplSLib::MovePoint (const Standard_Real U, Standard_Integer VFirstNonZeroBsplineIndex; math_Matrix VBSplineBasis(1, 1, 1, VDegree+1); - Standard_Integer ErrorCod2 = BSplCLib::EvalBsplineBasis(1, - 0, + Standard_Integer ErrorCod2 = BSplCLib::EvalBsplineBasis(0, VDegree+1, VFlatKnots, V, diff --git a/src/FairCurve/FairCurve_DistributionOfJerk.cxx b/src/FairCurve/FairCurve_DistributionOfJerk.cxx index e5c42acf3d..0a9d15ec62 100644 --- a/src/FairCurve/FairCurve_DistributionOfJerk.cxx +++ b/src/FairCurve/FairCurve_DistributionOfJerk.cxx @@ -60,7 +60,7 @@ Standard_Boolean FairCurve_DistributionOfJerk::Value(const math_Vector& TParam, // Dans EvalBsplineBasis C"' <=> DerivOrder = 4 // et il faut ajouter 1 rang dans la matrice Base => 5 rangs - ier = BSplCLib::EvalBsplineBasis(1, 3, MyBSplOrder, + ier = BSplCLib::EvalBsplineBasis(3, MyBSplOrder, MyFlatKnots->Array1(), TParam(TParam.Lower()), FirstNonZero, Base ); if (ier != 0) return Standard_False; diff --git a/src/FairCurve/FairCurve_DistributionOfSagging.cxx b/src/FairCurve/FairCurve_DistributionOfSagging.cxx index 85a1a7c762..e600810e02 100644 --- a/src/FairCurve/FairCurve_DistributionOfSagging.cxx +++ b/src/FairCurve/FairCurve_DistributionOfSagging.cxx @@ -55,7 +55,7 @@ Standard_Boolean FairCurve_DistributionOfSagging::Value(const math_Vector& TPara // Dans EvalBsplineBasis C" <=> DerivOrder = 3 // et il faut ajouter 1 rang dans la matrice Base => 4 rang - ier = BSplCLib::EvalBsplineBasis(1, 2, MyBSplOrder, + ier = BSplCLib::EvalBsplineBasis(2, MyBSplOrder, MyFlatKnots->Array1(), TParam(TParam.Lower()), FirstNonZero, Base ); if (ier != 0) return Standard_False; diff --git a/src/FairCurve/FairCurve_DistributionOfTension.cxx b/src/FairCurve/FairCurve_DistributionOfTension.cxx index dc1c5ef100..a98a17c7f2 100644 --- a/src/FairCurve/FairCurve_DistributionOfTension.cxx +++ b/src/FairCurve/FairCurve_DistributionOfTension.cxx @@ -62,7 +62,7 @@ Standard_Boolean FairCurve_DistributionOfTension::Value(const math_Vector& TPara // Dans EvalBsplineBasis C' <=> DerivOrder = 2 // et il faut ajouter 1 rang dans la matrice Base => 3 rang - ier = BSplCLib::EvalBsplineBasis( 1, 1, MyBSplOrder, + ier = BSplCLib::EvalBsplineBasis(1, MyBSplOrder, MyFlatKnots->Array1(), TParam(TParam.Lower()), FirstNonZero, Base ); if (ier != 0) return Standard_False; diff --git a/src/GeomLib/GeomLib_DenominatorMultiplier.cxx b/src/GeomLib/GeomLib_DenominatorMultiplier.cxx index 59f962e2eb..ec55f88408 100644 --- a/src/GeomLib/GeomLib_DenominatorMultiplier.cxx +++ b/src/GeomLib/GeomLib_DenominatorMultiplier.cxx @@ -107,7 +107,6 @@ Standard_Real GeomLib_DenominatorMultiplier::Value(const Standard_Real UParamet Standard_Integer index,i; BSplCLib::EvalBsplineBasis(1, - 1, 4, myKnotFlatVector, 0.0, @@ -116,7 +115,6 @@ Standard_Real GeomLib_DenominatorMultiplier::Value(const Standard_Real UParamet B1prim0=BSplineBasisDeriv(2,2); BSplCLib::EvalBsplineBasis(1, - 1, 4, myKnotFlatVector, 1.0, @@ -125,8 +123,7 @@ Standard_Real GeomLib_DenominatorMultiplier::Value(const Standard_Real UParamet Bprelastprim1=BSplineBasisDeriv(2,3); math_Matrix BSplineBasisValue(1,1,1,4,0.0); - BSplCLib::EvalBsplineBasis(1, - 0, + BSplCLib::EvalBsplineBasis(0, 4, myKnotFlatVector, UParameter, -- 2.20.1