OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0027774: Constructor GeomPlate_BuildAveragePlane crashes if two input normals are parallel to each other

Browse Source 
Normalization has been avoided in case of impossibility.
This commit is contained in:
nbv 2016-08-15 15:57:11 +03:00 committed by bugmaster
parent b47bcd7ea7
commit 032881f4fb
1 changed files with 56 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/GeomPlate/GeomPlate_BuildAveragePlane.cxx
View File

@ -106,10 +106,24 @@ myPts(Pts)
if (NN == 1) if (NN == 1)
BestVec = Normals(1); BestVec = Normals(1);
else if (NN == 2) else if (NN == 2)
{
BestVec = Normals(1) + Normals(2);
const Standard_Real aSqMagn = BestVec.SquareMagnitude();
if(aSqMagn < Precision::SquareConfusion())
{ {
BestVec = Normals(1) + Normals(2); const Standard_Real aSq1 = Normals(1).SquareMagnitude(),
BestVec.Normalize(); aSq2 = Normals(2).SquareMagnitude();
if(aSq1 > aSq2)
BestVec = Normals(1).Normalized();
else
BestVec = Normals(2).Normalized();
} }
else
{
BestVec.Divide(sqrt(aSqMagn));
}
}
else //the common case else //the common case
{ {
Standard_Real MaxAngle = 0.; Standard_Real MaxAngle = 0.;
@ -131,38 +145,46 @@ myPts(Pts)
k = 1; k = 1;
for (i = 1; i <= NN-1; i++) for (i = 1; i <= NN-1; i++)
for (j = i+1; j <= NN; j++) for (j = i+1; j <= NN; j++, k++)
{ {
Standard_Real Step = MaxAngle/Nint; OptScal(k) = RealFirst();
Vec = Normals(i) + Normals(j);
Vec.Normalize();
Cross1 = Normals(i) ^ Normals(j); Standard_Real Step = MaxAngle/Nint;
Cross2 = Vec ^ Cross1; Vec = Normals(i) + Normals(j);
gp_Ax1 Axe( gp_Pnt(0,0,0), Cross2 );
Vec1 = Vec.Rotated( Axe, -MaxAngle ); const Standard_Real aSqMagn = Vec.SquareMagnitude();
//Vec2 = Vec.Rotated( Axe, MaxAngle );
OptScal(k) = RealFirst(); if(aSqMagn < Precision::SquareConfusion())
for (n = 0; n <= 2*Nint; n++) {
{ continue;
Vec1.Rotate( Axe, Step ); }
Standard_Real minScal = RealLast();
for (m = 1; m <= NN; m++) Vec.Divide(sqrt(aSqMagn));
{
Standard_Real Scal = Vec1 * Normals(m); Cross1 = Normals(i) ^ Normals(j);
if (Scal < minScal) Cross2 = Vec ^ Cross1;
minScal = Scal; gp_Ax1 Axe( gp_Pnt(0,0,0), Cross2 );
}
if (minScal > OptScal(k)) Vec1 = Vec.Rotated( Axe, -MaxAngle );
{ //Vec2 = Vec.Rotated( Axe, MaxAngle );
OptScal(k) = minScal;
OptVec(k) = Vec1; for (n = 0; n <= 2*Nint; n++)
} {
} Vec1.Rotate( Axe, Step );
k++; Standard_Real minScal = RealLast();
} // for i, for j for (m = 1; m <= NN; m++)
{
Standard_Real Scal = Vec1 * Normals(m);
if (Scal < minScal)
minScal = Scal;
}
if (minScal > OptScal(k))
{
OptScal(k) = minScal;
OptVec(k) = Vec1;
}
}
} // for i, for j
//Find maximum among all maximums //Find maximum among all maximums
Standard_Real BestScal = RealFirst(); Standard_Real BestScal = RealFirst();