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

0029157: Modeling - suspicious pass-through of case labels in switch statements

Browse Source 
Suspicious passes through case labels have been resolved either by using Standard_FALLTHROUGH macro or by redesigning the code.
This commit is contained in:
msv 2017-10-18 19:20:30 +03:00 committed by bugmaster
parent 56c62737ee
commit 6da5b3004c
3 changed files with 84 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/GeomFill/GeomFill_Frenet.cxx
View File

@ -131,6 +131,7 @@ Handle(GeomFill_TrihedronLaw) GeomFill_Frenet::Copy() const
{
// No probleme
isSngl = Standard_False;
break;
}
default :
{

38
src/IntCurveSurface/IntCurveSurface_Inter.gxx
View File

@ -916,6 +916,7 @@ void IntCurveSurface_Inter::PerformConicSurf(const gp_Lin& Line,
GeomAbs_SurfaceType SurfaceType = TheSurfaceTool::GetType(surface);
Standard_Boolean isAnaProcessed = Standard_True;
switch(SurfaceType) {
case GeomAbs_Plane:
{
@ -937,32 +938,38 @@ void IntCurveSurface_Inter::PerformConicSurf(const gp_Lin& Line,
}
case GeomAbs_Torus:
{
IntAna_IntLinTorus intlintorus(Line,TheSurfaceTool::Torus(surface));
if(intlintorus.IsDone()) {
IntAna_IntLinTorus intlintorus(Line, TheSurfaceTool::Torus(surface));
if (intlintorus.IsDone()) {
Standard_Integer nbp = intlintorus.NbPoints();
Standard_Real fi,theta,w;
for(Standard_Integer i = 1; i<= nbp; i++) {
Standard_Real fi, theta, w;
for (Standard_Integer i = 1; i <= nbp; i++) {
const gp_Pnt aDebPnt(intlintorus.Value(i));
(void )aDebPnt;
(void)aDebPnt;
w = intlintorus.ParamOnLine(i);
intlintorus.ParamOnTorus(i,fi,theta);
AppendPoint(curve,w,surface,fi,theta);
intlintorus.ParamOnTorus(i, fi, theta);
AppendPoint(curve, w, surface, fi, theta);
}
}
else
isAnaProcessed = Standard_False;
break;
}
} //-- Si Done retourne False, On passe dans Default !!
case GeomAbs_Cone:
{
//OCC516(apo)->
const Standard_Real correction = 1.E+5*Precision::Angular();
gp_Cone cn = TheSurfaceTool::Cone(surface);
if(Abs(cn.SemiAngle()) < M_PI/2.0 - correction){
IntAna_IntConicQuad LinCone(Line,cn);
AppendIntAna(curve,surface,LinCone);
if(Abs(cn.SemiAngle()) < M_PI/2.0 - correction) {
IntAna_IntConicQuad LinCone(Line, cn);
AppendIntAna(curve, surface, LinCone);
}
else
isAnaProcessed = Standard_False;
break;
}//<-OCC516(apo)
}
default:
isAnaProcessed = Standard_False;
}
if (!isAnaProcessed)
{
Standard_Integer nbsu,nbsv;
nbsu = TheSurfaceTool::NbSamplesU(surface,U1,U2);
@ -986,14 +993,14 @@ void IntCurveSurface_Inter::PerformConicSurf(const gp_Lin& Line,
U1new, U2new, V1new, V2new, NoIntersection);
}
else if(SurfaceType == GeomAbs_SurfaceOfRevolution) {
else if (SurfaceType == GeomAbs_SurfaceOfRevolution) {
EstLimForInfRevl(Line, surface,
U1inf, U2inf, V1inf, V2inf,
U1new, U2new, V1new, V2new, NoIntersection);
}
else if(SurfaceType == GeomAbs_OffsetSurface) {
else if (SurfaceType == GeomAbs_OffsetSurface) {
EstLimForInfOffs(Line, surface, nbsu,
U1inf, U2inf, V1inf, V2inf,
@ -1026,7 +1033,6 @@ void IntCurveSurface_Inter::PerformConicSurf(const gp_Lin& Line,
InternalPerform(curve,polygon,surface,polyhedron,U1new,V1new,U2new,V2new);
}
}
}
}
//=======================================================================
//function : PerformConicSurf

1
src/IntWalk/IntWalk_PWalking.cxx
View File

@ -1168,6 +1168,7 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
break;
}
}
Standard_FALLTHROUGH
case IntWalk_OK:
case IntWalk_ArretSurPoint://006
{