[SCM] OCE packaging branch, upstream, updated. OCE-0.6.0-230-g17bea23
Denis Barbier
bouzim at gmail.com
Fri Feb 24 18:50:18 UTC 2012
The following commit has been merged in the upstream branch:
commit 93761f419664e222034e0d0cba1a384e9837a0e4
Author: Denis Barbier <bouzim at gmail.com>
Date: Thu Dec 22 12:12:28 2011 +0100
[warning-fix][ambiguous-else]
diff --git a/inc/GProp_SGProps.gxx b/inc/GProp_SGProps.gxx
index e753623..52f2cef 100644
--- a/inc/GProp_SGProps.gxx
+++ b/inc/GProp_SGProps.gxx
@@ -94,8 +94,9 @@ static Standard_Integer FillIntervalBounds(Standard_Real A,
VA(j++) = A;
for(; i <= iEnd; i++){
Standard_Real kn = Knots(i);
- if(A < kn)
+ if(A < kn) {
if(kn < B) VA(j++) = VB(k++) = kn; else break;
+ }
}
VB(k) = B;
return k;
diff --git a/inc/GProp_VGProps.gxx b/inc/GProp_VGProps.gxx
index b9ab17c..0103873 100644
--- a/inc/GProp_VGProps.gxx
+++ b/inc/GProp_VGProps.gxx
@@ -63,8 +63,9 @@ static Standard_Integer FillIntervalBounds(Standard_Real A, Standard_Real B, con
VA(j++) = A;
for(; i <= iEnd; i++){
Standard_Real kn = Knots(i);
- if(A < kn)
+ if(A < kn) {
if(kn < B) VA(j++) = VB(k++) = kn; else break;
+ }
}
VB(k) = B;
return k;
diff --git a/src/AIS/AIS_InteractiveContext_1.cxx b/src/AIS/AIS_InteractiveContext_1.cxx
index c4674d5..62ffacf 100644
--- a/src/AIS/AIS_InteractiveContext_1.cxx
+++ b/src/AIS/AIS_InteractiveContext_1.cxx
@@ -191,12 +191,13 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo(const Standard_Integer XPix
selector->Init();
if ( selector->More() )
{
- if ( HasOpenedContext() )
+ if ( HasOpenedContext() ) {
if ( !myFilters->IsOk( selector->OnePicked() ) )
return AIS_SOD_AllBad;
else
if ( !myLocalContexts( myCurLocalIndex )->Filter()->IsOk( selector->OnePicked() ) )
return AIS_SOD_AllBad;
+ }
// Does nothing if previously detected object is equal to the current one
diff --git a/src/AIS/AIS_LocalContext.cxx b/src/AIS/AIS_LocalContext.cxx
index b114a30..b98b2d5 100644
--- a/src/AIS/AIS_LocalContext.cxx
+++ b/src/AIS/AIS_LocalContext.cxx
@@ -515,7 +515,7 @@ Standard_Boolean AIS_LocalContext::Remove(const Handle(AIS_InteractiveObject)& a
const Handle(V3d_Viewer)& aViewer = myCTX->CurrentViewer();
for(i = 1; i <= myMapOfOwner.Extent(); i++){
const Handle(SelectMgr_EntityOwner)& anOwner = myMapOfOwner(i) ;
- if(!anOwner.IsNull())
+ if(!anOwner.IsNull()) {
if(anOwner->Selectable() != aSelectable)
ownersToKeep.Add(anOwner);
else
@@ -526,6 +526,7 @@ Standard_Boolean AIS_LocalContext::Remove(const Handle(AIS_InteractiveObject)& a
Unhilight(anOwner, aViewer->ActiveView());
}
}
+ }
}
myMapOfOwner.Clear();
myMapOfOwner.Assign(ownersToKeep);
diff --git a/src/AIS/AIS_Selection.cxx b/src/AIS/AIS_Selection.cxx
index a67a96a..328133a 100644
--- a/src/AIS/AIS_Selection.cxx
+++ b/src/AIS/AIS_Selection.cxx
@@ -231,11 +231,12 @@ AIS_SelectStatus AIS_Selection::Select(const Handle(Standard_Transient)& anObjec
if ( S->myResultMap.IsBound( anObject ) ){
AIS_NListTransient::Iterator aListIter = S->myResultMap.Find( anObject );
//skt-----------------------------------------------------------------
- if( S->myIterator == aListIter )
+ if( S->myIterator == aListIter ) {
if( S->myIterator.More() )
S->myIterator.Next();
else
S->myIterator = AIS_NListTransient::Iterator();
+ }
//--------------------------------------------------------------------
#ifdef BUC60953
// In the mode of advanced mesh selection only one owner is created
diff --git a/src/AIS2D/AIS2D_InteractiveContext.cxx b/src/AIS2D/AIS2D_InteractiveContext.cxx
index b6c025c..1899ef4 100644
--- a/src/AIS2D/AIS2D_InteractiveContext.cxx
+++ b/src/AIS2D/AIS2D_InteractiveContext.cxx
@@ -1978,7 +1978,7 @@ AIS2D_StatusOfDetection AIS2D_InteractiveContext::MoveTo(
myLastPicked = Handle(AIS2D_InteractiveObject)::DownCast( theGOi );
( is_main ) ? myLastinMain = myLastPicked : myLastinColl = myLastPicked;
- if ( myLastPicked->HasHighlightMode() )
+ if ( myLastPicked->HasHighlightMode() ) {
if ( AvailableToDetect(myLastPicked) ) {
if ( myLastPicked->HighlightMode() == AIS2D_TOD_OBJECT )
@@ -1995,6 +1995,7 @@ AIS2D_StatusOfDetection AIS2D_InteractiveContext::MoveTo(
} else theStat = AIS2D_SOD_Selected;
}
+ }
} // end for
myResetDetect= Standard_False;
@@ -2105,7 +2106,7 @@ AIS2D_StatusOfDetection AIS2D_InteractiveContext
Handle(Graphic2d_GraphicObject) theGOi = dList->Value(i);
if ( theGOi->IsKind(STANDARD_TYPE(AIS2D_InteractiveObject))) {
theIO = Handle(AIS2D_InteractiveObject)::DownCast( theGOi );
- if ( theIO->HasHighlightMode() )
+ if ( theIO->HasHighlightMode() ) {
if ( AvailableToDetect( theIO ) ) {
if ( theIO->HighlightMode() == AIS2D_TOD_OBJECT )
theIO->Highlight( ind );
@@ -2113,6 +2114,7 @@ AIS2D_StatusOfDetection AIS2D_InteractiveContext
DoDetectObject( theIO, theDrawer );
} else theStat = AIS2D_SOD_Selected;
+ }
}
} // end for
theDrawer->EndDraw();
@@ -2136,13 +2138,14 @@ AIS2D_StatusOfDetection AIS2D_InteractiveContext
AIS2D_StatusOfPick AIS2D_InteractiveContext::Select( const Standard_Boolean UpdateVwr ) {
- if ( HasOpenedContext() )
+ if ( HasOpenedContext() ) {
if ( myWasLastMain )
return myLocalContexts(myCurLocalIndex)->Select(UpdateVwr);
else {
myLocalContexts( myCurLocalIndex )->SetSelected( myLastPicked, UpdateVwr );
return AIS2D_SOP_OneSelected;
}
+ }
if ( ! mySeqOfDetIO->IsEmpty() ) {
Handle(AIS2D_InteractiveObject) theIO;
diff --git a/src/BRepExtrema/BRepExtrema_DistShapeShape.cxx b/src/BRepExtrema/BRepExtrema_DistShapeShape.cxx
index b016679..26a3987 100644
--- a/src/BRepExtrema/BRepExtrema_DistShapeShape.cxx
+++ b/src/BRepExtrema/BRepExtrema_DistShapeShape.cxx
@@ -80,7 +80,7 @@ void BRepExtrema_DistShapeShape::DistanceMapMap(const TopTools_IndexedMapOfShape
const TopoDS_Shape &S2 = Map2(j);
BRepExtrema_DistanceSS dist(S1,S2,box1,box2,myDistRef,myEps);
- if (dist.IsDone())
+ if (dist.IsDone()) {
if(dist.DistValue() < (myDistRef-myEps))
{
mySolutionsShape1.Clear();
@@ -100,6 +100,7 @@ void BRepExtrema_DistShapeShape::DistanceMapMap(const TopTools_IndexedMapOfShape
if (myDistRef > dist.DistValue())
myDistRef=dist.DistValue();
}
+ }
}
}
}
diff --git a/src/BRepFill/BRepFill_Sweep.cxx b/src/BRepFill/BRepFill_Sweep.cxx
index cdc52bd..b7fe323 100644
--- a/src/BRepFill/BRepFill_Sweep.cxx
+++ b/src/BRepFill/BRepFill_Sweep.cxx
@@ -2221,7 +2221,7 @@ BRepFill_Sweep::BRepFill_Sweep(const Handle(BRepFill_SectionLaw)& Section,
}
}
- if (ipath == 1)
+ if (ipath == 1) {
if (uclose && (isec == NbLaw)) {
Vertex(isec+1, 1) = Vertex(1, 1);
}
@@ -2241,6 +2241,7 @@ BRepFill_Sweep::BRepFill_Sweep(const Handle(BRepFill_SectionLaw)& Section,
VEdge(isec, 1) = NullEdge(Vertex(isec, 1));
}
}
+ }
if (uclose && (isec == NbLaw)) {
Vertex(isec+1, ipath+1) = Vertex(1, ipath+1);
diff --git a/src/BRepTest/BRepTest_TopologyCommands.cxx b/src/BRepTest/BRepTest_TopologyCommands.cxx
index f9f2b8c..419cdbd 100644
--- a/src/BRepTest/BRepTest_TopologyCommands.cxx
+++ b/src/BRepTest/BRepTest_TopologyCommands.cxx
@@ -106,12 +106,13 @@ static Standard_Integer section(Draw_Interpretor& , Standard_Integer n, const ch
else
if (strcasecmp(a[4], "-no2d"))
return 1;
- if(n > 5)
+ if(n > 5) {
if (!strcasecmp(a[5], "-a"))
Sec.Approximation(TopOpeBRepTool_APPROX);
else
if (strcasecmp(a[5], "-p"))
return 1;
+ }
} else {// fin a[4],"-2d"
if (!strcasecmp(a[4], "-a") || !strcasecmp(a[4], "-p")) {
if (!strcasecmp(a[4], "-a"))
diff --git a/src/BRepTools/BRepTools_NurbsConvertModification.cxx b/src/BRepTools/BRepTools_NurbsConvertModification.cxx
index 9cd00d8..f04e059 100644
--- a/src/BRepTools/BRepTools_NurbsConvertModification.cxx
+++ b/src/BRepTools/BRepTools_NurbsConvertModification.cxx
@@ -508,19 +508,21 @@ Standard_Boolean BRepTools_NurbsConvertModification::NewCurve2d
v = (Vsup - Vinf)*0.1;
if(S->IsUPeriodic()) {
Standard_Real uperiod = S->UPeriod();
- if(uperiod < (Usup+2*u-Uinf))
+ if(uperiod < (Usup+2*u-Uinf)) {
if(uperiod <= (Usup-Uinf))
u = 0;
else
u = (uperiod-(Usup-Uinf))*0.5;
+ }
}
if(S->IsVPeriodic()) {
Standard_Real vperiod = S->VPeriod();
- if(vperiod < (Vsup+2*v-Vinf))
+ if(vperiod < (Vsup+2*v-Vinf)) {
if(vperiod <= (Vsup-Vinf))
v = 0;
else
v = (vperiod-(Vsup-Vinf))*0.5;
+ }
}
GeomAdaptor_Surface GAS(S, Uinf-u,Usup+u,Vinf-v,Vsup+v);
Handle(GeomAdaptor_HSurface) GAHS = new GeomAdaptor_HSurface(GAS);
diff --git a/src/ChFi3d/ChFi3d_Builder_6.cxx b/src/ChFi3d/ChFi3d_Builder_6.cxx
index 6674251..006f721 100644
--- a/src/ChFi3d/ChFi3d_Builder_6.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_6.cxx
@@ -1784,7 +1784,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
narc1 = Lin->StartPointOnFirst().NbPointOnRst();
narc2 = Lin->StartPointOnSecond().NbPointOnRst();
// modified by eap Fri Feb 8 11:43:48 2002 ___BEGIN___
- if(!debarc1)
+ if(!debarc1) {
if (narc1 == 0)
backwContinueFailed = Lin->StartPointOnFirst().ParameterOnGuide() > Target;
else {
@@ -1805,7 +1805,8 @@ Standard_Boolean ChFi3d_Builder::ComputeData
// }
}
}
- if(!debarc2)
+ }
+ if(!debarc2) {
if (narc2 == 0)
backwContinueFailed = Lin->StartPointOnSecond().ParameterOnGuide() > Target;
else {
@@ -1826,6 +1827,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
// }
}
}
+ }
if (backwContinueFailed) {
// if we leave backwContinueFailed as is, we will stop in this direction
// but we are to continue if there are no more faces on the side with arc
@@ -1885,7 +1887,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
narc1 = Lin->EndPointOnFirst().NbPointOnRst();
narc2 = Lin->EndPointOnSecond().NbPointOnRst();
// modified by eap Fri Feb 8 11:44:57 2002 ___BEGIN___
- if(!finarc1)
+ if(!finarc1) {
if (narc1 == 0)
forwContinueFailed = Lin->EndPointOnFirst().ParameterOnGuide() < Target;
else {
@@ -1901,7 +1903,8 @@ Standard_Boolean ChFi3d_Builder::ComputeData
// }
}
}
- if(!finarc2)
+ }
+ if(!finarc2) {
if (narc2 == 0)
forwContinueFailed = Lin->EndPointOnSecond().ParameterOnGuide() < Target;
else {
@@ -1917,6 +1920,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
// }
}
}
+ }
if (forwContinueFailed) {
// if we leave forwContinueFailed as is, we will stop in this direction
// but we are to continue if there are no more faces on the side with arc
diff --git a/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx b/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx
index 4b1d4ab..eb3d3e5 100644
--- a/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx
+++ b/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx
@@ -2048,7 +2048,7 @@ Discretise(const Handle(GeomPlate_HArray1OfSequenceOfReal)& PntInter,
// pour sortir de la boucle sans stocker le point
}
else
- { if (l+1>=NbPtInter)
+ { if (l+1>=NbPtInter) {
// on a parcouru tout le tableau : Le point
// n'appartient pas a un interval point commun
if (NbPtG1G1!=0)
@@ -2083,6 +2083,7 @@ Discretise(const Handle(GeomPlate_HArray1OfSequenceOfReal)& PntInter,
{ myPlateCont->ChangeValue(i).Append(Inter);
// on ajoute le point
}
+ }
}
}
}
diff --git a/src/Hermit/Hermit.cxx b/src/Hermit/Hermit.cxx
index f8c43fb..70bded2 100644
--- a/src/Hermit/Hermit.cxx
+++ b/src/Hermit/Hermit.cxx
@@ -223,7 +223,7 @@ static void PolyTest(const TColStd_Array1OfReal& Herm,
if ((max==0)||(max==3))
for (i=0;i<=3;i++)
Polesinit(i).SetCoord(0.0,(Polesinit(i).Y()-TolPoles*Polemax));
- if ((max==1)||(max==2))
+ if ((max==1)||(max==2)) {
if ((min==0)||(min==3))
for (i=0;i<=3;i++)
Polesinit(i).SetCoord(0.0,(Polesinit(i).Y()-(1/TolPoles)*Polemin));
@@ -266,6 +266,7 @@ static void PolyTest(const TColStd_Array1OfReal& Herm,
}
}
}
+ }
}
} //end of the loop
@@ -428,7 +429,7 @@ static void PolyTest(const TColStd_Array1OfReal& Herm,
if ((max==0)||(max==3))
for (i=0;i<=3;i++)
Polesinit(i).SetCoord(0.0,(Polesinit(i).Y()-TolPoles*Polemax));
- if ((max==1)||(max==2))
+ if ((max==1)||(max==2)) {
if ((min==0)||(min==3))
for (i=0;i<=3;i++)
Polesinit(i).SetCoord(0.0,(Polesinit(i).Y()-(1/TolPoles)*Polemin));
@@ -471,6 +472,7 @@ static void PolyTest(const TColStd_Array1OfReal& Herm,
}
}
}
+ }
}
} //end of the loop
diff --git a/src/IGESControl/IGESControl_IGESBoundary.cxx b/src/IGESControl/IGESControl_IGESBoundary.cxx
index 4092911..deb437b 100644
--- a/src/IGESControl/IGESControl_IGESBoundary.cxx
+++ b/src/IGESControl/IGESControl_IGESBoundary.cxx
@@ -158,13 +158,14 @@ IGESControl_IGESBoundary::IGESControl_IGESBoundary(const IGESToBRep_CurveAndSurf
else if (( surfcurv == -3 && len3d > 0) || len2d == 0)
GTranslate2d = Standard_False;
- if (GTranslate3d && GTranslate2d)
+ if (GTranslate3d && GTranslate2d) {
//Setting preference in the case of inconsitency between 3D and 2D
if (surfcurv == 2) Preferred3d = Standard_False;
else if (surfcurv == 3) Preferred2d = Standard_False;
else if (myfilepreference == 2) Preferred3d = Standard_False;
else if (myfilepreference == 3) Preferred2d = Standard_False;
else Preferred3d = Standard_False;
+ }
if (GTranslate3d && GTranslate2d && len3d != len2d) {
GTranslate3d = Preferred3d;
diff --git a/src/IGESDefs/IGESDefs_ToolAttributeTable.cxx b/src/IGESDefs/IGESDefs_ToolAttributeTable.cxx
index 7ec43a0..2d022fa 100644
--- a/src/IGESDefs/IGESDefs_ToolAttributeTable.cxx
+++ b/src/IGESDefs/IGESDefs_ToolAttributeTable.cxx
@@ -268,10 +268,11 @@ void IGESDefs_ToolAttributeTable::OwnCheck
(const Handle(IGESDefs_AttributeTable)& ent,
const Interface_ShareTool& , Handle(Interface_Check)& ach) const
{
- if (ent->Definition().IsNull())
+ if (ent->Definition().IsNull()) {
if (ent->HasStructure()) ach->AddFail
("Structure in Directory Entry is not an Attribute Definition Table");
else ach->AddFail("No Attribute Definition defined");
+ }
if (ent->FormNumber() == 0 && ent->NbRows() != 1)
ach->AddFail("Form 0 with several Rows");
if (ent->NbAttributes() != ent->Definition()->NbAttributes())
diff --git a/src/IGESToBRep/IGESToBRep_IGESBoundary.cxx b/src/IGESToBRep/IGESToBRep_IGESBoundary.cxx
index f5976e7..fad1cf6 100644
--- a/src/IGESToBRep/IGESToBRep_IGESBoundary.cxx
+++ b/src/IGESToBRep/IGESToBRep_IGESBoundary.cxx
@@ -152,11 +152,12 @@ IGESToBRep_IGESBoundary::IGESToBRep_IGESBoundary(const IGESToBRep_CurveAndSurfac
else if (len2d == 0)
GTranslate2d = Standard_False;
- if (GTranslate3d && GTranslate2d)
+ if (GTranslate3d && GTranslate2d) {
//Setting preference in the case of inconsitency between 3D and 2D
if (myfilepreference == 2) Preferred3d = Standard_False;
else if (myfilepreference == 3) Preferred2d = Standard_False;
else Preferred3d = Standard_False;
+ }
if (GTranslate3d && GTranslate2d && len3d != len2d) {
GTranslate3d = Preferred3d;
diff --git a/src/IntPatch/IntPatch_RstInt.cxx b/src/IntPatch/IntPatch_RstInt.cxx
index aae2e18..2251ff3 100644
--- a/src/IntPatch/IntPatch_RstInt.cxx
+++ b/src/IntPatch/IntPatch_RstInt.cxx
@@ -795,11 +795,12 @@ void IntPatch_RstInt::PutVertexOnLine (Handle(IntPatch_Line)& L,
arc->D1(paramarc,p2d,d2d);
U1 = p2d.X(); V1 = p2d.Y();
- if (typL == IntPatch_Walking && SurfaceIsPeriodic)
+ if (typL == IntPatch_Walking && SurfaceIsPeriodic) {
if (OnFirst)
Recadre(TypeS1,TypeS2,wlin,ParamApproxOnLine,U1,V1,U2,V2);
else
Recadre(TypeS1,TypeS2,wlin,ParamApproxOnLine,U2,V2,U1,V1);
+ }
locpt.Append(ptsommet);
locpt2.Append(gp_Pnt2d(U2,V2));
diff --git a/src/IntPolyh/IntPolyh_MaillageAffinage.cxx b/src/IntPolyh/IntPolyh_MaillageAffinage.cxx
index 9fe99c9..700de98 100644
--- a/src/IntPolyh/IntPolyh_MaillageAffinage.cxx
+++ b/src/IntPolyh/IntPolyh_MaillageAffinage.cxx
@@ -3019,14 +3019,16 @@ IntPolyh_MaillageAffinage::TriangleEdgeContact2(const Standard_Integer TriSurfID
}
else {
PI=PE1+Edge*lambda;
- if(TriSurfID==1)
+ if(TriSurfID==1) {
if(Tri2.GetEdgeOrientation(EdgeIndex)>0)
SP1.SetLambda2(lambda);
else SP1.SetLambda2(1.0-lambda);
- if(TriSurfID==2)
+ }
+ if(TriSurfID==2) {
if(Tri1.GetEdgeOrientation(EdgeIndex)>0)
SP1.SetLambda1(lambda);
else SP1.SetLambda1(1.0-lambda);
+ }
}
diff --git a/src/LocOpe/LocOpe_SplitShape.cxx b/src/LocOpe/LocOpe_SplitShape.cxx
index cdd8a86..0aa91dd 100644
--- a/src/LocOpe/LocOpe_SplitShape.cxx
+++ b/src/LocOpe/LocOpe_SplitShape.cxx
@@ -1112,18 +1112,20 @@ static void ChoixUV(const TopoDS_Edge& Last,
if (surf.IsUPeriodic())
if ((fabs(p2d.Y() - plst.Y()) <= toll) ||
((surf.IsVPeriodic()) &&
- (fabs(fabs(p2d.Y() - plst.Y()) - surf.VPeriod()) <= toll)))
+ (fabs(fabs(p2d.Y() - plst.Y()) - surf.VPeriod()) <= toll))) {
if (fabs(p2d.X() - plst.X() - surf.UPeriod()) <= toll)
p2d.SetX(p2d.X() - surf.UPeriod());
else if (fabs(plst.X() - p2d.X() - surf.UPeriod()) <= toll)
p2d.SetX(p2d.X() + surf.UPeriod());
+ }
if (surf.IsVPeriodic())
- if (fabs(p2d.X() - plst.X()) <= toll)
+ if (fabs(p2d.X() - plst.X()) <= toll) {
if (fabs(p2d.Y() - plst.Y() - surf.VPeriod()) <= toll)
p2d.SetY(p2d.Y() - surf.VPeriod());
else if (fabs(plst.Y() - p2d.Y() - surf.VPeriod()) <= toll)
p2d.SetY(p2d.Y() + surf.VPeriod());
+ }
tol = BRep_Tool::Tolerance(vtx);
tol = Max(surf.UResolution(tol), surf.VResolution(tol));
diff --git a/src/MeshVS/MeshVS_Mesh.cxx b/src/MeshVS/MeshVS_Mesh.cxx
index c872d20..96ce104 100644
--- a/src/MeshVS/MeshVS_Mesh.cxx
+++ b/src/MeshVS/MeshVS_Mesh.cxx
@@ -304,7 +304,7 @@ void MeshVS_Mesh::ComputeSelection ( const Handle(SelectMgr_Selection)& theSelec
TColStd_MapIteratorOfPackedMapOfInteger anIterN( anAllNodesMap );
for( ; anIterN.More(); anIterN.Next() )
- if( myDataSource->GetGeom( anIterN.Key(), Standard_False, aCoords, NbNodes, aType ) )
+ if( myDataSource->GetGeom( anIterN.Key(), Standard_False, aCoords, NbNodes, aType ) ) {
if( first )
{
for( Standard_Integer i=1; i<=3; i++ )
@@ -319,6 +319,7 @@ void MeshVS_Mesh::ComputeSelection ( const Handle(SelectMgr_Selection)& theSelec
if( aCoords( i )>max[i-1] )
max[i-1] = aCoords( i );
}
+ }
Bnd_Box box;
box.Add( gp_Pnt( min[0], min[1], min[2] ) );
box.Add( gp_Pnt( max[0], max[1], max[2] ) );
diff --git a/src/MeshVS/MeshVS_MeshPrsBuilder.cxx b/src/MeshVS/MeshVS_MeshPrsBuilder.cxx
index d273a77..e68a305 100644
--- a/src/MeshVS/MeshVS_MeshPrsBuilder.cxx
+++ b/src/MeshVS/MeshVS_MeshPrsBuilder.cxx
@@ -848,7 +848,7 @@ void MeshVS_MeshPrsBuilder::HowManyPrimitives (const Handle(MeshVS_HArray1OfSequ
Standard_Integer& Vertices,
Standard_Integer& Bounds)
{
- if( !Topo.IsNull() )
+ if( !Topo.IsNull() ) {
if( AsPolygons || IsSelect )
{
Standard_Integer B = Topo->Upper()-Topo->Lower()+1;
@@ -868,6 +868,7 @@ void MeshVS_MeshPrsBuilder::HowManyPrimitives (const Handle(MeshVS_HArray1OfSequ
Bounds += E;
Vertices += 2*E;
}
+ }
}
//================================================================
diff --git a/src/NCollection/NCollection_BaseSequence.cxx b/src/NCollection/NCollection_BaseSequence.cxx
index 840f236..474db70 100644
--- a/src/NCollection/NCollection_BaseSequence.cxx
+++ b/src/NCollection/NCollection_BaseSequence.cxx
@@ -194,7 +194,7 @@ void NCollection_BaseSequence::PInsertAfter (const Standard_Integer theIndex,
{
if (theIndex < 0 || theIndex > mySize)
Standard_OutOfRange::Raise();
- if (Other.mySize != 0)
+ if (Other.mySize != 0) {
if (theIndex == 0)
PPrepend (Other);
else {
@@ -211,6 +211,7 @@ void NCollection_BaseSequence::PInsertAfter (const Standard_Integer theIndex,
myCurrentIndex += Other.mySize;
Other.Nullify();
}
+ }
}
//=======================================================================
diff --git a/src/NIS/NIS_InteractiveObject.cxx b/src/NIS/NIS_InteractiveObject.cxx
index 8a980fe..aec2490 100644
--- a/src/NIS/NIS_InteractiveObject.cxx
+++ b/src/NIS/NIS_InteractiveObject.cxx
@@ -32,7 +32,7 @@ const Handle_NIS_Drawer& NIS_InteractiveObject::SetDrawer
const Standard_Boolean setUpdated)
{
NIS_InteractiveContext * aCtx = theDrawer->GetContext();
- if (myDrawer.IsNull() == Standard_False)
+ if (myDrawer.IsNull() == Standard_False) {
if (aCtx == 0L)
{
aCtx = myDrawer->GetContext();
@@ -44,6 +44,7 @@ const Handle_NIS_Drawer& NIS_InteractiveObject::SetDrawer
(myDrawer->GetContext() != 0L && aCtx != myDrawer->GetContext(),
"NIS_InteractiveObject::SetDrawer: different drawer context");
}
+ }
Standard_NullValue_Raise_if
(aCtx == 0L, "NIS_InteractiveObject::SetDrawer: NULL drawer context");
diff --git a/src/NIS/NIS_TriangulatedDrawer.cxx b/src/NIS/NIS_TriangulatedDrawer.cxx
index 41f8b40..4e6641c 100644
--- a/src/NIS/NIS_TriangulatedDrawer.cxx
+++ b/src/NIS/NIS_TriangulatedDrawer.cxx
@@ -271,7 +271,7 @@ void NIS_TriangulatedDrawer::Draw (const Handle_NIS_InteractiveObject& theObj,
aType, pObject->mypLines);
else {
Standard_Boolean isLoop;
- if (pObject->IsLine(isLoop))
+ if (pObject->IsLine(isLoop)) {
if (isLoop) {
// glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
glDrawElements (GL_LINE_LOOP, pObject->NLineNodes(),
@@ -281,6 +281,7 @@ void NIS_TriangulatedDrawer::Draw (const Handle_NIS_InteractiveObject& theObj,
glDrawElements (GL_LINE_STRIP, pObject->NLineNodes(),
aType, pObject->mypLines);
}
+ }
}
}
diff --git a/src/OpenGl/OpenGl_ResourceCleaner.cxx b/src/OpenGl/OpenGl_ResourceCleaner.cxx
index d1a3c3c..8ff94df 100644
--- a/src/OpenGl/OpenGl_ResourceCleaner.cxx
+++ b/src/OpenGl/OpenGl_ResourceCleaner.cxx
@@ -135,7 +135,7 @@ void OpenGl_ResourceCleaner::Cleanup()
GLCONTEXT aContext = GET_GL_CONTEXT();
// if we have active context, we can delete the resources
- if (aContext != NULL)
+ if (aContext != NULL) {
// if the context is found in shared list
if (mySharedContexts.Contains(aContext))
{
@@ -155,6 +155,7 @@ void OpenGl_ResourceCleaner::Cleanup()
aQueue->Pop();
}
}
+ }
}
//=======================================================================
diff --git a/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx b/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx
index 318bfe1..fb79dae 100644
--- a/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx
+++ b/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx
@@ -182,34 +182,38 @@ static gp_Pnt2d Function_Value(const Standard_Real U,
if(Surf->IsVPeriodic() || Surf->IsVClosed()) {
vperiod = Surf->LastVParameter() - Surf->FirstVParameter();
}
- if(U0 < Uinf)
+ if(U0 < Uinf) {
if(!uperiod)
U0 = Uinf;
else {
decalU = int((Uinf - U0)/uperiod)+1;
U0 += decalU*uperiod;
}
- if(U0 > Usup)
+ }
+ if(U0 > Usup) {
if(!uperiod)
U0 = Usup;
else {
decalU = -(int((U0 - Usup)/uperiod)+1);
U0 += decalU*uperiod;
}
- if(V0 < Vinf)
+ }
+ if(V0 < Vinf) {
if(!vperiod)
V0 = Vinf;
else {
decalV = int((Vinf - V0)/vperiod)+1;
V0 += decalV*vperiod;
}
- if(V0 > Vsup)
+ }
+ if(V0 > Vsup) {
if(!vperiod)
V0 = Vsup;
else {
decalV = -int((V0 - Vsup)/vperiod)-1;
V0 += decalV*vperiod;
}
+ }
// The surface around U0 is reduced
Standard_Real uLittle = (Usup - Uinf)/10, vLittle = (Vsup - Vinf)/10;
@@ -740,11 +744,12 @@ Handle(Adaptor2d_HCurve2d)
for ( i = 2 ; i <= NbOfPnts ; i++) {
Sloc = S;
ElSLib::Parameters( Cylinder, Pts(i), S, T);
- if(Abs(Sloc - S) > PI)
+ if(Abs(Sloc - S) > PI) {
if(Sloc > S)
usens++;
else
usens--;
+ }
Pts2d(i).SetCoord(S+usens*2*PI,T);
}
myProjIsDone = Standard_True;
@@ -761,11 +766,12 @@ Handle(Adaptor2d_HCurve2d)
for ( i = 2 ; i <= NbOfPnts ; i++) {
Sloc = S;
ElSLib::Parameters( Cone, Pts(i), S, T);
- if(Abs(Sloc - S) > PI)
+ if(Abs(Sloc - S) > PI) {
if(Sloc > S)
usens++;
else
usens--;
+ }
Pts2d(i).SetCoord(S+usens*2*PI,T);
}
myProjIsDone = Standard_True;
@@ -782,11 +788,12 @@ Handle(Adaptor2d_HCurve2d)
for ( i = 2 ; i <= NbOfPnts ; i++) {
Sloc = S;Tloc = T;
ElSLib::Parameters( Sphere, Pts(i), S, T);
- if(1.6*PI < Abs(Sloc - S))
+ if(1.6*PI < Abs(Sloc - S)) {
if(Sloc > S)
usens += 2;
else
usens -= 2;
+ }
if(1.6*PI > Abs(Sloc - S) && Abs(Sloc - S) > 0.4*PI) {
vparit = !vparit;
if(Sloc > S)
@@ -819,16 +826,18 @@ Handle(Adaptor2d_HCurve2d)
for ( i = 2 ; i <= NbOfPnts ; i++) {
Sloc = S; Tloc = T;
ElSLib::Parameters( Torus, Pts(i), S, T);
- if(Abs(Sloc - S) > PI)
+ if(Abs(Sloc - S) > PI) {
if(Sloc > S)
usens++;
else
usens--;
- if(Abs(Tloc - T) > PI)
+ }
+ if(Abs(Tloc - T) > PI) {
if(Tloc > T)
vsens++;
else
vsens--;
+ }
Pts2d(i).SetCoord(S+usens*2*PI,T+vsens*2*PI);
}
myProjIsDone = Standard_True;
@@ -1124,7 +1133,7 @@ Handle(Adaptor2d_HCurve2d)
if (Dist2Min < DistTol3d * DistTol3d) {
//if (Dist2Min < Tol3d * Tol3d) {
(ext.Point(GoodValue)).Parameter(u,v);
- if(uperiod)
+ if(uperiod) {
if((U0 - u) > (2*uperiod/3)) {
usens++;
}
@@ -1132,7 +1141,8 @@ Handle(Adaptor2d_HCurve2d)
if((u - U0) > (2*uperiod/3)) {
usens--;
}
- if(vperiod)
+ }
+ if(vperiod) {
if((V0 - v) > (vperiod/2)) {
vsens++;
}
@@ -1140,6 +1150,7 @@ Handle(Adaptor2d_HCurve2d)
if((v - V0) > (vperiod/2)) {
vsens--;
}
+ }
U0 = u; V0 = v;
U1 = U0 + usens*uperiod;
V1 = V0 + vsens*vperiod;
diff --git a/src/Resource/Resource_Manager.cxx b/src/Resource/Resource_Manager.cxx
index f2f726c..d59f73e 100644
--- a/src/Resource/Resource_Manager.cxx
+++ b/src/Resource/Resource_Manager.cxx
@@ -215,9 +215,10 @@ static Standard_Integer GetLine(OSD_File& aFile,TCollection_AsciiString& aLine)
do {
aFile.ReadLine(Buffer,BufSize,Len);
aLine += Buffer;
- if (aFile.IsAtEnd())
+ if (aFile.IsAtEnd()) {
if (!aLine.Length()) return 0;
else aLine += "\n";
+ }
} while (aLine.Value(aLine.Length()) != '\n');
return 1;
diff --git a/src/STEPControl/STEPControl_ActorWrite.cxx b/src/STEPControl/STEPControl_ActorWrite.cxx
index 301b6cb..d722068 100644
--- a/src/STEPControl/STEPControl_ActorWrite.cxx
+++ b/src/STEPControl/STEPControl_ActorWrite.cxx
@@ -1319,12 +1319,13 @@ Handle(Transfer_Binder) STEPControl_ActorWrite::TransferCompound (const Handle(T
while ( !bnd.IsNull() ) {
Handle(Transfer_SimpleBinderOfTransient) bx =
Handle(Transfer_SimpleBinderOfTransient)::DownCast(bnd);
- if ( !bx.IsNull() )
+ if ( !bx.IsNull() ) {
// Single SDR is created for a non-manifold group (ssv: 12.11.2010)
if (!isManifold && i > 1)
break;
else
binder->AddResult( TransientResult( bx->Result() ) );
+ }
bnd = bnd->NextResult();
}
}
diff --git a/src/SWDRAW/SWDRAW_ShapeFix.cxx b/src/SWDRAW/SWDRAW_ShapeFix.cxx
index 1175e1e..e0347f7 100644
--- a/src/SWDRAW/SWDRAW_ShapeFix.cxx
+++ b/src/SWDRAW/SWDRAW_ShapeFix.cxx
@@ -239,9 +239,10 @@ static Standard_Integer stwire (Draw_Interpretor& di, Standard_Integer argc, con
if (sbwd->IsSeam(i)) di<<" SEAM_WIRE";
if (Shape.ShapeType() == TopAbs_FACE &&
sae.IsSeam(E,TopoDS::Face(Shape))) di<<" SEAM_FACE";
- if (Shape.ShapeType() == TopAbs_FACE )
+ if (Shape.ShapeType() == TopAbs_FACE ) {
if (sae.HasPCurve(E,TopoDS::Face(Shape))) di<<" PCU";
else di<<" NO_PCU";
+ }
if (sae.HasCurve3d(E)) di<<" C3D";
else di<<" NO_C3D";
if (sae.IsClosed3d(E)) di<<" CLOSED";
diff --git a/src/SWDRAW/SWDRAW_ShapeUpgrade.cxx b/src/SWDRAW/SWDRAW_ShapeUpgrade.cxx
index 1bfa4d9..2e6c02a 100644
--- a/src/SWDRAW/SWDRAW_ShapeUpgrade.cxx
+++ b/src/SWDRAW/SWDRAW_ShapeUpgrade.cxx
@@ -1128,21 +1128,25 @@ static Standard_Integer splitface
Standard_Real Umin, Umax, Vmin, Vmax;
S->Bounds ( Umin, Umax, Vmin, Vmax );
if ( Uf < Umin && ! S->IsUPeriodic() ) Uf = Umin;
- else if ( Uf > Umin )
+ else if ( Uf > Umin ) {
if ( Precision::IsInfinite(Umin) ) Uf -= 100;
else Uf = Umin;
+ }
if ( Vf < Vmin && ! S->IsVPeriodic() ) Vf = Vmin;
- else if ( Vf > Vmin )
+ else if ( Vf > Vmin ) {
if ( Precision::IsInfinite(Vmin) ) Vf -= 100;
else Vf = Vmin;
+ }
if ( Ul > Umax && ! S->IsUPeriodic() ) Ul = Umax;
- else if ( Ul < Umax )
+ else if ( Ul < Umax ) {
if ( Precision::IsInfinite(Umax) ) Ul += 100;
else Ul = Umax;
+ }
if ( Vl > Vmax && ! S->IsVPeriodic() ) Vl = Vmax;
- else if ( Vl < Vmax )
+ else if ( Vl < Vmax ) {
if ( Precision::IsInfinite(Vmax) ) Vl += 100;
else Vl = Vmax;
+ }
TColStd_SequenceOfReal uval;
TColStd_SequenceOfReal vval;
diff --git a/src/SelectMgr/SelectMgr_EntityOwner.cxx b/src/SelectMgr/SelectMgr_EntityOwner.cxx
index c3984c9..f37ad4b 100644
--- a/src/SelectMgr/SelectMgr_EntityOwner.cxx
+++ b/src/SelectMgr/SelectMgr_EntityOwner.cxx
@@ -72,11 +72,12 @@ void SelectMgr_EntityOwner::HilightWithColor(const Handle(PrsMgr_PresentationMan
const Quantity_NameOfColor aColor,
const Standard_Integer aMode)
{
- if( HasSelectable() )
+ if( HasSelectable() ) {
if( IsAutoHilight() )
PM->Color(mySelectable,aColor,aMode);
else
mySelectable->HilightOwnerWithColor( PM, aColor, this );
+ }
}
void SelectMgr_EntityOwner::Unhilight(const Handle(PrsMgr_PresentationManager)& PM,
diff --git a/src/SelectMgr/SelectMgr_SelectableObject.cxx b/src/SelectMgr/SelectMgr_SelectableObject.cxx
index adef86b..f0544bd 100644
--- a/src/SelectMgr/SelectMgr_SelectableObject.cxx
+++ b/src/SelectMgr/SelectMgr_SelectableObject.cxx
@@ -167,7 +167,7 @@ void SelectMgr_SelectableObject::ResetLocation()
for(Sel->Init();Sel->More();Sel->Next()){
SE = *((Handle(Select3D_SensitiveEntity)*) &(Sel->Sensitive()));
if(!SE.IsNull()){
- if(SE->HasLocation())
+ if(SE->HasLocation()) {
if( SE->Location()==myLocation){
SE->ResetLocation();
const Handle(SelectBasics_EntityOwner)& EO = SE->OwnerId();
@@ -177,7 +177,7 @@ void SelectMgr_SelectableObject::ResetLocation()
SE->SetLocation(iniloc*myLocation.Inverted());
const Handle(SelectBasics_EntityOwner)& EO = SE->OwnerId();
(*((Handle(SelectMgr_EntityOwner)*)&EO))->SetLocation(SE->Location());}
-
+ }
}
}
Sel->UpdateStatus(SelectMgr_TOU_None);
diff --git a/src/ShapeAnalysis/ShapeAnalysis_CheckSmallFace.cxx b/src/ShapeAnalysis/ShapeAnalysis_CheckSmallFace.cxx
index c0b3cda..f17cc0e 100644
--- a/src/ShapeAnalysis/ShapeAnalysis_CheckSmallFace.cxx
+++ b/src/ShapeAnalysis/ShapeAnalysis_CheckSmallFace.cxx
@@ -357,12 +357,13 @@ static Standard_Boolean MinMaxSmall
else return Standard_False;
}
// Now, check these two edge to define a strip !
- if (!E1.IsNull()&&!E2.IsNull())
+ if (!E1.IsNull()&&!E2.IsNull()) {
if(!CheckStripEdges (E1,E2,tol,dmax)) return Standard_False;
else {
myStatusStrip = ShapeExtend::EncodeStatus (ShapeExtend_DONE3);
return Standard_True ;
}
+ }
return Standard_False;
}
diff --git a/src/ShapeCustom/ShapeCustom_ConvertToBSpline.cxx b/src/ShapeCustom/ShapeCustom_ConvertToBSpline.cxx
index 4044a3f..b25b747 100644
--- a/src/ShapeCustom/ShapeCustom_ConvertToBSpline.cxx
+++ b/src/ShapeCustom/ShapeCustom_ConvertToBSpline.cxx
@@ -44,7 +44,7 @@ Standard_Boolean ShapeCustom_ConvertToBSpline::IsToConvert(const Handle(Geom_Sur
Handle(Geom_RectangularTrimmedSurface)::DownCast ( S );
SS = RTS->BasisSurface();
}
- if(SS->IsKind(STANDARD_TYPE(Geom_OffsetSurface)))
+ if(SS->IsKind(STANDARD_TYPE(Geom_OffsetSurface))) {
if(myOffsetMode)
return Standard_True;
else {
@@ -53,6 +53,7 @@ Standard_Boolean ShapeCustom_ConvertToBSpline::IsToConvert(const Handle(Geom_Sur
Handle(Geom_Surface) tmp;
return IsToConvert(basis,tmp);
}
+ }
if ( SS->IsKind(STANDARD_TYPE(Geom_SurfaceOfLinearExtrusion)) )
return myExtrMode;
if ( SS->IsKind(STANDARD_TYPE(Geom_SurfaceOfRevolution)) )
diff --git a/src/ShapeFix/ShapeFix_ComposeShell.cxx b/src/ShapeFix/ShapeFix_ComposeShell.cxx
index d6dc90b..4678fb2 100644
--- a/src/ShapeFix/ShapeFix_ComposeShell.cxx
+++ b/src/ShapeFix/ShapeFix_ComposeShell.cxx
@@ -654,9 +654,10 @@ Standard_Integer ShapeFix_ComposeShell::ComputeCode (const Handle(ShapeExtend_Wi
}
}
if ( j < np ) { i = 0; break; } // not tangency
- if ( i == endInd )
+ if ( i == endInd ) {
if ( special <=0 ) break;
else special = -1;
+ }
}
if ( myClosedMode ) {
if ( code != IOR_UNDEF && ! begin ) {
diff --git a/src/ShapeFix/ShapeFix_Face.cxx b/src/ShapeFix/ShapeFix_Face.cxx
index 0d08df1..b524915 100644
--- a/src/ShapeFix/ShapeFix_Face.cxx
+++ b/src/ShapeFix/ShapeFix_Face.cxx
@@ -1353,16 +1353,18 @@ Standard_Boolean ShapeFix_Face::FixMissingSeam()
if ( ::Precision::IsInfinite ( SUF ) || ::Precision::IsInfinite ( SUL ) ) {
if ( ::Precision::IsInfinite ( SUF ) ) SUF = fU1;
if ( ::Precision::IsInfinite ( SUL ) ) SUL = fU2;
- if(Abs(SUL-SUF) < ::Precision::PConfusion())
+ if(Abs(SUL-SUF) < ::Precision::PConfusion()) {
if ( ::Precision::IsInfinite ( SUF ) ) SUF-=1000.;
else SUL+=1000.;
+ }
}
if ( ::Precision::IsInfinite ( SVF ) || ::Precision::IsInfinite ( SVL ) ) {
if ( ::Precision::IsInfinite ( SVF ) ) SVF = fV1;
if ( ::Precision::IsInfinite ( SVL ) ) SVL = fV2;
- if(Abs(SVL-SVF) < ::Precision::PConfusion())
+ if(Abs(SVL-SVF) < ::Precision::PConfusion()) {
if ( ::Precision::IsInfinite ( SVF ) ) SVF-=1000.;
else SVL+=1000.;
+ }
}
URange = Abs ( SUL - SUF );
@@ -1583,9 +1585,10 @@ Standard_Boolean ShapeFix_Face::FixMissingSeam()
vf = pos1.Y();
}
}
- if ( skipU && skipV )
+ if ( skipU && skipV ) {
if ( i1 <= nb1 ) continue;
else break;
+ }
// or yet better - if it is end of some edges on both wires
for ( Standard_Integer i2 = 1; i1 <= nb1 && i2 <= nb2; i2++ ) {
TopoDS_Edge edge2 = wd2->Edge ( i2 );
diff --git a/src/ShapeFix/ShapeFix_Wire.cxx b/src/ShapeFix/ShapeFix_Wire.cxx
index 6cd3d98..edd9134 100644
--- a/src/ShapeFix/ShapeFix_Wire.cxx
+++ b/src/ShapeFix/ShapeFix_Wire.cxx
@@ -1295,9 +1295,10 @@ Standard_Boolean ShapeFix_Wire::FixShifted()
SVMid = 0.5*(SVF+SVL);
if (uclosed) URange = Abs ( SUL - SUF );
else URange = RealLast();
- if (!IsVCrvClosed)
+ if (!IsVCrvClosed) {
if (vclosed) VRange = Abs ( SVL - SVF );
else VRange = RealLast();
+ }
Standard_Real UTol = 0.2 * URange, VTol = 0.2 * VRange;
Handle(ShapeExtend_WireData) sbwdOring = WireData();
diff --git a/src/ShapeProcess/ShapeProcess_ShapeContext.cxx b/src/ShapeProcess/ShapeProcess_ShapeContext.cxx
index 36a3de4..3fbd7a2 100644
--- a/src/ShapeProcess/ShapeProcess_ShapeContext.cxx
+++ b/src/ShapeProcess/ShapeProcess_ShapeContext.cxx
@@ -398,10 +398,11 @@ void ShapeProcess_ShapeContext::PrintStatistics () const
if (keyshape.ShapeType() == TopAbs_SHELL)
if (valueshape.IsNull()) SN++;
else SS++;
- else if (keyshape.ShapeType() == TopAbs_FACE)
+ else if (keyshape.ShapeType() == TopAbs_FACE) {
if (valueshape.IsNull()) FN++;
else if (valueshape.ShapeType() == TopAbs_SHELL) FS++;
else FF++;
+ }
}
// mapping
diff --git a/src/ShapeProcessAPI/ShapeProcessAPI_ApplySequence.cxx b/src/ShapeProcessAPI/ShapeProcessAPI_ApplySequence.cxx
index 7d9c122..ebfe1d3 100644
--- a/src/ShapeProcessAPI/ShapeProcessAPI_ApplySequence.cxx
+++ b/src/ShapeProcessAPI/ShapeProcessAPI_ApplySequence.cxx
@@ -94,13 +94,15 @@ void ShapeProcessAPI_ApplySequence::PrintPreparationResult () const
Standard_Integer SS = 0, SN = 0, FF = 0, FS = 0, FN = 0;
for (TopTools_DataMapIteratorOfDataMapOfShapeShape It (myContext->Map()); It.More(); It.Next()) {
TopoDS_Shape keyshape = It.Key(), valueshape = It.Value();
- if (keyshape.ShapeType() == TopAbs_SHELL)
+ if (keyshape.ShapeType() == TopAbs_SHELL) {
if (valueshape.IsNull()) SN++;
else SS++;
- else if (keyshape.ShapeType() == TopAbs_FACE)
+ }
+ else if (keyshape.ShapeType() == TopAbs_FACE) {
if (valueshape.IsNull()) FN++;
else if (valueshape.ShapeType() == TopAbs_SHELL) FS++;
else FF++;
+ }
}
Handle(Message_Messenger) aMessenger = myContext->Messenger();
diff --git a/src/TNaming/TNaming_NamedShape.cxx b/src/TNaming/TNaming_NamedShape.cxx
index d5db2a2..faca46c 100644
--- a/src/TNaming/TNaming_NamedShape.cxx
+++ b/src/TNaming/TNaming_NamedShape.cxx
@@ -1101,7 +1101,7 @@ static void SelectSameShape (TNaming_Node*& myNode,
if (Trans < 0) Valid = pdn->myAtt->IsValid();
else Valid = pdn->IsValidInTrans(Trans);
- if (Valid)
+ if (Valid) {
if (Old) {
if( pdn->myOld == RS && pdn->myNew != 0L && pdn->myNew != RS) {
break;
@@ -1112,6 +1112,7 @@ static void SelectSameShape (TNaming_Node*& myNode,
break;
}
}
+ }
pdn = pdn->NextSameShape(RS);
}
myNode = pdn;
diff --git a/src/TopTrans/TopTrans_SurfaceTransition.cxx b/src/TopTrans/TopTrans_SurfaceTransition.cxx
index 4d4d3a8..1fe1d01 100644
--- a/src/TopTrans/TopTrans_SurfaceTransition.cxx
+++ b/src/TopTrans/TopTrans_SurfaceTransition.cxx
@@ -435,9 +435,10 @@ TopAbs_State TopTrans_SurfaceTransition::StateBefore() const
// we take the state before of after orientations
before = ::FUN_getstate(myAng,myOri,AFTER,BEFORE);
// eap Mar 25 2002
- if (myTouchFlag)
+ if (myTouchFlag) {
if (before == TopAbs_OUT) before = TopAbs_IN;
else if (before == TopAbs_IN) before = TopAbs_OUT;
+ }
}
return before;
}
@@ -451,9 +452,10 @@ TopAbs_State TopTrans_SurfaceTransition::StateAfter() const
// looking back in before for defined states
after = ::FUN_getstate(myAng,myOri,BEFORE,AFTER);
// eap Mar 25 2002
- if (myTouchFlag)
+ if (myTouchFlag) {
if (after == TopAbs_OUT) after = TopAbs_IN;
else if (after == TopAbs_IN) after = TopAbs_OUT;
+ }
}
return after;
}
diff --git a/src/ViewerTest/ViewerTest.cxx b/src/ViewerTest/ViewerTest.cxx
index 8abc127..662b6ee 100644
--- a/src/ViewerTest/ViewerTest.cxx
+++ b/src/ViewerTest/ViewerTest.cxx
@@ -449,13 +449,14 @@ Handle(AIS_Shape) GetAISShapeFromName(const char* name)
const Handle(AIS_InteractiveObject) IO =
Handle(AIS_InteractiveObject)::DownCast(GetMapOfAIS().Find2(name));
if (!IO.IsNull()) {
- if(IO->Type()==AIS_KOI_Shape)
+ if(IO->Type()==AIS_KOI_Shape) {
if(IO->Signature()==0){
retsh = *((Handle(AIS_Shape)*)&IO);
}
else
cout << "an Object which is not an AIS_Shape "
"already has this name!!!"<<endl;
+ }
}
return retsh;
}
@@ -949,12 +950,12 @@ static int VSubInt(Draw_Interpretor& di, Standard_Integer argc, const char** arg
TCollection_AsciiString name = argv[2];
if(GetMapOfAIS().IsBound2(name)){
IO = Handle(AIS_InteractiveObject)::DownCast(GetMapOfAIS().Find2(name));
- if (!IO.IsNull())
+ if (!IO.IsNull()) {
if(On==1)
Ctx->SubIntensityOn(IO);
else
Ctx->SubIntensityOff(IO);
-
+ }
}
else return 1;
}
@@ -1069,12 +1070,13 @@ static int VColor2 (Draw_Interpretor& di, Standard_Integer argc, const char** ar
while ( it.More() ) {
const Handle(AIS_InteractiveObject) ashape =
Handle(AIS_InteractiveObject)::DownCast(it.Key1());
- if (!ashape.IsNull())
+ if (!ashape.IsNull()) {
if(HaveToSet)
TheAISContext()->SetColor(ashape,GetColorFromName(argv[1]),
Standard_False);
else
TheAISContext()->UnsetColor(ashape,Standard_False);
+ }
it.Next();
}
TheAISContext()->UpdateCurrentViewer();
@@ -1175,12 +1177,13 @@ static int VTransparency (Draw_Interpretor& di, Standard_Integer argc,
while ( it.More() ) {
Handle(AIS_InteractiveObject) ashape =
Handle(AIS_InteractiveObject)::DownCast(it.Key1());
- if (!ashape.IsNull())
+ if (!ashape.IsNull()) {
if(HaveToSet)
TheAISContext()->SetTransparency(ashape,atof(argv[1]),
Standard_False);
else
TheAISContext()->UnsetTransparency(ashape,Standard_False);
+ }
it.Next();
}
TheAISContext()->UpdateCurrentViewer();
@@ -1237,12 +1240,13 @@ static int VMaterial (Draw_Interpretor& di, Standard_Integer argc, const char**
if ( ThereIsName && IsBound ) {
Handle(AIS_InteractiveObject) ashape =
Handle(AIS_InteractiveObject)::DownCast (GetMapOfAIS().Find2(name));
- if (!ashape.IsNull())
+ if (!ashape.IsNull()) {
if (HaveToSet)
TheAISContext()->SetMaterial (ashape,
GetMaterialFromName (argv[2]) );
else
TheAISContext()->UnsetMaterial(ashape);
+ }
}
//=======================================================================
// Il n'y a pas de nom de shape
@@ -1273,12 +1277,13 @@ static int VMaterial (Draw_Interpretor& di, Standard_Integer argc, const char**
while ( it.More() ) {
Handle(AIS_InteractiveObject) ashape =
Handle(AIS_InteractiveObject)::DownCast (it.Key1());
- if (!ashape.IsNull())
+ if (!ashape.IsNull()) {
if (HaveToSet)
TheAISContext()->SetMaterial(ashape,GetMaterialFromName(argv[1]),
Standard_False );
else
TheAISContext()->UnsetMaterial(ashape,Standard_False);
+ }
it.Next();
}
TheAISContext()->UpdateCurrentViewer();
@@ -1373,11 +1378,12 @@ static int VWidth (Draw_Interpretor& di, Standard_Integer argc, const char** arg
while ( it.More() ) {
Handle(AIS_InteractiveObject) ashape =
Handle(AIS_InteractiveObject)::DownCast (it.Key1());
- if (!ashape.IsNull())
+ if (!ashape.IsNull()) {
if (HaveToSet)
TheAISContext()->SetWidth(ashape,atof (argv[1]),Standard_False );
else
TheAISContext()->UnsetWidth (ashape,Standard_False);
+ }
it.Next();
}
TheAISContext()->UpdateCurrentViewer();
diff --git a/src/VrmlData/VrmlData_Geometry.cxx b/src/VrmlData/VrmlData_Geometry.cxx
index 65a68a1..1cbe289 100644
--- a/src/VrmlData/VrmlData_Geometry.cxx
+++ b/src/VrmlData/VrmlData_Geometry.cxx
@@ -553,7 +553,7 @@ VrmlData_ErrorStatus VrmlData_TextureCoordinate::Read
// Match the name with the current word in the stream
if (VRMLDATA_LCOMPARE (theBuffer.LinePtr, "point"))
// Read the body of the data node (comma-separated list of duplets)
- if (OK(aStatus, VrmlData_Scene::ReadLine(theBuffer)))
+ if (OK(aStatus, VrmlData_Scene::ReadLine(theBuffer))) {
if (theBuffer.LinePtr[0] != '[') // opening bracket
aStatus = VrmlData_VrmlFormatError;
else {
@@ -583,6 +583,7 @@ VrmlData_ErrorStatus VrmlData_TextureCoordinate::Read
break;
}
}
+ }
if (OK(aStatus) && OK(aStatus, readBrace (theBuffer))) {
myLength = vecValues.Length();
if (myLength > 0) {
@@ -644,7 +645,7 @@ VrmlData_ErrorStatus VrmlData_ArrayVec3d::ReadArray
theBuffer.LinePtr++;
}
// Read the body of the data node (list of triplets)
- if (OK(aStatus) && OK(aStatus, VrmlData_Scene::ReadLine(theBuffer)))
+ if (OK(aStatus) && OK(aStatus, VrmlData_Scene::ReadLine(theBuffer))) {
if (theBuffer.LinePtr[0] != '[') // opening bracket
aStatus = VrmlData_VrmlFormatError;
else {
@@ -671,6 +672,7 @@ VrmlData_ErrorStatus VrmlData_ArrayVec3d::ReadArray
}
}
}
+ }
if (OK(aStatus) && OK(aStatus, readBrace (theBuffer))) {
myLength = vecValues.Length();
if (myLength > 0) {
diff --git a/src/VrmlData/VrmlData_IndexedFaceSet.cxx b/src/VrmlData/VrmlData_IndexedFaceSet.cxx
index 667206f..14020ad 100644
--- a/src/VrmlData/VrmlData_IndexedFaceSet.cxx
+++ b/src/VrmlData/VrmlData_IndexedFaceSet.cxx
@@ -52,11 +52,12 @@ VrmlData_ErrorStatus VrmlData_Faceted::readData (VrmlData_InBuffer& theBuffer)
} else if (VRMLDATA_LCOMPARE (theBuffer.LinePtr, "creaseAngle")) {
Standard_Real anAngle;
if (OK(aStatus, Scene().ReadReal (theBuffer, anAngle,
- Standard_False, Standard_False)))
+ Standard_False, Standard_False))) {
if (anAngle < -Precision::Confusion()*0.001)
aStatus = VrmlData_IrrelevantNumber;
else
myCreaseAngle = anAngle;
+ }
}
return aStatus;
}
diff --git a/src/VrmlData/VrmlData_Node.cxx b/src/VrmlData/VrmlData_Node.cxx
index 9e4b369..95ab4a8 100644
--- a/src/VrmlData/VrmlData_Node.cxx
+++ b/src/VrmlData/VrmlData_Node.cxx
@@ -165,11 +165,12 @@ VrmlData_ErrorStatus VrmlData_Node::WriteClosing () const
VrmlData_ErrorStatus VrmlData_Node::readBrace (VrmlData_InBuffer& theBuffer)
{
VrmlData_ErrorStatus aStatus;
- if (OK(aStatus, VrmlData_Scene::ReadLine(theBuffer)))
+ if (OK(aStatus, VrmlData_Scene::ReadLine(theBuffer))) {
if (theBuffer.LinePtr[0] == '}')
theBuffer.LinePtr++;
else
aStatus = VrmlData_VrmlFormatError;
+ }
return aStatus;
}
diff --git a/src/VrmlData/VrmlData_Scene.cxx b/src/VrmlData/VrmlData_Scene.cxx
index b8c187f..c440d65 100644
--- a/src/VrmlData/VrmlData_Scene.cxx
+++ b/src/VrmlData/VrmlData_Scene.cxx
@@ -211,11 +211,12 @@ VrmlData_ErrorStatus VrmlData_Scene::readLine (VrmlData_InBuffer& theBuffer)
const int stat = theBuffer.Input.rdstate();
if (stat & ios::badbit)
aStatus = VrmlData_UnrecoverableError;
- else if (stat & ios::failbit)
+ else if (stat & ios::failbit) {
if (stat & ios::eofbit)
aStatus = VrmlData_EndOfFile;
else
aStatus = VrmlData_GeneralError;
+ }
theBuffer.LinePtr = &theBuffer.Line[0];
theBuffer.IsProcessed = Standard_False;
}
@@ -450,7 +451,7 @@ VrmlData_ErrorStatus VrmlData_Scene::createNode
TCollection_AsciiString aName;
// Read the DEF token to assign the node name
- if (VrmlData_Node::OK(aStatus, ReadLine(theBuffer)))
+ if (VrmlData_Node::OK(aStatus, ReadLine(theBuffer))) {
if (VRMLDATA_LCOMPARE(theBuffer.LinePtr, "DEF")) {
if (VrmlData_Node::OK(aStatus, ReadWord (theBuffer, aName)))
aStatus = ReadLine(theBuffer);
@@ -458,6 +459,7 @@ VrmlData_ErrorStatus VrmlData_Scene::createNode
theNode.Nullify();
return aStatus;
}
+ }
const char * strName = aName.ToCString();
if (aStatus == VrmlData_StatusOK) {
@@ -507,7 +509,7 @@ VrmlData_ErrorStatus VrmlData_Scene::createNode
aStatus = ReadWord (theBuffer, aTitle);
if (isProto) {
aStatus = ReadLine(theBuffer);
- if (aStatus == VrmlData_StatusOK)
+ if (aStatus == VrmlData_StatusOK) {
if (theBuffer.LinePtr[0] != '[')
aStatus = VrmlData_VrmlFormatError;
else {
@@ -531,6 +533,7 @@ VrmlData_ErrorStatus VrmlData_Scene::createNode
}
}
}
+ }
}
if (aStatus == VrmlData_StatusOK)
aNode = new VrmlData_UnknownNode(* this,
@@ -549,13 +552,14 @@ VrmlData_ErrorStatus VrmlData_Scene::createNode
aNode->myLineCount = theBuffer.LineCount;
#endif
}
- if (aStatus == VrmlData_StatusOK)
+ if (aStatus == VrmlData_StatusOK) {
if (theBuffer.LinePtr[0] == '{') {
theBuffer.LinePtr++;
theNode = aNode;
myAllNodes.Append(aNode);
} else
aStatus = VrmlData_VrmlFormatError;
+ }
return aStatus;
}
@@ -710,13 +714,14 @@ VrmlData_ErrorStatus VrmlData_Scene::ReadXYZ
theBuffer.LinePtr = endptr;
}
}
- if (aStatus == VrmlData_StatusOK)
+ if (aStatus == VrmlData_StatusOK) {
if (isScale)
theXYZ.SetCoord (aVal[0] * myLinearScale,
aVal[1] * myLinearScale,
aVal[2] * myLinearScale);
else
theXYZ.SetCoord (aVal[0], aVal[1], aVal[2]);
+ }
return aStatus;
}
@@ -749,11 +754,12 @@ VrmlData_ErrorStatus VrmlData_Scene::ReadXY
theBuffer.LinePtr = endptr;
}
}
- if (aStatus == VrmlData_StatusOK)
+ if (aStatus == VrmlData_StatusOK) {
if (isScale)
theXY.SetCoord (aVal[0] * myLinearScale, aVal[1] * myLinearScale);
else
theXY.SetCoord (aVal[0], aVal[1]);
+ }
return aStatus;
}
@@ -770,7 +776,7 @@ VrmlData_ErrorStatus VrmlData_Scene::ReadArrIndex
{
VrmlData_ErrorStatus aStatus;
theNBlocks = 0;
- if (VrmlData_Node::OK(aStatus, ReadLine(theBuffer)))
+ if (VrmlData_Node::OK(aStatus, ReadLine(theBuffer))) {
if (theBuffer.LinePtr[0] != '[') // opening bracket
aStatus = VrmlData_VrmlFormatError;
else {
@@ -837,6 +843,7 @@ VrmlData_ErrorStatus VrmlData_Scene::ReadArrIndex
}
}
}
+ }
return aStatus;
}
@@ -907,7 +914,7 @@ VrmlData_ErrorStatus VrmlData_Scene::WriteXYZ
const char * thePostfix) const
{
char buf[240];
- if (IsDummyWrite() == Standard_False)
+ if (IsDummyWrite() == Standard_False) {
if (isApplyScale && myLinearScale > Precision::Confusion())
sprintf (buf, "%.12g %.12g %.12g%s", theXYZ.X() / myLinearScale,
theXYZ.Y() / myLinearScale, theXYZ.Z() / myLinearScale,
@@ -915,6 +922,7 @@ VrmlData_ErrorStatus VrmlData_Scene::WriteXYZ
else
sprintf (buf, "%.12g %.12g %.12g%s", theXYZ.X(), theXYZ.Y(), theXYZ.Z(),
thePostfix ? thePostfix : "");
+ }
return WriteLine (buf);
}
diff --git a/src/XCAFDoc/XCAFDoc_ColorTool.cxx b/src/XCAFDoc/XCAFDoc_ColorTool.cxx
index 37d66d5..91f51bf 100644
--- a/src/XCAFDoc/XCAFDoc_ColorTool.cxx
+++ b/src/XCAFDoc/XCAFDoc_ColorTool.cxx
@@ -444,7 +444,7 @@ Standard_Boolean XCAFDoc_ColorTool::SetInstanceColor (const TopoDS_Shape& theSha
return Standard_False;
Handle(XCAFDoc_GraphNode) aSHUO;
// set the SHUO structure for this component if it is not exist
- if ( !ShapeTool()->FindSHUO( aLabels, aSHUO ) )
+ if ( !ShapeTool()->FindSHUO( aLabels, aSHUO ) ) {
if (aLabels.Length() == 1) {
// set color directly for component as NAUO
SetColor(aLabels.Value(1), color, type);
@@ -452,6 +452,7 @@ Standard_Boolean XCAFDoc_ColorTool::SetInstanceColor (const TopoDS_Shape& theSha
}
else if ( !IsCreateSHUO || !ShapeTool()->SetSHUO( aLabels, aSHUO ) )
return Standard_False;
+ }
TDF_Label aSHUOLabel = aSHUO->Label();
SetColor( aSHUOLabel, color, type );
return Standard_True;
diff --git a/src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx b/src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx
index 932e385..3c2b3f9 100644
--- a/src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx
+++ b/src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx
@@ -581,11 +581,12 @@ static Standard_Integer hidesel
{
Handle( MeshVS_MeshEntityOwner ) anOwner =
Handle( MeshVS_MeshEntityOwner )::DownCast( aContext->SelectedOwner() );
- if( !anOwner.IsNull() )
+ if( !anOwner.IsNull() ) {
if( anOwner->Type()==MeshVS_ET_Node )
aHiddenNodes->ChangeMap().Add( anOwner->ID() );
else
aHiddenElements->ChangeMap().Add( anOwner->ID() );
+ }
}
aContext->ClearSelected();
aMesh->SetHiddenNodes( aHiddenNodes );
@@ -626,11 +627,12 @@ static Standard_Integer showonly
{
Handle( MeshVS_MeshEntityOwner ) anOwner =
Handle( MeshVS_MeshEntityOwner )::DownCast( aContext->SelectedOwner() );
- if( !anOwner.IsNull() )
+ if( !anOwner.IsNull() ) {
if( anOwner->Type()==MeshVS_ET_Node )
aHiddenNodes->ChangeMap().Remove( anOwner->ID() );
else
aHiddenElements->ChangeMap().Remove( anOwner->ID() );
+ }
}
aMesh->SetHiddenNodes( aHiddenNodes );
aMesh->SetHiddenElems( aHiddenElements );
--
OCE packaging
More information about the debian-science-commits
mailing list