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

0025734: GCC warnings in Android build

Browse Source 
Warnings were fixed.

Fixed wrong re-initialization.
This commit is contained in:
ski 2015-02-05 14:23:17 +03:00 committed by bugmaster
parent 5fd3308acd
commit bcf50875e3
29 changed files with 103 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/AIS/AIS_LocalContext_1.cxx
View File

@ -567,8 +567,6 @@ void AIS_LocalContext::Unhilight (const Handle(SelectMgr_EntityOwner)& theOwner,
//======================================================================= //=======================================================================
void AIS_LocalContext::HilightPicked(const Standard_Boolean updateviewer) void AIS_LocalContext::HilightPicked(const Standard_Boolean updateviewer)
{ {
Standard_Boolean updMain(Standard_False);
Handle(AIS_Selection) Sel = AIS_Selection::Selection(mySelName.ToCString()); Handle(AIS_Selection) Sel = AIS_Selection::Selection(mySelName.ToCString());
#ifdef BUC60765 #ifdef BUC60765
if( Sel.IsNull() ) return; if( Sel.IsNull() ) return;
@ -601,13 +599,8 @@ void AIS_LocalContext::HilightPicked(const Standard_Boolean updateviewer)
if(BROwnr.IsNull() || !BROwnr->ComesFromDecomposition()){ if(BROwnr.IsNull() || !BROwnr->ComesFromDecomposition()){
Handle(SelectMgr_SelectableObject) SO = Ownr->Selectable(); Handle(SelectMgr_SelectableObject) SO = Ownr->Selectable();
IO = *((Handle(AIS_InteractiveObject)*)&SO); IO = *((Handle(AIS_InteractiveObject)*)&SO);
updMain = Standard_True;
} }
else
updMain = Standard_True;
} }
else
updMain = Standard_True;
Handle(SelectMgr_SelectableObject) SO = Ownr->Selectable(); Handle(SelectMgr_SelectableObject) SO = Ownr->Selectable();
Standard_Integer HM = GetHiMod(*((Handle(AIS_InteractiveObject)*)&SO)); Standard_Integer HM = GetHiMod(*((Handle(AIS_InteractiveObject)*)&SO));
if ( Ownr->IsAutoHilight() ) if ( Ownr->IsAutoHilight() )
@ -642,8 +635,6 @@ void AIS_LocalContext::UnhilightPicked (const Standard_Boolean updateviewer)
{ {
myMainPM->ClearImmediateDraw(); myMainPM->ClearImmediateDraw();
Standard_Boolean updMain(Standard_False);
Handle(AIS_Selection) Sel = AIS_Selection::Selection(mySelName.ToCString()); Handle(AIS_Selection) Sel = AIS_Selection::Selection(mySelName.ToCString());
#ifdef BUC60765 #ifdef BUC60765
if( Sel.IsNull() ) return; if( Sel.IsNull() ) return;
@ -680,10 +671,7 @@ void AIS_LocalContext::UnhilightPicked (const Standard_Boolean updateviewer)
Handle(AIS_InteractiveObject) IO = *((Handle(AIS_InteractiveObject)*)&SO); Handle(AIS_InteractiveObject) IO = *((Handle(AIS_InteractiveObject)*)&SO);
HM = GetHiMod(IO); HM = GetHiMod(IO);
#endif #endif
updMain = Standard_True;
} }
else
updMain = Standard_True;
} }
Ownr->Unhilight(PM,HM); Ownr->Unhilight(PM,HM);
} }
@ -696,14 +684,8 @@ void AIS_LocalContext::UnhilightPicked (const Standard_Boolean updateviewer)
anIter1.Key()->ClearSelected(); anIter1.Key()->ClearSelected();
} }
if(updateviewer){ if(updateviewer)
#ifdef BUC60774
myCTX->CurrentViewer()->Update(); myCTX->CurrentViewer()->Update();
#else
if(updMain) myCTX->CurrentViewer()->Update();
#endif
}
} }
//======================================================================= //=======================================================================

60
src/AppParCurves/AppParCurves_ResolConstraint.gxx
View File

@ -75,7 +75,6 @@ AppParCurves_ResolConstraint::
Standard_Integer myindex, Def = SCurv.NbPoles()-1; Standard_Integer myindex, Def = SCurv.NbPoles()-1;
Standard_Integer nb3d, nb2d, Npol= Def+1, Npol2 = 2*Npol; Standard_Integer nb3d, nb2d, Npol= Def+1, Npol2 = 2*Npol;
Standard_Real T1 = 0., T2 = 0., T3, Tmax, Daij; Standard_Real T1 = 0., T2 = 0., T3, Tmax, Daij;
Standard_Boolean Ok;
gp_Vec V; gp_Vec V;
gp_Vec2d V2d; gp_Vec2d V2d;
gp_Pnt Poi; gp_Pnt Poi;
@ -281,13 +280,13 @@ AppParCurves_ResolConstraint::
case 1: //T1 ~ T1x case 1: //T1 ~ T1x
{ {
if (k <= nb3d) { if (k <= nb3d) {
Ok = ToolLine::Tangency(SSP, Npt, tabV); ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k); V = tabV(k);
T1 = V.X(); T1 = V.X();
IP = 3 * Npol; IP = 3 * Npol;
} }
else { else {
Ok = ToolLine::Tangency(SSP, Npt, tabV2d); ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k-nb3d); V2d = tabV2d(k-nb3d);
T1 = V2d.X(); T1 = V2d.X();
IP = 2 * Npol; IP = 2 * Npol;
@ -298,12 +297,12 @@ AppParCurves_ResolConstraint::
case 2: //T1 ~ T1y case 2: //T1 ~ T1y
{ {
if (k <= nb3d) { if (k <= nb3d) {
Ok = ToolLine::Tangency(SSP, Npt, tabV); ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k); V = tabV(k);
IP = 3 * Npol; IP = 3 * Npol;
} }
else { else {
Ok = ToolLine::Tangency(SSP, Npt, tabV2d); ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k-nb3d); V2d = tabV2d(k-nb3d);
T1 = V2d.Y(); T1 = V2d.Y();
IP = 2 * Npol; IP = 2 * Npol;
@ -313,7 +312,7 @@ AppParCurves_ResolConstraint::
} }
case 3: //T1 ~ T1z case 3: //T1 ~ T1z
{ {
Ok = ToolLine::Tangency(SSP, Npt, tabV); ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k); V = tabV(k);
T1 = V.Z(); T1 = V.Z();
IP = 3 * Npol; IP = 3 * Npol;
@ -328,12 +327,12 @@ AppParCurves_ResolConstraint::
case 1: //T2 ~ T2x case 1: //T2 ~ T2x
{ {
if ((k+1) <= nb3d) { if ((k+1) <= nb3d) {
Ok = ToolLine::Tangency(SSP, Npt, tabV); ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k+1); V = tabV(k+1);
T2 = V.X(); T2 = V.X();
} }
else { else {
Ok = ToolLine::Tangency(SSP, Npt, tabV2d); ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k+1-nb3d); V2d = tabV2d(k+1-nb3d);
T2 = V2d.X(); T2 = V2d.X();
} }
@ -343,12 +342,12 @@ AppParCurves_ResolConstraint::
case 2: //T2 ~ T2y case 2: //T2 ~ T2y
{ {
if ((k+1) <= nb3d) { if ((k+1) <= nb3d) {
Ok = ToolLine::Tangency(SSP, Npt, tabV); ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k+1); V = tabV(k+1);
T2 = V.Y(); T2 = V.Y();
} }
else { else {
Ok = ToolLine::Tangency(SSP, Npt, tabV2d); ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k+1-nb3d); V2d = tabV2d(k+1-nb3d);
T2 = V2d.Y(); T2 = V2d.Y();
} }
@ -357,7 +356,7 @@ AppParCurves_ResolConstraint::
} }
case 3: //T2 ~ T2z case 3: //T2 ~ T2z
{ {
Ok = ToolLine::Tangency(SSP, Npt, tabV); ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k+1); V = tabV(k+1);
T2 = V.Z(); T2 = V.Z();
addIndex_2 = 2 * Npol; addIndex_2 = 2 * Npol;
@ -554,7 +553,6 @@ const math_Matrix& AppParCurves_ResolConstraint::
Standard_Integer IP; Standard_Integer IP;
Standard_Real Daij; Standard_Real Daij;
Npol = Deg+1; Npol2 = 2*Npol; Npol = Deg+1; Npol2 = 2*Npol;
Standard_Boolean Ok;
TColStd_Array2OfInteger Ibont(1, NbCu, 1, IncTan); TColStd_Array2OfInteger Ibont(1, NbCu, 1, IncTan);
math_Matrix DeCInit(1, IncPass, 1, Npol); math_Matrix DeCInit(1, IncPass, 1, Npol);
math_Vector DDA(1, Npol); math_Vector DDA(1, Npol);
@ -601,7 +599,7 @@ const math_Matrix& AppParCurves_ResolConstraint::
Npt = ITan(i); Npt = ITan(i);
// MultiPoint MPoint = ToolLine::Value(SSP, Npt); // MultiPoint MPoint = ToolLine::Value(SSP, Npt);
// choix du maximum de tangence pour exprimer la colinearite: // choix du maximum de tangence pour exprimer la colinearite:
Ok = ToolLine::Tangency(SSP, Npt, tabV); ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k); V = tabV(k);
V.Coord(T1, T2, T3); V.Coord(T1, T2, T3);
Tmax = Abs(T1); Tmax = Abs(T1);
@ -650,7 +648,7 @@ const math_Matrix& AppParCurves_ResolConstraint::
for (i = 1; i <= IncTan; i++) { for (i = 1; i <= IncTan; i++) {
Npt = ITan(i); Npt = ITan(i);
AppParCurves::SecondDerivativeBernstein(Parameters(Npt), DDA); AppParCurves::SecondDerivativeBernstein(Parameters(Npt), DDA);
Ok = ToolLine::Tangency(SSP, Npt, tabV2d); ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k); V2d = tabV2d(k);
V2d.Coord(T1, T2); V2d.Coord(T1, T2);
Tmax = Abs(T1); Tmax = Abs(T1);
@ -682,25 +680,25 @@ const math_Matrix& AppParCurves_ResolConstraint::
Inc3 = Inc3 + 1; Inc3 = Inc3 + 1;
if (Ibont(k, i) == 1) { if (Ibont(k, i) == 1) {
if (k <= nb3d) { if (k <= nb3d) {
Ok = ToolLine::Tangency(SSP, Npt, tabV); ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k); V = tabV(k);
T1 = V.X(); T1 = V.X();
IP = 3*Npol; IP = 3*Npol;
} }
else { else {
Ok = ToolLine::Tangency(SSP, Npt, tabV2d); ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k); V2d = tabV2d(k);
T1 = V2d.X(); T1 = V2d.X();
IP = 2*Npol; IP = 2*Npol;
} }
if (Ibont(k+1, i) == 1) { // Relations entre T1x et T2x: if (Ibont(k+1, i) == 1) { // Relations entre T1x et T2x:
if ((k+1) <= nb3d) { if ((k+1) <= nb3d) {
Ok = ToolLine::Tangency(SSP, Npt, tabV); ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k+1); V = tabV(k+1);
T2 = V.X(); T2 = V.X();
} }
else { else {
Ok = ToolLine::Tangency(SSP, Npt, tabV2d); ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k+1); V2d = tabV2d(k+1);
T2 = V2d.X(); T2 = V2d.X();
} }
@ -713,12 +711,12 @@ const math_Matrix& AppParCurves_ResolConstraint::
} }
else if (Ibont(k+1, i) == 2) { // Relations entre T1x et T2y: else if (Ibont(k+1, i) == 2) { // Relations entre T1x et T2y:
if ((k+1) <= nb3d) { if ((k+1) <= nb3d) {
Ok = ToolLine::Tangency(SSP, Npt, tabV); ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k+1); V = tabV(k+1);
T2 = V.Y(); T2 = V.Y();
} }
else { else {
Ok = ToolLine::Tangency(SSP, Npt, tabV2d); ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k+1); V2d = tabV2d(k+1);
T2 = V2d.Y(); T2 = V2d.Y();
} }
@ -743,25 +741,25 @@ const math_Matrix& AppParCurves_ResolConstraint::
} }
else if (Ibont(k,i) == 2) { else if (Ibont(k,i) == 2) {
if (k <= nb3d) { if (k <= nb3d) {
Ok = ToolLine::Tangency(SSP, Npt, tabV); ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k); V = tabV(k);
T1 = V.Y(); T1 = V.Y();
IP = 3*Npol; IP = 3*Npol;
} }
else { else {
Ok = ToolLine::Tangency(SSP, Npt, tabV2d); ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k); V2d = tabV2d(k);
T1 = V2d.Y(); T1 = V2d.Y();
IP = 2*Npol; IP = 2*Npol;
} }
if (Ibont(k+1, i) == 1) { // Relations entre T1y et T2x: if (Ibont(k+1, i) == 1) { // Relations entre T1y et T2x:
if ((k+1) <= nb3d) { if ((k+1) <= nb3d) {
Ok = ToolLine::Tangency(SSP, Npt, tabV); ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k+1); V = tabV(k+1);
T2 = V.X(); T2 = V.X();
} }
else { else {
Ok = ToolLine::Tangency(SSP, Npt, tabV2d); ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k+1); V2d = tabV2d(k+1);
T2 = V2d.X(); T2 = V2d.X();
} }
@ -775,12 +773,12 @@ const math_Matrix& AppParCurves_ResolConstraint::
} }
else if (Ibont(k+1, i) == 2) { // Relations entre T1y et T2y: else if (Ibont(k+1, i) == 2) { // Relations entre T1y et T2y:
if ((k+1) <= nb3d) { if ((k+1) <= nb3d) {
Ok = ToolLine::Tangency(SSP, Npt, tabV); ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k+1); V = tabV(k+1);
T2 = V.Y(); T2 = V.Y();
} }
else { else {
Ok = ToolLine::Tangency(SSP, Npt, tabV2d); ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k+1); V2d = tabV2d(k+1);
T2 = V2d.Y(); T2 = V2d.Y();
} }
@ -806,18 +804,18 @@ const math_Matrix& AppParCurves_ResolConstraint::
} }
else { else {
Ok = ToolLine::Tangency(SSP, Npt, tabV); ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k); V = tabV(k);
T1 = V.Z(); T1 = V.Z();
IP = 3*Npol; IP = 3*Npol;
if (Ibont(k+1, i) == 1) { // Relations entre T1z et T2x: if (Ibont(k+1, i) == 1) { // Relations entre T1z et T2x:
if ((k+1) <= nb3d) { if ((k+1) <= nb3d) {
Ok = ToolLine::Tangency(SSP, Npt, tabV); ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k+1); V = tabV(k+1);
T2 = V.X(); T2 = V.X();
} }
else { else {
Ok = ToolLine::Tangency(SSP, Npt, tabV2d); ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k+1); V2d = tabV2d(k+1);
T2 = V2d.X(); T2 = V2d.X();
} }
@ -831,12 +829,12 @@ const math_Matrix& AppParCurves_ResolConstraint::
else if (Ibont(k+1, i) == 2) { // Relations entre T1z et T2y: else if (Ibont(k+1, i) == 2) { // Relations entre T1z et T2y:
if ((k+1) <= nb3d) { if ((k+1) <= nb3d) {
Ok = ToolLine::Tangency(SSP, Npt, tabV); ToolLine::Tangency(SSP, Npt, tabV);
V = tabV(k+1); V = tabV(k+1);
T2 = V.Y(); T2 = V.Y();
} }
else { else {
Ok = ToolLine::Tangency(SSP, Npt, tabV2d); ToolLine::Tangency(SSP, Npt, tabV2d);
V2d = tabV2d(k+1); V2d = tabV2d(k+1);
T2 = V2d.Y(); T2 = V2d.Y();
} }

11
src/BOPAlgo/BOPAlgo_BuilderSolid.cxx
View File

@ -480,7 +480,6 @@ void BOPAlgo_BuilderSolid::PerformLoops()
//================================================= //=================================================
// //
// 2. Post Treatment // 2. Post Treatment
Standard_Integer aNbFA;
BRep_Builder aBB; BRep_Builder aBB;
BOPCol_MapOfOrientedShape AddedFacesMap; BOPCol_MapOfOrientedShape AddedFacesMap;
BOPCol_IndexedDataMapOfShapeListOfShape aEFMap; BOPCol_IndexedDataMapOfShapeListOfShape aEFMap;
@ -520,8 +519,6 @@ void BOPAlgo_BuilderSolid::PerformLoops()
aEFMap.Clear(); aEFMap.Clear();
AddedFacesMap.Clear(); AddedFacesMap.Clear();
// //
aNbFA=myShapesToAvoid.Extent();
//
aItM.Initialize(myShapesToAvoid); aItM.Initialize(myShapesToAvoid);
for (; aItM.More(); aItM.Next()) { for (; aItM.More(); aItM.Next()) {
const TopoDS_Shape& aFF=aItM.Key(); const TopoDS_Shape& aFF=aItM.Key();
@ -570,7 +567,7 @@ void BOPAlgo_BuilderSolid::PerformLoops()
void BOPAlgo_BuilderSolid::PerformAreas() void BOPAlgo_BuilderSolid::PerformAreas()
{ {
Standard_Boolean bIsGrowth, bIsHole; Standard_Boolean bIsGrowth, bIsHole;
Standard_Integer k,aNbHoles; Standard_Integer k;
BRep_Builder aBB; BRep_Builder aBB;
BOPCol_ListIteratorOfListOfShape aItLS; BOPCol_ListIteratorOfListOfShape aItLS;
BOPCol_ListOfShape aNewSolids, aHoleShells; BOPCol_ListOfShape aNewSolids, aHoleShells;
@ -669,7 +666,7 @@ void BOPAlgo_BuilderSolid::PerformAreas()
aSelector.Clear(); aSelector.Clear();
aSelector.SetBox(aBoxSolid); aSelector.SetBox(aBoxSolid);
// //
aNbHoles=aBBTree.Select(aSelector); aBBTree.Select(aSelector);
// //
const BOPCol_ListOfInteger& aLI=aSelector.Indices(); const BOPCol_ListOfInteger& aLI=aSelector.Indices();
// //
@ -767,7 +764,7 @@ void BOPAlgo_BuilderSolid::PerformInternalShapes()
} }
// //
Standard_Boolean bIsInternalFace; Standard_Boolean bIsInternalFace;
Standard_Integer k, aNbVFS, aNbSLF, aNbVFP, aNbF, aNbA; Standard_Integer k, aNbVFS, aNbSLF, aNbVFP, aNbA;
BRep_Builder aBB; BRep_Builder aBB;
TopoDS_Iterator aIt; TopoDS_Iterator aIt;
TopExp_Explorer aExp; TopExp_Explorer aExp;
@ -856,7 +853,7 @@ void BOPAlgo_BuilderSolid::PerformInternalShapes()
aSelector.Clear(); aSelector.Clear();
aSelector.SetBox(aBox); aSelector.SetBox(aBox);
// //
aNbF=aBBTree.Select(aSelector); aBBTree.Select(aSelector);
// //
const BOPCol_ListOfInteger& aLI=aSelector.Indices(); const BOPCol_ListOfInteger& aLI=aSelector.Indices();
aItLI.Initialize(aLI); aItLI.Initialize(aLI);

10
src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx
View File

@ -1555,20 +1555,10 @@ Standard_Boolean BOPAlgo_PaveFiller::ExtendedTolerance
return; return;
} }
// //
GeomAbs_SurfaceType aType1, aType2;
Handle(Geom_Surface) aS1=BRep_Tool::Surface(aF1); Handle(Geom_Surface) aS1=BRep_Tool::Surface(aF1);
Handle(Geom_Surface) aS2=BRep_Tool::Surface(aF2); Handle(Geom_Surface) aS2=BRep_Tool::Surface(aF2);
GeomAdaptor_Surface aGAS1(aS1);
GeomAdaptor_Surface aGAS2(aS2);
//
aType1=aGAS1.GetType();
aType2=aGAS2.GetType();
//
//if (aType1==GeomAbs_Torus || aType2==GeomAbs_Torus) {
GeomAbs_CurveType aTypeC;
// //
const IntTools_Curve& aIC=aNC.Curve(); const IntTools_Curve& aIC=aNC.Curve();
aTypeC=aIC.Type();
//if (aTypeC==GeomAbs_BezierCurve || aTypeC==GeomAbs_BSplineCurve) { //if (aTypeC==GeomAbs_BezierCurve || aTypeC==GeomAbs_BSplineCurve) {
Handle(Geom2d_Curve) aC2D[2]; Handle(Geom2d_Curve) aC2D[2];
// //

25
src/BRepFeat/BRepFeat_Form.cxx
View File

@ -164,8 +164,6 @@ static void Descendants(const TopoDS_Shape&,
TColGeom_SequenceOfCurve scur; TColGeom_SequenceOfCurve scur;
Curves(scur); Curves(scur);
Standard_Real locmin;
Standard_Real locmax;
Standard_Real mf, Mf, mu, Mu; Standard_Real mf, Mf, mu, Mu;
TopAbs_Orientation Orifuntil = TopAbs_INTERNAL; TopAbs_Orientation Orifuntil = TopAbs_INTERNAL;
@ -193,9 +191,7 @@ static void Descendants(const TopoDS_Shape&,
} }
{ {
// Find sens, locmin, locmax, FFrom, FUntil // Find sens, FFrom, FUntil
locmin = RealFirst();
locmax = RealLast();
for (Standard_Integer jj=1; jj<=scur.Length(); jj++) { for (Standard_Integer jj=1; jj<=scur.Length(); jj++) {
if (ASI1.IsDone() && ASI2.IsDone()) { if (ASI1.IsDone() && ASI2.IsDone()) {
if (ASI1.NbPoints(jj) <= 0) { if (ASI1.NbPoints(jj) <= 0) {
@ -208,19 +204,12 @@ static void Descendants(const TopoDS_Shape&,
} }
mu = ASI2.Point(jj,1).Parameter(); mu = ASI2.Point(jj,1).Parameter();
Mu = ASI2.Point(jj,ASI2.NbPoints(jj)).Parameter(); Mu = ASI2.Point(jj,ASI2.NbPoints(jj)).Parameter();
if (scur(jj)->IsPeriodic()) { if (!scur(jj)->IsPeriodic()) {
Standard_Real period = scur(jj)->Period();
locmin = mf;
locmax = ElCLib::InPeriod(Mu,locmin,locmin+period);
}
else {
Standard_Integer ku, kf; Standard_Integer ku, kf;
if (! (mu > Mf || mf > Mu)) { //overlapping intervals if (! (mu > Mf || mf > Mu)) { //overlapping intervals
sens = 1; sens = 1;
kf = 1; kf = 1;
ku = ASI2.NbPoints(jj); ku = ASI2.NbPoints(jj);
locmin = mf;
locmax = Max(Mf, Mu);
} }
else if (mu > Mf) { else if (mu > Mf) {
if (sens == -1) { if (sens == -1) {
@ -231,8 +220,6 @@ static void Descendants(const TopoDS_Shape&,
sens = 1; sens = 1;
kf = 1; kf = 1;
ku = ASI2.NbPoints(jj); ku = ASI2.NbPoints(jj);
locmin = mf;
locmax = Mu;
} }
else { else {
if (sens == 1) { if (sens == 1) {
@ -243,8 +230,6 @@ static void Descendants(const TopoDS_Shape&,
sens = -1; sens = -1;
kf = ASI1.NbPoints(jj); kf = ASI1.NbPoints(jj);
ku = 1; ku = 1;
locmin = mu;
locmax = Mf;
} }
if (Oriffrom == TopAbs_INTERNAL) { if (Oriffrom == TopAbs_INTERNAL) {
TopAbs_Orientation Oript = ASI1.Point(jj,kf).Orientation(); TopAbs_Orientation Oript = ASI1.Point(jj,kf).Orientation();
@ -287,13 +272,9 @@ static void Descendants(const TopoDS_Shape&,
Standard_Integer ku; Standard_Integer ku;
if (sens == -1) { if (sens == -1) {
ku = 1; ku = 1;
locmax = -ASI2.Point(jj,ku).Parameter();
locmin = 0.;
} }
else { else {
ku = ASI2.NbPoints(jj); ku = ASI2.NbPoints(jj);
locmin = 0;
locmax = ASI2.Point(jj,ku).Parameter();
} }
if (Orifuntil == TopAbs_INTERNAL && sens != 0) { if (Orifuntil == TopAbs_INTERNAL && sens != 0) {
TopAbs_Orientation Oript = ASI2.Point(jj,ku).Orientation(); TopAbs_Orientation Oript = ASI2.Point(jj,ku).Orientation();
@ -307,8 +288,6 @@ static void Descendants(const TopoDS_Shape&,
} }
} }
else { else {
locmin = 0.;
locmax = RealLast();
sens = 1; sens = 1;
break; break;
} }

2
src/BRepFeat/BRepFeat_MakeLinearForm.cxx
View File

@ -315,7 +315,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
#ifdef OCCT_DEBUG #ifdef OCCT_DEBUG
if (trc) cout << " Sliding" << endl; if (trc) cout << " Sliding" << endl;
#endif #endif
Standard_Boolean Sliding = Standard_False; Sliding = Standard_False;
Handle(Geom_Surface) s = BRep_Tool::Surface(FirstFace); Handle(Geom_Surface) s = BRep_Tool::Surface(FirstFace);
if (s->DynamicType() == if (s->DynamicType() ==
STANDARD_TYPE(Geom_RectangularTrimmedSurface)) { STANDARD_TYPE(Geom_RectangularTrimmedSurface)) {

3
src/BRepMesh/BRepMesh_FastDiscret.hxx
View File

@ -192,7 +192,8 @@ private:
mySameVertex(theSameVertex) mySameVertex(theSameVertex)
{ {
} }
virtual ~TopoDSVExplorer() {
}
const TopoDS_Vertex& Vertex() const const TopoDS_Vertex& Vertex() const
{ {
return myVertex; return myVertex;

2
src/BRepOffset/BRepOffset_MakeOffset.cxx
View File

@ -884,7 +884,7 @@ static void TrimEdge (TopoDS_Edge& NE,
Standard_Real aSameParTol = Precision::Confusion(); Standard_Real aSameParTol = Precision::Confusion();
TopoDS_Vertex V1,V2; TopoDS_Vertex V1,V2;
Standard_Real U; Standard_Real U = 0.;
Standard_Real UMin = Precision::Infinite(); Standard_Real UMin = Precision::Infinite();
Standard_Real UMax = -UMin; Standard_Real UMax = -UMin;

5
src/BRepOffset/BRepOffset_Offset.cxx
View File

@ -525,7 +525,6 @@ void BRepOffset_Offset::Init(const TopoDS_Face& Face,
Standard_Boolean VminDegen = Standard_False; Standard_Boolean VminDegen = Standard_False;
Standard_Boolean VmaxDegen = Standard_False; Standard_Boolean VmaxDegen = Standard_False;
Standard_Boolean UisoDegen = Standard_False; Standard_Boolean UisoDegen = Standard_False;
Standard_Boolean VisoDegen = Standard_False;
gp_Pnt MinApex, MaxApex; gp_Pnt MinApex, MaxApex;
Standard_Boolean HasSingularity = Standard_False; Standard_Boolean HasSingularity = Standard_False;
Standard_Real uf1, uf2, vf1, vf2, fpar, lpar; Standard_Real uf1, uf2, vf1, vf2, fpar, lpar;
@ -552,9 +551,7 @@ void BRepOffset_Offset::Init(const TopoDS_Face& Face,
gp_Pnt2d lp2d = aCurve->Value(lpar); gp_Pnt2d lp2d = aCurve->Value(lpar);
if (Abs(fp2d.X() - lp2d.X()) <= Precision::PConfusion()) if (Abs(fp2d.X() - lp2d.X()) <= Precision::PConfusion())
UisoDegen = Standard_True; UisoDegen = Standard_True;
else
VisoDegen = Standard_True;
if (DegEdges.Length() == 2) if (DegEdges.Length() == 2)
{ {
if (UisoDegen) if (UisoDegen)

22
src/BSplCLib/BSplCLib.cxx
View File

@ -3020,14 +3020,16 @@ void BSplCLib::Interpolate(const Standard_Integer Degree,
InterpolationMatrix, InterpolationMatrix,
UpperBandWidth, UpperBandWidth,
LowerBandWidth) ; LowerBandWidth) ;
Standard_OutOfRange_Raise_if (ErrorCode != 0, "BSplCLib::Interpolate") ; if(ErrorCode)
Standard_OutOfRange::Raise("BSplCLib::Interpolate");
ErrorCode = ErrorCode =
BSplCLib::FactorBandedMatrix(InterpolationMatrix, BSplCLib::FactorBandedMatrix(InterpolationMatrix,
UpperBandWidth, UpperBandWidth,
LowerBandWidth, LowerBandWidth,
InversionProblem) ; InversionProblem) ;
Standard_OutOfRange_Raise_if (ErrorCode != 0, "BSplCLib::Interpolate") ; if(ErrorCode)
Standard_OutOfRange::Raise("BSplCLib::Interpolate");
ErrorCode = ErrorCode =
BSplCLib::SolveBandedSystem(InterpolationMatrix, BSplCLib::SolveBandedSystem(InterpolationMatrix,
@ -3035,9 +3037,9 @@ void BSplCLib::Interpolate(const Standard_Integer Degree,
LowerBandWidth, LowerBandWidth,
ArrayDimension, ArrayDimension,
Poles) ; Poles) ;
if(ErrorCode)
Standard_OutOfRange_Raise_if (ErrorCode != 0,"BSplCLib::Interpolate") ; Standard_OutOfRange::Raise("BSplCLib::Interpolate");
} }
//======================================================================= //=======================================================================
//function : Interpolate //function : Interpolate
@ -3067,14 +3069,16 @@ void BSplCLib::Interpolate(const Standard_Integer Degree,
InterpolationMatrix, InterpolationMatrix,
UpperBandWidth, UpperBandWidth,
LowerBandWidth) ; LowerBandWidth) ;
Standard_OutOfRange_Raise_if (ErrorCode != 0, "BSplCLib::Interpolate") ; if(ErrorCode)
Standard_OutOfRange::Raise("BSplCLib::Interpolate");
ErrorCode = ErrorCode =
BSplCLib::FactorBandedMatrix(InterpolationMatrix, BSplCLib::FactorBandedMatrix(InterpolationMatrix,
UpperBandWidth, UpperBandWidth,
LowerBandWidth, LowerBandWidth,
InversionProblem) ; InversionProblem) ;
Standard_OutOfRange_Raise_if (ErrorCode != 0, "BSplCLib::Interpolate") ; if(ErrorCode)
Standard_OutOfRange::Raise("BSplCLib::Interpolate");
ErrorCode = ErrorCode =
BSplCLib::SolveBandedSystem(InterpolationMatrix, BSplCLib::SolveBandedSystem(InterpolationMatrix,
@ -3084,8 +3088,8 @@ void BSplCLib::Interpolate(const Standard_Integer Degree,
ArrayDimension, ArrayDimension,
Poles, Poles,
Weights) ; Weights) ;
if(ErrorCode)
Standard_OutOfRange_Raise_if (ErrorCode != 0,"BSplCLib::Interpolate") ; Standard_OutOfRange::Raise("BSplCLib::Interpolate");
} }
//======================================================================= //=======================================================================

3
src/Bnd/Bnd_BoundSortBox.cxx
View File

@ -649,11 +649,10 @@ const TColStd_ListOfInteger& Bnd_BoundSortBox::Compare (const Bnd_Box& theBox)
//-- Rejection with the table of bits //-- Rejection with the table of bits
Standard_Boolean touch = Standard_True; Standard_Boolean touch = Standard_True;
touch = Standard_False; touch = Standard_False;
Standard_Real _Xmin,_Ymin,_Zmin,_Xmax,_Ymax,_Zmax; Standard_Real _Xmax,_Ymax,_Zmax;
BSB_T3Bits* Map = (BSB_T3Bits *)TabBits; BSB_T3Bits* Map = (BSB_T3Bits *)TabBits;
Standard_Real xmin, ymin, zmin, xmax, ymax, zmax; Standard_Real xmin, ymin, zmin, xmax, ymax, zmax;
_Xmax=Map->Xmax; _Ymax=Map->Ymax; _Zmax=Map->Zmax; _Xmax=Map->Xmax; _Ymax=Map->Ymax; _Zmax=Map->Zmax;
_Xmin=Map->Xmin; _Ymin=Map->Ymin; _Zmin=Map->Zmin;
theBox.Get(xmin, ymin, zmin, xmax, ymax, zmax); theBox.Get(xmin, ymin, zmin, xmax, ymax, zmax);
Standard_Integer i0,i1,j0,j1,k0,k1; Standard_Integer i0,i1,j0,j1,k0,k1;
if(xmin>Xmin) i0=(Standard_Integer )((xmin-Xmin)*deltaX)-1; else i0=1; if(xmin>Xmin) i0=(Standard_Integer )((xmin-Xmin)*deltaX)-1; else i0=1;

3
src/BndLib/BndLib_Add2dCurve.cxx
View File

@ -530,14 +530,13 @@ Standard_Boolean BndLib_Box2dCurve::IsTypeBase
void BndLib_Box2dCurve::PerformLineConic() void BndLib_Box2dCurve::PerformLineConic()
{ {
Standard_Integer i, iInf[2]; Standard_Integer i, iInf[2];
Standard_Real aTb[2], aTinf; Standard_Real aTb[2];
gp_Pnt2d aP2D; gp_Pnt2d aP2D;
// //
myErrorStatus=0; myErrorStatus=0;
// //
Bnd_Box2d& aBox2D=myBox; Bnd_Box2d& aBox2D=myBox;
// //
aTinf=Precision::Infinite();
iInf[0]=0; iInf[0]=0;
iInf[1]=0; iInf[1]=0;
aTb[0]=myT1; aTb[0]=myT1;

7
src/ChFi3d/ChFi3d_Builder_C2.cxx
View File

@ -173,15 +173,8 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
// Otherwise the opposite face // Otherwise the opposite face
// and the eventual intersection of 2 pcurves on this face are found. // and the eventual intersection of 2 pcurves on this face are found.
ChFiDS_State Stat1,Stat2;
Standard_Boolean isfirst1 = (Sens1 == 1); Standard_Boolean isfirst1 = (Sens1 == 1);
Standard_Boolean isfirst2 = (Sens2 == 1); Standard_Boolean isfirst2 = (Sens2 == 1);
Stat1 = Corner1->Spine()->Status(isfirst1);
Stat2 = Corner2->Spine()->Status(isfirst2);
/*#ifdef OCCT_DEBUG
Standard_Boolean evolcoin = ((Stat1 == ChFiDS_OnSame && Stat2 == ChFiDS_OnDiff) ||
(Stat2 == ChFiDS_OnSame && Stat1 == ChFiDS_OnDiff));
#endif*/
Standard_Boolean OkinterCC,Okvisavis,SameSide; Standard_Boolean OkinterCC,Okvisavis,SameSide;
Standard_Integer IFaCo1,IFaCo2; Standard_Integer IFaCo1,IFaCo2;
Standard_Real UIntPC1,UIntPC2; Standard_Real UIntPC1,UIntPC2;

4
src/GeomFill/GeomFill_BSplineCurves.cxx
View File

@ -538,8 +538,8 @@ void GeomFill_BSplineCurves::Init
IsOK = Standard_True; IsOK = Standard_True;
} }
Standard_ConstructionError_Raise_if if(!IsOK)
(!IsOK, " GeomFill_BSplineCurves: Courbes non jointives"); Standard_OutOfRange::Raise("GeomFill_BSplineCurves: Courbes non jointives");
Standard_Integer NbUPoles = CC1->NbPoles(); Standard_Integer NbUPoles = CC1->NbPoles();
Standard_Integer NbVPoles = CC2->NbPoles(); Standard_Integer NbVPoles = CC2->NbPoles();

6
src/GeomFill/GeomFill_BezierCurves.cxx
View File

@ -438,9 +438,9 @@ void GeomFill_BezierCurves::Init(const Handle(Geom_BezierCurve)& C1,
CC2->Reverse(); CC2->Reverse();
IsOK = Standard_True; IsOK = Standard_True;
} }
Standard_ConstructionError_Raise_if if(!IsOK)
(!IsOK, " GeomFill_BezierCurves: Courbes non jointives"); Standard_OutOfRange::Raise("GeomFill_BezierCurves: Courbes non jointives");
CC1->Poles(P1); CC1->Poles(P1);
CC2->Poles(P2); CC2->Poles(P2);

2
src/IntPatch/IntPatch_ImpImpIntersection_0.gxx
View File

@ -372,7 +372,7 @@ void PutPointsOnLine(const Handle(Adaptor3d_HSurface)& S1,
// //
Standard_Integer i,k; Standard_Integer i,k;
Standard_Integer linenumber; Standard_Integer linenumber;
Standard_Real paraint,currentparameter,tolerance; Standard_Real paraint = 0.,currentparameter,tolerance;
Standard_Real U1,V1,U2,V2; Standard_Real U1,V1,U2,V2;
Standard_Boolean goon; Standard_Boolean goon;

3
src/IntTools/IntTools_FaceFace.cxx
View File

@ -822,11 +822,10 @@ static Standard_Boolean isTreatAnalityc(const TopoDS_Face& theF1,
Standard_Real IntTools_FaceFace::ComputeTolerance() Standard_Real IntTools_FaceFace::ComputeTolerance()
{ {
Standard_Integer i, j, aNbLin; Standard_Integer i, j, aNbLin;
Standard_Real aFirst, aLast, aD, aDMax, aT, aDelta; Standard_Real aFirst, aLast, aD, aDMax, aT;
Handle(Geom_Surface) aS1, aS2; Handle(Geom_Surface) aS1, aS2;
// //
aDMax = 0; aDMax = 0;
aDelta = Precision::PConfusion();
aNbLin = mySeqOfCurve.Length(); aNbLin = mySeqOfCurve.Length();
// //
aS1 = myHS1->ChangeSurface().Surface(); aS1 = myHS1->ChangeSurface().Surface();

4
src/IntWalk/IntWalk_PWalking.cxx
View File

@ -593,7 +593,6 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
//xf //xf
Standard_Integer NbPasOKConseq=0; Standard_Integer NbPasOKConseq=0;
Standard_Real pasMaxSV[4], aTmp;
TColStd_Array1OfReal Param(1,4); TColStd_Array1OfReal Param(1,4);
IntImp_ConstIsoparametric ChoixIso; IntImp_ConstIsoparametric ChoixIso;
//xt //xt
@ -644,14 +643,13 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
// //
for (Standard_Integer i=1; i<=4; ++i) for (Standard_Integer i=1; i<=4; ++i)
{ {
aTmp=ParDep(i);
Param(i)=ParDep(i); Param(i)=ParDep(i);
} }
//-- reproduce steps uv connected to surfaces Caro1 and Caro2 //-- reproduce steps uv connected to surfaces Caro1 and Caro2
//-- pasuv[] and pasSav[] are modified during the marching //-- pasuv[] and pasSav[] are modified during the marching
for(Standard_Integer i = 0; i < 4; ++i) for(Standard_Integer i = 0; i < 4; ++i)
{ {
pasMaxSV[i] = pasSav[i] = pasuv[i] = pasInit[i]; pasSav[i] = pasuv[i] = pasInit[i];
} }
//-- calculate the first solution point //-- calculate the first solution point

16
src/LocOpe/LocOpe_SplitShape.cxx
View File

@ -958,26 +958,12 @@ void LocOpe_SplitShape::AddOpenWire(const TopoDS_Wire& W,
// modifs JAG 97.05.28 // modifs JAG 97.05.28
TopAbs_Orientation orfila=TopAbs_FORWARD;
for (exp.Init(FaceRef.Oriented(TopAbs_FORWARD),TopAbs_WIRE);
exp.More(); exp.Next()) {
const TopoDS_Wire& wir = TopoDS::Wire(exp.Current());
if (wir.IsSame(wfirst)) {
orfila = exp.Current().Orientation();
break;
}
}
//newW1.Oriented(orfila);
//newW2.Oriented(orfila);
B.Add(newF1,newW1); B.Add(newF1,newW1);
//BRepTools::Write(newF1, "k:/queries/WrongBOP/NewF1.brep"); //BRepTools::Write(newF1, "k:/queries/WrongBOP/NewF1.brep");
B.Add(newF2,newW2); B.Add(newF2,newW2);
//BRepTools::Write(newF2, "k:/queries/WrongBOP/NewF2.brep"); //BRepTools::Write(newF2, "k:/queries/WrongBOP/NewF2.brep");
for (exp.ReInit(); exp.More(); exp.Next()) { for (exp.Init(FaceRef.Oriented(TopAbs_FORWARD),TopAbs_WIRE); exp.More(); exp.Next()) {
const TopoDS_Wire& wir = TopoDS::Wire(exp.Current()); const TopoDS_Wire& wir = TopoDS::Wire(exp.Current());
if (!wir.IsSame(wfirst)) { if (!wir.IsSame(wfirst)) {
if (IsInside(newF1, wir)) { if (IsInside(newF1, wir)) {

4
src/MeshVS/MeshVS_MeshPrsBuilder.cxx
View File

@ -326,10 +326,6 @@ void MeshVS_MeshPrsBuilder::BuildElements( const Handle(Prs3d_Presentation)& Prs
aEdgeSegments = new Graphic3d_ArrayOfSegments (aNbEdgePrimitives * 2); aEdgeSegments = new Graphic3d_ArrayOfSegments (aNbEdgePrimitives * 2);
} }
Standard_Integer howMany = 1;
if ( IsOverlapControl )
howMany = 2;
TColStd_PackedMapOfInteger aCustomElements; TColStd_PackedMapOfInteger aCustomElements;
Quantity_Color anOldEdgeColor; Quantity_Color anOldEdgeColor;

3
src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.cxx
View File

@ -40,8 +40,7 @@ void RWStepAP214_RWAppliedDocumentReference::ReadStep
// --- inherited field : source --- // --- inherited field : source ---
Handle(TCollection_HAsciiString) asource; Handle(TCollection_HAsciiString) asource;
Standard_Boolean stat2; data->ReadString (num,2,"source",ach,asource);
stat2 = data->ReadString (num,2,"source",ach,asource);
// --- own field : items --- // --- own field : items ---

3
src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.cxx
View File

@ -40,8 +40,7 @@ void RWStepAP214_RWAutoDesignDocumentReference::ReadStep
// --- inherited field : source --- // --- inherited field : source ---
Handle(TCollection_HAsciiString) asource; Handle(TCollection_HAsciiString) asource;
Standard_Boolean stat2; data->ReadString (num,2,"source",ach,asource);
stat2 = data->ReadString (num,2,"source",ach,asource);
// --- own field : items --- // --- own field : items ---

8
src/Resource/Resource_Manager.cxx
View File

@ -198,9 +198,11 @@ static Standard_Integer WhatKindOfLine(OSD_File& aFile,
} }
if (Pos == Line.Length()) if (Pos == Line.Length())
aToken2.Clear(); aToken2.Clear();
else else {
aToken2 = Line.SubString(Pos,Line.Length()-1); Line.Remove(1,Pos-1);
Line.Remove(Line.Length());
aToken2 = Line;
}
if (Debug) if (Debug)
cout << "'\t Value = '" << aToken2 << "'" << endl << flush; cout << "'\t Value = '" << aToken2 << "'" << endl << flush;
return RESOURCE; return RESOURCE;

2
src/ShapeProcess/ShapeProcess_Context.cxx
View File

@ -77,7 +77,7 @@ Handle(Resource_Manager) ShapeProcess_Context::LoadResourceManager (const Standa
if ( ! sRC.IsNull() && ! name.IsEqual ( file ) ) sRC.Nullify(); if ( ! sRC.IsNull() && ! name.IsEqual ( file ) ) sRC.Nullify();
if ( ! sRC.IsNull() ) { if ( ! sRC.IsNull() ) {
struct stat buf; struct stat buf;
if ( ! stat ( file, &buf ) && buf.st_mtime != mtime ) { if ( ! stat ( file, &buf ) && (Standard_Time)buf.st_mtime != mtime ) {
sRC.Nullify(); sRC.Nullify();
mtime = buf.st_mtime; mtime = buf.st_mtime;
} }

36
src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx
View File

@ -762,16 +762,31 @@ void TopOpeBRep_FacesFiller::ProcessRLine()
TopoDS_Face OOFace = (*this).Face(OOShapeIndex); TopoDS_Face OOFace = (*this).Face(OOShapeIndex);
Standard_Integer iOOFace = myDS->Shape(OOFace); Standard_Integer iOOFace = myDS->Shape(OOFace);
TopoDS_Edge edge,OOedge; Standard_Integer SIedgeIndex,OOedgeIndex; TopoDS_Edge edge,OOedge; Standard_Integer OOedgeIndex;
Standard_Real paredge,OOparedge; #ifdef OCCT_DEBUG
Standard_Integer SIedgeIndex;
#endif
Standard_Real paredge;
Standard_Integer onbound; Standard_Integer onbound;
if (SIErest) if (SIErest) {
{edge = Erest; SIedgeIndex = iErest; paredge = parRest; onbound = obRest; edge = Erest;
OOedge = OOE; OOedgeIndex = iOO; OOparedge = OOpar;} #ifdef OCCT_DEBUG
else SIedgeIndex = iErest;
{OOedge = Erest;OOedgeIndex = iErest; OOparedge = parRest; onbound = obOO; #endif
edge = OOE; SIedgeIndex = iOO; paredge = OOpar;} paredge = parRest;
onbound = obRest;
OOedge = OOE;
OOedgeIndex = iOO;
} else {
OOedge = Erest;
OOedgeIndex = iErest;
onbound = obOO;
edge = OOE;
#ifdef OCCT_DEBUG
SIedgeIndex = iOO;
#endif
paredge = OOpar;
}
// PVIndex : // PVIndex :
// -------- // --------
// xpu150399 : BUC60382 // xpu150399 : BUC60382
@ -803,8 +818,7 @@ void TopOpeBRep_FacesFiller::ProcessRLine()
const TopOpeBRepDS_Transition& llt2 = FaceFaceTransition(2); const TopOpeBRepDS_Transition& llt2 = FaceFaceTransition(2);
TopOpeBRepDS_Transition Trans = (ShapeIndex == 1)? llt1 : llt2; TopOpeBRepDS_Transition Trans = (ShapeIndex == 1)? llt1 : llt2;
Standard_Boolean TransUNK = Trans.IsUnknown(); Standard_Boolean TransUNK = Trans.IsUnknown();
TopAbs_Orientation Transori; if (!TransUNK) Transori = Trans.Orientation(TopAbs_IN);
TopOpeBRepDS_Transition transEdge; Standard_Boolean Tunk = Standard_True; TopOpeBRepDS_Transition transEdge; Standard_Boolean Tunk = Standard_True;
if (!TransUNK) { //xpu281098 PRO12875(edge9,OOface11) if (!TransUNK) { //xpu281098 PRO12875(edge9,OOface11)
if ((absindex==ShapeIndex)||(absindex==3)) { if ((absindex==ShapeIndex)||(absindex==3)) {

5
src/TopOpeBRep/TopOpeBRep_vprdeg.cxx
View File

@ -1023,13 +1023,12 @@ static Standard_Integer FUN_putInterfonDegenEd
if (rkv != rkdg) {TopoDS_Vertex tmp = v; v = ov; ov = tmp; rkv = rkdg;} // ensure v is vertex of dge if (rkv != rkdg) {TopoDS_Vertex tmp = v; v = ov; ov = tmp; rkv = rkdg;} // ensure v is vertex of dge
} }
Standard_Boolean setrest = Standard_False;
Standard_Integer mkt = 0; Standard_Real par1 = 0.,par2 = 0.; Standard_Integer mkt = 0; Standard_Real par1 = 0.,par2 = 0.;
if (on3) { if (on3) {
TopoDS_Edge ei = (rki == 1) ? TopoDS::Edge(VP.ArcOnS1()) : TopoDS::Edge(VP.ArcOnS2()); TopoDS_Edge ei = (rki == 1) ? TopoDS::Edge(VP.ArcOnS1()) : TopoDS::Edge(VP.ArcOnS2());
Standard_Real pari = (rki == 1) ? VP.ParameterOnArc1() : VP.ParameterOnArc2(); Standard_Real pari = (rki == 1) ? VP.ParameterOnArc1() : VP.ParameterOnArc2();
// if okrest, ei interfers in the compute of transitions for dge // if okrest, ei interfers in the compute of transitions for dge
setrest = mktdg.SetRest(pari,ei); mktdg.SetRest(pari,ei);
ok = mktdg.MkTonE(ei,mkt, par1,par2); ok = mktdg.MkTonE(ei,mkt, par1,par2);
if ((!ok) || (mkt == NOI)) return NOI; if ((!ok) || (mkt == NOI)) return NOI;
OOEi = ei; paronOOEi = pari; hasOOEi = Standard_True; OOEi = ei; paronOOEi = pari; hasOOEi = Standard_True;
@ -1136,7 +1135,7 @@ Standard_Boolean TopOpeBRep_FacesFiller::ProcessVPondgE
Standard_Boolean hasOOEi=Standard_False; TopoDS_Edge OOEi; Standard_Real parOOEi; Standard_Boolean hasOOEi=Standard_False; TopoDS_Edge OOEi; Standard_Real parOOEi;
TopOpeBRepDS_Transition T1ondg, T2ondg; TopOpeBRepDS_Transition T1ondg, T2ondg;
Standard_Integer rankdg=0, Iiondg=0; Standard_Integer rankdg=0, Iiondg=0;
Standard_Real par1ondg, par2ondg; Standard_Real par1ondg=0., par2ondg=0.;
Standard_Boolean hasdgdata = !myDataforDegenEd.IsEmpty(); Standard_Boolean hasdgdata = !myDataforDegenEd.IsEmpty();
if (!hasdgdata) { if (!hasdgdata) {
return Standard_False; return Standard_False;

2
src/Units/Units_Lexicon.cxx
View File

@ -123,7 +123,7 @@ Standard_Boolean Units_Lexicon::UpToDate() const
TCollection_AsciiString string = FileName(); TCollection_AsciiString string = FileName();
if(!stat(string.ToCString(),&buf)) { if(!stat(string.ToCString(),&buf)) {
if(thetime >= buf.st_ctime) if(thetime >= (Standard_Time)buf.st_ctime)
return Standard_True; return Standard_True;
} }

2
src/Units/Units_UnitsDictionary.cxx
View File

@ -317,7 +317,7 @@ Standard_Boolean Units_UnitsDictionary::UpToDate() const
struct stat buf; struct stat buf;
TCollection_AsciiString string = thefilename->String(); TCollection_AsciiString string = thefilename->String();
if(!stat(string.ToCString(),&buf)) { if(!stat(string.ToCString(),&buf)) {
if(thetime == buf.st_ctime) return Standard_True; if(thetime == (Standard_Time)buf.st_ctime) return Standard_True;
} }
return Standard_False; return Standard_False;

2
src/Units/Units_UnitsLexicon.cxx
View File

@ -67,7 +67,7 @@ Standard_Boolean Units_UnitsLexicon::UpToDate() const
{ {
if(!stat(string.ToCString(),&buf)) if(!stat(string.ToCString(),&buf))
{ {
if(thetime >= buf.st_ctime) return Standard_True; if(thetime >= (Standard_Time)buf.st_ctime) return Standard_True;
} }
} }