OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0030581: Modeling Data - Standard_OutOfRange within Geom_BSplineSurface::LocateV()

Browse Source 
Geom2d_BSplineCurve::LocateU(),Geom_BSplineCurve::LocateU, Law_BSpline::LocateU()
Geom_BSplineSurface::LocateU() and Geom_BSplineSurface::LocateV()
have been corrected with missing range checks.
BSplCLib::Hunt() documentation has been corrected to reflect its actual implementation.
This commit is contained in:
kgv 2019-03-16 09:33:37 +03:00 committed by apn
parent 737e9a8da4
commit 437ef7713e
8 changed files with 71 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/BSplCLib/BSplCLib.cxx
View File

@ -73,31 +73,40 @@ public:
//purpose :
//=======================================================================
void BSplCLib::Hunt (const Array1OfReal& XX,
const Standard_Real X,
Standard_Integer& Ilc)
void BSplCLib::Hunt (const TColStd_Array1OfReal& theArray,
const Standard_Real theX,
Standard_Integer& theXPos)
{
// replaced by simple dichotomy (RLE)
Ilc = XX.Lower();
if (XX.Length() <= 1) return;
const Standard_Real *px = &XX(Ilc);
px -= Ilc;
if (X < px[Ilc]) {
Ilc--;
if (theArray.First() > theX)
{
theXPos = theArray.Lower() - 1;
return;
}
Standard_Integer Ihi = XX.Upper();
if (X > px[Ihi]) {
Ilc = Ihi + 1;
else if (theArray.Last() < theX)
{
theXPos = theArray.Upper() + 1;
return;
}
Standard_Integer Im;
while (Ihi - Ilc != 1) {
Im = (Ihi + Ilc) >> 1;
if (X > px[Im]) Ilc = Im;
else Ihi = Im;
theXPos = theArray.Lower();
if (theArray.Length() <= 1)
{
return;
}
Standard_Integer aHi = theArray.Upper();
while (aHi - theXPos != 1)
{
const Standard_Integer aMid = (aHi + theXPos) / 2;
if (theArray.Value (aMid) < theX)
{
theXPos = aMid;
}
else
{
aHi = aMid;
}
}
}

23
src/BSplCLib/BSplCLib.hxx
View File

@ -124,23 +124,16 @@ public:
DEFINE_STANDARD_ALLOC
//! This routine searches the position of the real
//! value X in the ordered set of real values XX.
//! This routine searches the position of the real value theX
//! in the monotonically increasing set of real values theArray using bisection algorithm.
//!
//! The elements in the table XX are either
//! monotonically increasing or monotonically
//! decreasing.
//! If the given value is out of range or array values, algorithm returns either
//! theArray.Lower()-1 or theArray.Upper()+1 depending on theX position in the ordered set.
//!
//! The input value Iloc is used to initialize the
//! algorithm : if Iloc is outside of the bounds
//! [XX.Lower(), -- XX.Upper()] the bisection algorithm
//! is used else the routine searches from a previous
//! known position by increasing steps then converges
//! by bisection.
//!
//! This routine is used to locate a knot value in a
//! set of knots.
Standard_EXPORT static void Hunt (const TColStd_Array1OfReal& XX, const Standard_Real X, Standard_Integer& Iloc);
//! This routine is used to locate a knot value in a set of knots.
Standard_EXPORT static void Hunt (const TColStd_Array1OfReal& theArray,
const Standard_Real theX,
Standard_Integer& theXPos);
//! Computes the index of the knots value which gives
//! the start point of the curve.

4
src/GCPnts/GCPnts_QuasiUniformDeflection.pxx
View File

@ -215,7 +215,9 @@ static Standard_Boolean PerformComposite (TColStd_SequenceOfReal& Parameters,
Standard_Real Ua = U1;
for (Standard_Integer Index = PIndex;;)
{
Standard_Real Ub = Min (U2, TI (Index + 1));
Standard_Real Ub = Index + 1 <= TI.Upper()
? Min (U2, TI (Index + 1))
: U2;
if (!PerformCurve (Parameters, Points, C, Deflection,
Ua, Ub, EPSILON, Continuity))
return Standard_False;

4
src/GCPnts/GCPnts_UniformDeflection.pxx
View File

@ -174,7 +174,9 @@ static Standard_Boolean PerformComposite (TColStd_SequenceOfReal& Parameters,
Standard_Real Ua = U1;
for (Standard_Integer Index = PIndex;;)
{
Standard_Real Ub = Min (U2, TI (Index + 1));
Standard_Real Ub = Index + 1 <= TI.Upper()
? Min (U2, TI (Index + 1))
: U2;
if (!PerformCurve (Parameters, Points, C, Deflection,
Ua, Ub, EPSILON, WithControl))
{

15
src/Geom/Geom_BSplineCurve_1.cxx
View File

@ -14,14 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
// 03-02-97 : pmn ->LocateU sur Periodic (PRO6963),
// bon appel a LocateParameter (PRO6973) et mise en conformite avec
// le cdl de LocateU, lorsque U est un noeud (PRO6988)
#define No_Standard_OutOfRange
#define No_Standard_DimensionError
#include <BSplCLib.hxx>
#include <Geom_BSplineCurve.hxx>
#include <Geom_Geometry.hxx>
@ -809,7 +801,12 @@ void Geom_BSplineCurve::LocateU
else {
I1 = 1;
BSplCLib::Hunt (CKnots, NewU, I1);
while ( Abs( CKnots(I1+1) - NewU) <= PParametricTolerance) I1++;
I1 = Max (Min (I1, CKnots.Upper()), CKnots.Lower());
while (I1 + 1 <= CKnots.Upper()
&& Abs (CKnots (I1 + 1) - NewU) <= PParametricTolerance)
{
I1++;
}
if ( Abs( CKnots(I1) - NewU) <= PParametricTolerance) {
I2 = I1;
}

18
src/Geom/Geom_BSplineSurface_1.cxx
View File

@ -23,10 +23,6 @@
// + bon appel a LocateParameter (PRO6973).
// RBD : 15/10/98 ; Le cache est desormais defini sur [-1,1] (pro15537).
#define No_Standard_OutOfRange
#define No_Standard_DimensionError
#include <BSplCLib.hxx>
#include <BSplSLib.hxx>
#include <Geom_BSplineCurve.hxx>
@ -1360,7 +1356,12 @@ void Geom_BSplineSurface::LocateU
else {
I1 = 1;
BSplCLib::Hunt (Knots, NewU, I1);
while ( Abs( Knots(I1+1) - NewU) <= PParametricTolerance) I1++;
I1 = Max (Min (I1, Knots.Upper()), Knots.Lower());
while (I1 + 1 <= Knots.Upper()
&& Abs (Knots (I1 + 1) - NewU) <= PParametricTolerance)
{
I1++;
}
if ( Abs( Knots(I1) - NewU) <= PParametricTolerance) {
I2 = I1;
}
@ -1408,7 +1409,12 @@ void Geom_BSplineSurface::LocateV
else {
I1 = 1;
BSplCLib::Hunt (Knots, NewV, I1);
while ( Abs( Knots(I1+1) - NewV) <= PParametricTolerance) I1++;
I1 = Max (Min (I1, Knots.Upper()), Knots.Lower());
while (I1 + 1 <= Knots.Upper()
&& Abs (Knots (I1 + 1) - NewV) <= PParametricTolerance)
{
I1++;
}
if ( Abs( Knots(I1) - NewV) <= PParametricTolerance) {
I2 = I1;
}

15
src/Geom2d/Geom2d_BSplineCurve_1.cxx
View File

@ -14,14 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
// 03-02-97 : pmn ->LocateU sur Periodic (PRO6963),
// bon appel a LocateParameter (PRO6973) et mise en conformite avec
// le cdl de LocateU, lorsque U est un noeud (PRO6988)
#define No_Standard_OutOfRange
#define No_Standard_DimensionError
#include <BSplCLib.hxx>
#include <Geom2d_BSplineCurve.hxx>
#include <Geom2d_Geometry.hxx>
@ -820,7 +812,12 @@ void Geom2d_BSplineCurve::LocateU
else {
I1 = 1;
BSplCLib::Hunt (CKnots, NewU, I1);
while ( Abs( CKnots(I1+1) - NewU) <= PParametricTolerance) I1++;
I1 = Max (Min (I1, CKnots.Upper()), CKnots.Lower());
while (I1 + 1 <= CKnots.Upper()
&& Abs (CKnots (I1 + 1) - NewU) <= PParametricTolerance)
{
I1++;
}
if ( Abs( CKnots(I1) - NewU) <= PParametricTolerance) {
I2 = I1;
}

7
src/Law/Law_BSpline.cxx
View File

@ -1943,7 +1943,12 @@ void Law_BSpline::LocateU
else {
I1 = 1;
BSplCLib::Hunt (CKnots, NewU, I1);
while ( Abs( CKnots(I1+1) - NewU) <= Abs(ParametricTolerance)) I1++;
I1 = Max (Min (I1, CKnots.Upper()), CKnots.Lower());
while (I1 + 1 <= CKnots.Upper()
&& Abs (CKnots (I1 + 1) - NewU) <= Abs(ParametricTolerance))
{
I1++;
}
if ( Abs( CKnots(I1) - NewU) <= Abs(ParametricTolerance)) {
I2 = I1;
}