OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0023604: Uninitialized variables in debug mode

Browse Source 
Removed #ifndef DEB ... #else ... #endif directives where the variables were being initialized only in release mode.
Removed unused part of code.
This commit is contained in:
abv
2012-12-10 16:53:05 +04:00
committed by omy
parent bd92cc2a59
commit 7a06c690fb
81 changed files with 17 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/ChFi3d/ChFi3d_Builder.cxx
View File

@@ -275,30 +275,28 @@ void ChFi3d_Builder::Compute()
//construct fillets on each vertex + feed the Ds
if (done) {
//Standard_Integer nbresult=0;
// for (Standard_Integer j=1;j<=myVDataMap.Extent();j++) {
#ifndef DEB
static
#endif //to avoid Linux warning:<< variable `j' might be clobbered by `longjmp' or `vfork' >>
Standard_Integer j;
for (j=1;j<=myVDataMap.Extent();j++) {
try {
for (j=1;j<=myVDataMap.Extent();j++)
{
try
{
OCC_CATCH_SIGNALS
PerformFilletOnVertex(j);
PerformFilletOnVertex(j);
}
catch(Standard_Failure) {
Handle(Standard_Failure) exc = Standard_Failure::Caught();
catch(Standard_Failure)
{
Handle(Standard_Failure) exc = Standard_Failure::Caught();
#ifdef DEB
cout <<"EXCEPTION Corner compute " << exc << endl;
cout <<"EXCEPTION Corner compute " << exc << endl;
#endif
badvertices.Append(myVDataMap.FindKey(j));
badvertices.Append(myVDataMap.FindKey(j));
hasresult=Standard_False;
done = Standard_True;
done = Standard_True;
}
if (!done) badvertices.Append(myVDataMap.FindKey(j));
done = Standard_True;
}
if (!hasresult) done = badvertices.IsEmpty();
if (!hasresult) done = badvertices.IsEmpty();
}
@@ -575,11 +573,7 @@ void ChFi3d_Builder::PerformSingularCorner
Handle(ChFiDS_SurfData) Fd;
Standard_Integer i, Icurv;
#ifndef DEB
Standard_Integer Ivtx = 0;
#else
Standard_Integer Ivtx;
#endif
for (It.Initialize(myVDataMap(Index)), i=0; It.More(); It.Next(),i++){
stripe = It.Value();
// SurfData concerned and its CommonPoints,
@@ -647,11 +641,7 @@ void ChFi3d_Builder::PerformFilletOnVertex
Standard_Integer i;
Standard_Boolean nondegenere = Standard_True;
Standard_Boolean toujoursdegenere = Standard_True;
#ifndef DEB
Standard_Boolean isfirst = Standard_False;
#else
Standard_Boolean isfirst;
#endif
for (It.Initialize(myVDataMap(Index)), i=0; It.More(); It.Next(),i++){
stripe = It.Value();
sp = stripe->Spine();

4
src/ChFi3d/ChFi3d_Builder_1.cxx
View File

@@ -658,11 +658,7 @@ Standard_Boolean ChFi3d_Builder::PerformElement(const Handle(ChFiDS_Spine)& Spin
Standard_Boolean Fini = Standard_False;
Standard_Integer Nb;
#ifndef DEB
ChFiDS_State CurSt = ChFiDS_Closed;
#else
ChFiDS_State CurSt;
#endif
if (VStart.IsSame(LVEc)) {//case if only one edge is closed
CEc.Initialize(Ec);
Wl = BRep_Tool::Parameter(VStart,Ec);

20
src/ChFi3d/ChFi3d_Builder_2.cxx
View File

@@ -471,11 +471,7 @@ Standard_Boolean IsG1(const ChFiDS_Map& TheMap,
// in which case FVoi = FRef is returned (less frequent case).
TopExp_Explorer Ex;
Standard_Boolean orset = Standard_False;
#ifndef DEB
TopAbs_Orientation orient = TopAbs_FORWARD ;
#else
TopAbs_Orientation orient;
#endif
TopoDS_Edge ed;
for(Ex.Init(FRef,TopAbs_EDGE); Ex.More(); Ex.Next()){
ed = TopoDS::Edge(Ex.Current());
@@ -810,11 +806,7 @@ void ChFi3d_Builder::StartSol(const Handle(ChFiDS_Stripe)& Stripe,
Standard_Real wl = 0.9973 * Spine->LastParameter(nbed) +
0.0027 * Spine->FirstParameter(nbed);
#ifndef DEB
Standard_Real TolE = 1.0e-7;
#else
Standard_Real TolE;
#endif
BRepAdaptor_Surface AS;
Standard_Integer nbessai;
@@ -825,11 +817,7 @@ void ChFi3d_Builder::StartSol(const Handle(ChFiDS_Stripe)& Stripe,
TopoDS_Edge cured;
TopoDS_Face f1,f2;
TopAbs_Orientation Or1,Or2;
#ifndef DEB
Standard_Integer Choix = 0;
#else
Standard_Integer Choix;
#endif
math_Vector SolDep(1,4);
Handle(Geom2d_Curve) PC;
Extrema_ExtPC PExt;
@@ -2006,11 +1994,7 @@ void ChFi3d_Builder::PerformSetOfSurfOnElSpine
}
}
Standard_Real MaxStep = (bidl-bidf)*0.05/nbed;
#ifndef DEB
Standard_Real Firstsov = 0.;
#else
Standard_Real Firstsov;
#endif
Standard_Boolean intf = 0, intl = 0;
while(!fini){
// are these the ends (no extension on periodic).
@@ -2931,11 +2915,7 @@ void ChFi3d_Builder::PerformSetOfKGen(Handle(ChFiDS_Stripe)& Stripe,
Standard_Real fp = cursd->FirstSpineParam();
Standard_Real lp = cursd->LastSpineParam();
Standard_Integer j;
#ifndef DEB
Standard_Integer jf = 0, jl = 0;
#else
Standard_Integer jf,jl;
#endif
if(lp < WF+tolesp || fp > WL-tolesp) continue;
for(j = IF; j < IL; j++){
jf = j;

28
src/ChFi3d/ChFi3d_Builder_6.cxx
View File

@@ -656,11 +656,7 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data,
if(checkcurve.IsNull()) checkcurve = new GeomAdaptor_HCurve();
GeomAdaptor_Curve& chc = checkcurve->ChangeCurve();
Standard_Real tolget3d, tolget2d, tolaux, tolC1, tolcheck;
#ifndef DEB
Standard_Real tolC2 = 0.;
#else
Standard_Real tolC2;
#endif
approx.TolReached(tolget3d, tolget2d);
tolaux = approx.TolCurveOnSurf(1);
tolC1 = tolget3d + tolaux;
@@ -959,11 +955,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Standard_Real MS = MaxStep;
Standard_Integer again = 0;
Standard_Integer nbptmin = 3; //jlr
#ifndef DEB
Standard_Integer Nbpnt = 0;
#else
Standard_Integer Nbpnt;
#endif
// the initial solution is reframed if necessary.
math_Vector ParSol(1,3);
Standard_Real NewFirst = PFirst;
@@ -1095,11 +1087,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Standard_Real MS = MaxStep;
Standard_Integer again = 0;
Standard_Integer nbptmin = 3; //jlr
#ifndef DEB
Standard_Integer Nbpnt = 0;
#else
Standard_Integer Nbpnt;
#endif
// the initial solution is reframed if necessary.
math_Vector ParSol(1,2);
Standard_Real NewFirst = PFirst;
@@ -1229,11 +1217,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
Standard_Real MS = MaxStep;
Standard_Integer again = 0;
#ifndef DEB
Standard_Integer Nbpnt = 0;
#else
Standard_Integer Nbpnt;
#endif
// the starting solution is reframed if needed.
math_Vector ParSol(1,3);
Standard_Real NewFirst = PFirst;
@@ -1359,11 +1343,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
Standard_Real MS = MaxStep;
Standard_Integer again = 0;
#ifndef DEB
Standard_Integer Nbpnt = 0;
#else
Standard_Integer Nbpnt;
#endif
// The initial solution is reframed if necessary.
math_Vector ParSol(1,2);
Standard_Real NewFirst = PFirst;
@@ -1581,11 +1561,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
//******************************************************************//
Standard_Integer again = 0;
Standard_Boolean tchernobyl = 0;
#ifndef DEB
Standard_Real u1sov = 0., u2sov = 0.;
#else
Standard_Real u1sov, u2sov;
#endif
TopoDS_Face bif;
//Max step is relevant, but too great, the vector is required to detect
//the twists.
@@ -2110,11 +2086,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
}
Standard_Real Targetsov = Target;
#ifndef DEB
Standard_Real u1sov = 0., u2sov = 0.;
#else
Standard_Real u1sov, u2sov;
#endif
// on recadre la solution de depart a la demande.
math_Vector ParSol(1,4);
Standard_Real NewFirst = PFirst;

56
src/ChFi3d/ChFi3d_Builder_C1.cxx
View File

@@ -235,11 +235,9 @@ static Standard_Boolean Update(Handle(Adaptor3d_HSurface)& fb,
//are already in place at this stage.
//Modif lvt : the periodic cases are reframed, espercially if nothing was found.
Standard_Real w,uf = ct->FirstParameter(),ul = ct->LastParameter();
#ifndef DEB
Standard_Real wbis = 0.;
#else
Standard_Real wbis;
#endif
Standard_Boolean isperiodic = ct->IsPeriodic(),recadrebis = Standard_False;
Intersection.Perform(ct,fb);
if (Intersection.IsDone()) {
@@ -628,11 +626,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
TopoDS_Edge Arcpiv,Arcprol,Arcspine;
if (isfirst) Arcspine = spine->Edges(1);
else Arcspine = spine->Edges(spine->NbEdges());
#ifndef DEB
TopAbs_Orientation OArcprolv = TopAbs_FORWARD, OArcprolop = TopAbs_FORWARD;
#else
TopAbs_Orientation OArcprolv,OArcprolop;
#endif
Standard_Integer ICurve;
Handle(BRepAdaptor_HSurface) HBs = new BRepAdaptor_HSurface();
Handle(BRepAdaptor_HSurface) HBad = new BRepAdaptor_HSurface();
@@ -643,11 +637,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
Handle(Geom_Curve) Cc;
Handle(Geom2d_Curve) Pc,Ps;
Standard_Real Ubid,Vbid;//,mu,Mu,mv,Mv;
#ifndef DEB
Standard_Real Udeb = 0.,Ufin = 0.;
#else
Standard_Real Udeb,Ufin;
#endif
// gp_Pnt2d UVf1,UVl1,UVf2,UVl2;
// Standard_Real Du,Dv,Step;
Standard_Boolean inters = Standard_True;
@@ -830,13 +820,8 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
TopoDS_Edge edgecouture;
Standard_Boolean couture,intcouture=Standard_False;;
Standard_Real tolreached;
#ifndef DEB
Standard_Real par1 =0.,par2 =0.;
Standard_Integer indpt = 0,Icurv1 = 0,Icurv2 = 0;
#else
Standard_Real par1,par2;
Standard_Integer indpt,Icurv1,Icurv2;
#endif
Handle(Geom_TrimmedCurve) curv1,curv2;
Handle(Geom2d_Curve) c2d1,c2d2;
@@ -940,11 +925,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
Standard_NotImplemented::Raise("OneCorner : bouchon non ecrit");
}
Standard_Integer IShape = DStr.AddShape(Fv);
#ifndef DEB
TopAbs_Orientation Et = TopAbs_FORWARD;
#else
TopAbs_Orientation Et;
#endif
if (IFadArc == 1) {
TopExp_Explorer Exp;
for (Exp.Init(Fv.Oriented(TopAbs_FORWARD),
@@ -1245,11 +1226,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
// First of all the ponts are cut with the edge of the spine.
Standard_Integer IArcspine = DStr.AddShape(Arcspine);
Standard_Integer IVtx = DStr.AddShape(Vtx);
#ifndef DEB
TopAbs_Orientation OVtx = TopAbs_FORWARD;
#else
TopAbs_Orientation OVtx;
#endif
for(ex.Init(Arcspine.Oriented(TopAbs_FORWARD),TopAbs_VERTEX);
ex.More(); ex.Next()) {
if (Vtx.IsSame(ex.Current())) {
@@ -1754,11 +1731,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
// gp_Pnt2d p2d;
Standard_Real dist;
Standard_Integer Ishape1=Fd->IndexOfS1();
#ifndef DEB
TopAbs_Orientation trafil1 = TopAbs_FORWARD;
#else
TopAbs_Orientation trafil1;
#endif
if (Ishape1 != 0) {
if (Ishape1 > 0) {
trafil1 = DStr.Shape(Ishape1).Orientation();
@@ -2588,11 +2561,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
// storage for the face
//////////////////////////////////////////////////////////////////////
#ifndef DEB
TopAbs_Orientation ori = TopAbs_FORWARD;
#else
TopAbs_Orientation ori;
#endif
orface=Face[nb-1].Orientation();
if (orface==orsurfdata ) orien = TopAbs::Reverse(orcourbe);
else orien = orcourbe ;
@@ -3827,11 +3796,7 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
if(isfirst) Arcspine = spine->Edges(1);
else Arcspine = spine->Edges(spine->NbEdges());
TopAbs_Orientation OArcprolbis;
#ifndef DEB
TopAbs_Orientation OArcprolv = TopAbs_FORWARD, OArcprolop = TopAbs_FORWARD;
#else
TopAbs_Orientation OArcprolv, OArcprolop;
#endif
Standard_Integer ICurve;
Handle(BRepAdaptor_HSurface) HBs = new BRepAdaptor_HSurface();
Handle(BRepAdaptor_HSurface) HBad = new BRepAdaptor_HSurface();
@@ -3842,11 +3807,7 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
Handle(Geom_Curve) Cc;
Handle(Geom2d_Curve) Pc,Ps;
Standard_Real Ubid,Vbid;//,mu,Mu,mv,Mv;
#ifndef DEB
Standard_Real Udeb = 0.,Ufin = 0.;
#else
Standard_Real Udeb,Ufin;
#endif
//gp_Pnt2d UVf1,UVl1,UVf2,UVl2;
//Standard_Real Du,Dv,Step;
Standard_Boolean inters = Standard_True;
@@ -4023,13 +3984,8 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
TopoDS_Edge edgecouture;
Standard_Boolean couture,intcouture=Standard_False;;
Standard_Real tolreached;
#ifndef DEB
Standard_Real par1 = 0.,par2 = 0.;
Standard_Integer indpt =0,Icurv1 =0,Icurv2 =0;
#else
Standard_Real par1,par2;
Standard_Integer indpt,Icurv1,Icurv2;
#endif
Handle(Geom_TrimmedCurve) curv1,curv2;
Handle(Geom2d_Curve) c2d1,c2d2;
@@ -4132,11 +4088,7 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
Standard_NotImplemented::Raise("OneCorner : cap not written");
}
Standard_Integer IShape = DStr.AddShape(Fv);
#ifndef DEB
TopAbs_Orientation Et = TopAbs_FORWARD;
#else
TopAbs_Orientation Et;
#endif
if(IFadArc == 1){
TopExp_Explorer Exp;
for (Exp.Init(Fv.Oriented(TopAbs_FORWARD),
@@ -4252,11 +4204,7 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
Standard_Integer IArcspine = DStr.AddShape(Arcspine);
Standard_Integer IVtx = DStr.AddShape(Vtx);
TopAbs_Orientation OVtx2;
#ifndef DEB
TopAbs_Orientation OVtx = TopAbs_FORWARD;
#else
TopAbs_Orientation OVtx;
#endif
for(ex.Init(Arcspine.Oriented(TopAbs_FORWARD),TopAbs_VERTEX);
ex.More(); ex.Next()){
if(Vtx.IsSame(ex.Current())) {

4
src/ChFi3d/ChFi3d_Builder_C2.cxx
View File

@@ -402,11 +402,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
// on the opposing face with the surface of the big,
// and finally intersect the big with the face at end
// between this point and the point on arc.
#ifndef DEB
Standard_Boolean parcrois = Standard_False ;
#else
Standard_Boolean parcrois;
#endif
TopExp_Explorer Expl;
for(Expl.Init(pivot.Oriented(TopAbs_FORWARD),TopAbs_VERTEX);
Expl.More(); Expl.Next()){

24
src/ChFi3d/ChFi3d_Builder_CnCrn.cxx
View File

@@ -483,11 +483,7 @@ static void CalculBatten (const Handle (GeomAdaptor_HSurface) ASurf,
Handle (Geom2d_Curve)& pcurve)
{
Standard_Boolean isplane;
#ifndef DEB
Standard_Boolean anglebig = Standard_False;
#else
Standard_Boolean anglebig;
#endif
isplane=ASurf->GetType()==GeomAbs_Plane;
gp_Dir2d dir1 (xdir, ydir);
Geom2dLProp_CLProps2d CL1(curv2d1, picicplus, 1, 1.e-4);
@@ -609,11 +605,7 @@ static void OrientationAreteViveConsecutive (const TopoDS_Shape & Fviveicicplus,
TopAbs_Orientation & orien)
{ // orinterf is orientation of edge ic corresponding to face Fviveicicplus taken FORWARD
#ifndef DEB
TopAbs_Orientation orinterf = TopAbs_FORWARD;
#else
TopAbs_Orientation orinterf;
#endif
TopoDS_Face F=TopoDS::Face( Fviveicicplus);
TopoDS_Edge E=TopoDS::Edge( Eviveic);
TopExp_Explorer ex;
@@ -1832,11 +1824,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
// between edges (or stripes ) icmoins and indfin.
// Then this courbe3d is projected on all faces (nbface) that
// separate icmoins and indfin
#ifndef DEB
Standard_Integer nbface = 0;
#else
Standard_Integer nbface;
#endif
Standard_Real error;
TColGeom2d_Array1OfCurve proj2d1(0,size);
TColGeom2d_Array1OfCurve proj2d2(0,size);
@@ -1997,11 +1985,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
Standard_Boolean intersection=Standard_False, introuve;
if (nconges==2 && !deuxconges) {
gp_Pnt P1,P2,P3,P4;
#ifndef DEB
Standard_Integer ic1 = 0,ic2 = 0;
#else
Standard_Integer ic1,ic2;
#endif
trouve=Standard_False;
for (ic=0;ic<nedge&&!trouve;ic++) {
if (!sharp.Value(ic)){
@@ -2685,11 +2669,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
else
Arcspine= CD.Value(ic)->Spine()->Edges(nbedge);
Standard_Integer IArcspine = DStr.AddShape(Arcspine);
#ifndef DEB
TopAbs_Orientation OVtx = TopAbs_FORWARD;
#else
TopAbs_Orientation OVtx;
#endif
for(ex.Init(Arcspine.Oriented(TopAbs_FORWARD),TopAbs_VERTEX);
ex.More(); ex.Next()){
if(V1.IsSame(ex.Current())) {
@@ -2742,11 +2722,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
// the curves from ic to icplus the pcurves of Plate
// all have the same orientation
Standard_Integer Ishape1,Ishape2;
#ifndef DEB
TopAbs_Orientation trafil1 = TopAbs_FORWARD, trafil2 = TopAbs_FORWARD;
#else
TopAbs_Orientation trafil1,trafil2;
#endif
Ishape1 = Fd->IndexOfS1();
Ishape2 = Fd->IndexOfS2();
const ChFiDS_FaceInterference& Fi1 = Fd->InterferenceOnS1();

4
src/ChFi3d/ChFi3d_Builder_SpKP.cxx
View File

@@ -660,11 +660,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
Standard_Real pitol = Precision::PIntersection();
ChFiKPart_RstMap M1, M2;
#ifndef DEB
Standard_Integer iH1 = 0,iH2 = 0;
#else
Standard_Integer iH1,iH2;
#endif
Standard_Integer Nb1 = 1,Nb2 = 1;
// Cutting of tangency lines (hatching).

16
src/ChFi3d/ChFi3d_ChBuilder.cxx
View File

@@ -761,11 +761,7 @@ void ChFi3d_ChBuilder::SimulKPart(const Handle(ChFiDS_SurfData)& SD ) const
Standard_Real ang = (u2-u1);
gp_Cone Co = AS.Cone();
Standard_Real rad = Co.RefRadius(), sang = Co.SemiAngle();
//#ifndef DEB
Standard_Integer n = (Standard_Integer) (36.*ang/M_PI + 1);
//#else
// Standard_Integer n = 36.*ang/M_PI + 1;
//#endif
if(n<2) n = 2;
sec = new ChFiDS_SecHArray1(1, n);
for (Standard_Integer i = 1; i <= n; i++) {
@@ -1904,11 +1900,7 @@ void ChFi3d_ChBuilder::ExtentOneCorner(const TopoDS_Vertex& V,
void ChFi3d_ChBuilder::ExtentTwoCorner(const TopoDS_Vertex& V,
const ChFiDS_ListOfStripe& LS)
{
#ifndef DEB
Standard_Integer Sens = 0;
#else
Standard_Integer Sens;
#endif
ChFiDS_ListIteratorOfListOfStripe itel(LS);
Standard_Boolean FF = Standard_True;
Standard_Boolean isfirst[2];
@@ -2030,11 +2022,7 @@ void ChFi3d_ChBuilder::ExtentTwoCorner(const TopoDS_Vertex& V,
void ChFi3d_ChBuilder::ExtentThreeCorner(const TopoDS_Vertex& V,
const ChFiDS_ListOfStripe& LS)
{
#ifndef DEB
Standard_Integer Sens = 0;
#else
Standard_Integer Sens;
#endif
ChFiDS_ListOfStripe check;
Standard_Boolean isfirst[3];
Standard_Integer Iedge[3];
@@ -2239,11 +2227,7 @@ void ChFi3d_ChBuilder::ConexFaces (const Handle(ChFiDS_Spine)& Spine,
Standard_Integer ChFi3d_ChBuilder::FindChoiceDistAngle(const Standard_Integer Choice,
const Standard_Boolean DisOnF1) const
{
#ifndef DEB
Standard_Integer ch = 0;
#else
Standard_Integer ch;
#endif
if (!DisOnF1) {
switch (Choice) {

20
src/ChFi3d/ChFi3d_FilBuilder.cxx
View File

@@ -171,11 +171,7 @@ void ChFi3d_FilBuilder::SetFilletShape(const ChFi3d_FilletShape FShape)
ChFi3d_FilletShape ChFi3d_FilBuilder::GetFilletShape() const
{
#ifndef DEB
ChFi3d_FilletShape filshape = ChFi3d_Rational; // need to set default value
#else
ChFi3d_FilletShape filshape;
#endif
switch (myShape) {
case BlendFunc_Rational:
filshape= ChFi3d_Rational;
@@ -557,11 +553,7 @@ void ChFi3d_FilBuilder::SimulKPart(const Handle(ChFiDS_SurfData)& SD) const
Standard_Real ang = (u2-u1);
gp_Torus To = AS.Torus();
Standard_Real majr = To.MajorRadius(), minr = To.MinorRadius();
//#ifndef DEB
Standard_Integer n = (Standard_Integer) (36.*ang/M_PI + 1);
//#else
// Standard_Integer n = 36.*ang/M_PI + 1;
//#endif
if(n<2) n = 2;
sec = new ChFiDS_SecHArray1(1, n);
for (Standard_Integer i = 1; i <= n; i++) {
@@ -580,11 +572,7 @@ void ChFi3d_FilBuilder::SimulKPart(const Handle(ChFiDS_SurfData)& SD) const
Standard_Real ang = (u2-u1);
gp_Sphere Sp = AS.Sphere();
Standard_Real rad = Sp.Radius();
//#ifndef DEB
Standard_Integer n = (Standard_Integer) (36.*ang/M_PI + 1);
//#else
// Standard_Integer n = 36.*ang/M_PI + 1;
//#endif
if(n<2) n = 2;
sec = new ChFiDS_SecHArray1(1, n);
for (Standard_Integer i = 1; i <= n; i++) {
@@ -1863,11 +1851,7 @@ void ChFi3d_FilBuilder::ExtentOneCorner(const TopoDS_Vertex& V,
{
// review by using the data at end of fillets (point, radius, normal
// to the faces and tangents of the guideline).
#ifndef DEB
Standard_Integer Sens = 0;
#else
Standard_Integer Sens;
#endif
Standard_Real Coeff = 0.5;
Handle(ChFiDS_Spine) Spine = S->Spine();
ChFi3d_IndexOfSurfData(V,S,Sens);
@@ -1961,11 +1945,7 @@ void ChFi3d_FilBuilder::ExtentThreeCorner(const TopoDS_Vertex& V,
{
// Review by using the data at end of fillets (point, radius, normal
// to faces and tangents to the guideline.
#ifndef DEB
Standard_Integer Sens = 0;
#else
Standard_Integer Sens;
#endif
Standard_Real Coeff = 0.1;
ChFiDS_ListOfStripe check;
// Standard_Boolean FF = Standard_True;

15
src/ChFi3d/ChFi3d_FilBuilder_C2.cxx
View File

@@ -346,13 +346,8 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
yapiv = (pivot.IsSame(CP2.Arc()));
}
Handle(BRepAdaptor_HCurve) Hpivot;
#ifndef DEB
Standard_Boolean sameparam = Standard_False;
Standard_Real parCP1 = 0., parCP2 = 0.;
#else
Standard_Boolean sameparam;
Standard_Real parCP1, parCP2;
#endif
if(yapiv) {
Hpivot = new BRepAdaptor_HCurve(pivot);
parCP1 = CP1.ParameterOnArc();
@@ -372,11 +367,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
BRFaCo.Initialize(FaCo);
TopoDS_Face FF1,FF2,F,FaPiv;
#ifndef DEB
TopAbs_Orientation pctrans = TopAbs_FORWARD ;
#else
TopAbs_Orientation pctrans;
#endif
Handle(Geom2d_BSplineCurve) PCurveOnPiv;
FF1 = TopoDS::Face(DStr.Shape(sd1->Index(IFaArc1)));
FF2 = TopoDS::Face(DStr.Shape(sd2->Index(IFaArc2)));
@@ -728,15 +719,9 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
}
Handle(ChFiDS_Stripe) stsam, stdif;
Handle(ChFiDS_SurfData) sdsam, sddif;
#ifndef DEB
Standard_Real uintpcsam = 0., uintpcdif = 0.;
Standard_Integer ifacosam = 0, ifacodif = 0, ifaopsam = 0, ifaopdif = 0;
Standard_Boolean isfirstsam = Standard_False, isfirstdif = Standard_False;
#else
Standard_Real uintpcsam, uintpcdif;
Standard_Integer ifacosam, ifacodif, ifaopsam, ifaopdif;
Standard_Boolean isfirstsam, isfirstdif;
#endif
if(Stat1 == ChFiDS_OnSame && Stat2 == ChFiDS_OnDiff){
stsam = st1; sdsam = sd1; uintpcsam = UIntPC1;
ifacosam = IFaCo1; ifaopsam = IFaArc1; isfirstsam = isfirst1;