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

0027772: Foundation Classes - define Standard_Boolean using C++ type "bool" instead of "unsigned int"

Browse Source 
Code has been updated to remove no-op casts and implicit casts to Standard_Boolean.

Places of inproper use of Standard_Boolean instead of Standard_Integer
have been corrected:
- Bnd_Box, Bnd_Box2d
  Bit flags are now defined as private enum
- HLRAlgo_BiPoint, HLRAlgo_EdgesBlock, HLRBRep_EdgeData, HLRBRep_FaceData
  Bit flags are now defined as enum
- HLRAlgo_EdgeStatus, HLRBRep_BiPnt2D, HLRBRep_BiPoint
  Bit flags are now defined as bool fields
- HLRAlgo_PolyData
  Bit flags are now defined as Standard_Integer
- OSD_DirectoryIterator, OSD_FileIterator
  Boolean flag is now defined as Standard_Boolean
- ShapeAnalysis_Surface::SurfaceNewton()
  now returns Standard_Integer (values 0, 1 or 3)
- ChFi2d_FilletAlgo
  now uses TColStd_SequenceOfBoolean instead of TColStd_SequenceOfInteger
  for storing boolean flags

Method IFSelect_Dispatch::PacketsCount() has been dropped from interface.

ShapeFix_Solid::Status() has been fixed to decode requested status
instead of returning integer value.

TopOpeBRepBuild_Builder1 now defines map storing Standard_Boolean values
instead of Standard_Integer.

Persistence for Standard_Boolean type has been corrected
to keep backward compatibility:
- BinMDataStd, BinTools, FSD_BinaryFile

Broken Draw Harness commands vdisplaymode and verasemode have been removed.

BRepMesh_FastDiscretFace::initDataStructure() - workaround old gcc limitations

BRepMesh_IncrementalMesh::clear() - avoid ambiguity
This commit is contained in:
kgv
2016-08-25 14:58:51 +03:00
committed by abv
parent 3fe9ce0edd
commit dde6883382
211 changed files with 1324 additions and 2667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

228
src/HLRBRep/HLRBRep_PolyAlgo.cxx
View File

@@ -56,26 +56,26 @@
IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define EMskOutLin1 ((Standard_Boolean) 1)
#define EMskOutLin2 ((Standard_Boolean) 2)
#define EMskOutLin3 ((Standard_Boolean) 4)
#define EMskGrALin1 ((Standard_Boolean) 8)
#define EMskGrALin2 ((Standard_Boolean) 16)
#define EMskGrALin3 ((Standard_Boolean) 32)
#define FMskBack ((Standard_Boolean) 64)
#define FMskSide ((Standard_Boolean) 128)
#define FMskHiding ((Standard_Boolean) 256)
#define FMskFlat ((Standard_Boolean) 512)
#define FMskOnOutL ((Standard_Boolean)1024)
#define FMskOrBack ((Standard_Boolean)2048)
#define FMskFrBack ((Standard_Boolean)4096)
#define EMskOutLin1 ((Standard_Integer) 1)
#define EMskOutLin2 ((Standard_Integer) 2)
#define EMskOutLin3 ((Standard_Integer) 4)
#define EMskGrALin1 ((Standard_Integer) 8)
#define EMskGrALin2 ((Standard_Integer) 16)
#define EMskGrALin3 ((Standard_Integer) 32)
#define FMskBack ((Standard_Integer) 64)
#define FMskSide ((Standard_Integer) 128)
#define FMskHiding ((Standard_Integer) 256)
#define FMskFlat ((Standard_Integer) 512)
#define FMskOnOutL ((Standard_Integer)1024)
#define FMskOrBack ((Standard_Integer)2048)
#define FMskFrBack ((Standard_Integer)4096)
#define NMskVert ((Standard_Boolean) 1)
#define NMskOutL ((Standard_Boolean) 2)
#define NMskNorm ((Standard_Boolean) 4)
#define NMskFuck ((Standard_Boolean) 8)
#define NMskEdge ((Standard_Boolean)16)
#define NMskMove ((Standard_Boolean)32)
#define NMskVert ((Standard_Integer) 1)
#define NMskOutL ((Standard_Integer) 2)
#define NMskNorm ((Standard_Integer) 4)
#define NMskFuck ((Standard_Integer) 8)
#define NMskEdge ((Standard_Integer)16)
#define NMskMove ((Standard_Integer)32)
#define PntXTI1 ((Standard_Real*)Coordinates)[ 0]
#define PntYTI1 ((Standard_Real*)Coordinates)[ 1]
@@ -106,17 +106,17 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define Tri1Node1 ((Standard_Integer*)Tri1Indices)[0]
#define Tri1Node2 ((Standard_Integer*)Tri1Indices)[1]
#define Tri1Node3 ((Standard_Integer*)Tri1Indices)[2]
#define Tri1Flags ((Standard_Boolean*)Tri1Indices)[3]
#define Tri1Flags ((Standard_Integer*)Tri1Indices)[3]
#define Tri2Node1 ((Standard_Integer*)Tri2Indices)[0]
#define Tri2Node2 ((Standard_Integer*)Tri2Indices)[1]
#define Tri2Node3 ((Standard_Integer*)Tri2Indices)[2]
#define Tri2Flags ((Standard_Boolean*)Tri2Indices)[3]
#define Tri2Flags ((Standard_Integer*)Tri2Indices)[3]
#define Tri3Node1 ((Standard_Integer*)Tri3Indices)[0]
#define Tri3Node2 ((Standard_Integer*)Tri3Indices)[1]
#define Tri3Node3 ((Standard_Integer*)Tri3Indices)[2]
#define Tri3Flags ((Standard_Boolean*)Tri3Indices)[3]
#define Tri3Flags ((Standard_Integer*)Tri3Indices)[3]
#define Seg1LstSg1 ((Standard_Integer*)Seg1Indices)[0]
#define Seg1LstSg2 ((Standard_Integer*)Seg1Indices)[1]
@@ -133,9 +133,9 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define Seg2Conex2 ((Standard_Integer*)Seg2Indices)[5]
#define Nod1NdSg ((Standard_Integer*)Nod1Indices)[0]
#define Nod1Flag ((Standard_Boolean*)Nod1Indices)[1]
#define Nod1Edg1 ((Standard_Boolean*)Nod1Indices)[2]
#define Nod1Edg2 ((Standard_Boolean*)Nod1Indices)[3]
#define Nod1Flag ((Standard_Integer*)Nod1Indices)[1]
#define Nod1Edg1 ((Standard_Integer*)Nod1Indices)[2]
#define Nod1Edg2 ((Standard_Integer*)Nod1Indices)[3]
#define Nod1PntX ((Standard_Real*)Nod1RValues)[ 0]
#define Nod1PntY ((Standard_Real*)Nod1RValues)[ 1]
@@ -150,9 +150,9 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define Nod1Scal ((Standard_Real*)Nod1RValues)[10]
#define NodANdSg ((Standard_Integer*)NodAIndices)[0]
#define NodAFlag ((Standard_Boolean*)NodAIndices)[1]
#define NodAEdg1 ((Standard_Boolean*)NodAIndices)[2]
#define NodAEdg2 ((Standard_Boolean*)NodAIndices)[3]
#define NodAFlag ((Standard_Integer*)NodAIndices)[1]
#define NodAEdg1 ((Standard_Integer*)NodAIndices)[2]
#define NodAEdg2 ((Standard_Integer*)NodAIndices)[3]
#define NodAPntX ((Standard_Real*)NodARValues)[ 0]
#define NodAPntY ((Standard_Real*)NodARValues)[ 1]
@@ -167,9 +167,9 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define NodAScal ((Standard_Real*)NodARValues)[10]
#define NodBNdSg ((Standard_Integer*)NodBIndices)[0]
#define NodBFlag ((Standard_Boolean*)NodBIndices)[1]
#define NodBEdg1 ((Standard_Boolean*)NodBIndices)[2]
#define NodBEdg2 ((Standard_Boolean*)NodBIndices)[3]
#define NodBFlag ((Standard_Integer*)NodBIndices)[1]
#define NodBEdg1 ((Standard_Integer*)NodBIndices)[2]
#define NodBEdg2 ((Standard_Integer*)NodBIndices)[3]
#define NodBPntX ((Standard_Real*)NodBRValues)[ 0]
#define NodBPntY ((Standard_Real*)NodBRValues)[ 1]
@@ -184,9 +184,9 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define NodBScal ((Standard_Real*)NodBRValues)[10]
#define Nod2NdSg ((Standard_Integer*)Nod2Indices)[0]
#define Nod2Flag ((Standard_Boolean*)Nod2Indices)[1]
#define Nod2Edg1 ((Standard_Boolean*)Nod2Indices)[2]
#define Nod2Edg2 ((Standard_Boolean*)Nod2Indices)[3]
#define Nod2Flag ((Standard_Integer*)Nod2Indices)[1]
#define Nod2Edg1 ((Standard_Integer*)Nod2Indices)[2]
#define Nod2Edg2 ((Standard_Integer*)Nod2Indices)[3]
#define Nod2PntX ((Standard_Real*)Nod2RValues)[ 0]
#define Nod2PntY ((Standard_Real*)Nod2RValues)[ 1]
@@ -201,9 +201,9 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define Nod2Scal ((Standard_Real*)Nod2RValues)[10]
#define Nod3NdSg ((Standard_Integer*)Nod3Indices)[0]
#define Nod3Flag ((Standard_Boolean*)Nod3Indices)[1]
#define Nod3Edg1 ((Standard_Boolean*)Nod3Indices)[2]
#define Nod3Edg2 ((Standard_Boolean*)Nod3Indices)[3]
#define Nod3Flag ((Standard_Integer*)Nod3Indices)[1]
#define Nod3Edg1 ((Standard_Integer*)Nod3Indices)[2]
#define Nod3Edg2 ((Standard_Integer*)Nod3Indices)[3]
#define Nod3PntX ((Standard_Real*)Nod3RValues)[ 0]
#define Nod3PntY ((Standard_Real*)Nod3RValues)[ 1]
@@ -218,9 +218,9 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define Nod3Scal ((Standard_Real*)Nod3RValues)[10]
#define Nod4NdSg ((Standard_Integer*)Nod4Indices)[0]
#define Nod4Flag ((Standard_Boolean*)Nod4Indices)[1]
#define Nod4Edg1 ((Standard_Boolean*)Nod4Indices)[2]
#define Nod4Edg2 ((Standard_Boolean*)Nod4Indices)[3]
#define Nod4Flag ((Standard_Integer*)Nod4Indices)[1]
#define Nod4Edg1 ((Standard_Integer*)Nod4Indices)[2]
#define Nod4Edg2 ((Standard_Integer*)Nod4Indices)[3]
#define Nod4PntX ((Standard_Real*)Nod4RValues)[ 0]
#define Nod4PntY ((Standard_Real*)Nod4RValues)[ 1]
@@ -235,9 +235,9 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define Nod4Scal ((Standard_Real*)Nod4RValues)[10]
#define Nod11NdSg ((Standard_Integer*)Nod11Indices)[0]
#define Nod11Flag ((Standard_Boolean*)Nod11Indices)[1]
#define Nod11Edg1 ((Standard_Boolean*)Nod11Indices)[2]
#define Nod11Edg2 ((Standard_Boolean*)Nod11Indices)[3]
#define Nod11Flag ((Standard_Integer*)Nod11Indices)[1]
#define Nod11Edg1 ((Standard_Integer*)Nod11Indices)[2]
#define Nod11Edg2 ((Standard_Integer*)Nod11Indices)[3]
#define Nod11PntX ((Standard_Real*)Nod11RValues)[ 0]
#define Nod11PntY ((Standard_Real*)Nod11RValues)[ 1]
@@ -252,9 +252,9 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define Nod11Scal ((Standard_Real*)Nod11RValues)[10]
#define Nod1ANdSg ((Standard_Integer*)Nod1AIndices)[0]
#define Nod1AFlag ((Standard_Boolean*)Nod1AIndices)[1]
#define Nod1AEdg1 ((Standard_Boolean*)Nod1AIndices)[2]
#define Nod1AEdg2 ((Standard_Boolean*)Nod1AIndices)[3]
#define Nod1AFlag ((Standard_Integer*)Nod1AIndices)[1]
#define Nod1AEdg1 ((Standard_Integer*)Nod1AIndices)[2]
#define Nod1AEdg2 ((Standard_Integer*)Nod1AIndices)[3]
#define Nod1APntX ((Standard_Real*)Nod1ARValues)[ 0]
#define Nod1APntY ((Standard_Real*)Nod1ARValues)[ 1]
@@ -269,9 +269,9 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define Nod1AScal ((Standard_Real*)Nod1ARValues)[10]
#define Nod1BNdSg ((Standard_Integer*)Nod1BIndices)[0]
#define Nod1BFlag ((Standard_Boolean*)Nod1BIndices)[1]
#define Nod1BEdg1 ((Standard_Boolean*)Nod1BIndices)[2]
#define Nod1BEdg2 ((Standard_Boolean*)Nod1BIndices)[3]
#define Nod1BFlag ((Standard_Integer*)Nod1BIndices)[1]
#define Nod1BEdg1 ((Standard_Integer*)Nod1BIndices)[2]
#define Nod1BEdg2 ((Standard_Integer*)Nod1BIndices)[3]
#define Nod1BPntX ((Standard_Real*)Nod1BRValues)[ 0]
#define Nod1BPntY ((Standard_Real*)Nod1BRValues)[ 1]
@@ -286,9 +286,9 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define Nod1BScal ((Standard_Real*)Nod1BRValues)[10]
#define Nod12NdSg ((Standard_Integer*)Nod12Indices)[0]
#define Nod12Flag ((Standard_Boolean*)Nod12Indices)[1]
#define Nod12Edg1 ((Standard_Boolean*)Nod12Indices)[2]
#define Nod12Edg2 ((Standard_Boolean*)Nod12Indices)[3]
#define Nod12Flag ((Standard_Integer*)Nod12Indices)[1]
#define Nod12Edg1 ((Standard_Integer*)Nod12Indices)[2]
#define Nod12Edg2 ((Standard_Integer*)Nod12Indices)[3]
#define Nod12PntX ((Standard_Real*)Nod12RValues)[ 0]
#define Nod12PntY ((Standard_Real*)Nod12RValues)[ 1]
@@ -303,9 +303,9 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define Nod12Scal ((Standard_Real*)Nod12RValues)[10]
#define Nod13NdSg ((Standard_Integer*)Nod13Indices)[0]
#define Nod13Flag ((Standard_Boolean*)Nod13Indices)[1]
#define Nod13Edg1 ((Standard_Boolean*)Nod13Indices)[2]
#define Nod13Edg2 ((Standard_Boolean*)Nod13Indices)[3]
#define Nod13Flag ((Standard_Integer*)Nod13Indices)[1]
#define Nod13Edg1 ((Standard_Integer*)Nod13Indices)[2]
#define Nod13Edg2 ((Standard_Integer*)Nod13Indices)[3]
#define Nod13PntX ((Standard_Real*)Nod13RValues)[ 0]
#define Nod13PntY ((Standard_Real*)Nod13RValues)[ 1]
@@ -320,9 +320,9 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define Nod13Scal ((Standard_Real*)Nod13RValues)[10]
#define Nod14NdSg ((Standard_Integer*)Nod14Indices)[0]
#define Nod14Flag ((Standard_Boolean*)Nod14Indices)[1]
#define Nod14Edg1 ((Standard_Boolean*)Nod14Indices)[2]
#define Nod14Edg2 ((Standard_Boolean*)Nod14Indices)[3]
#define Nod14Flag ((Standard_Integer*)Nod14Indices)[1]
#define Nod14Edg1 ((Standard_Integer*)Nod14Indices)[2]
#define Nod14Edg2 ((Standard_Integer*)Nod14Indices)[3]
#define Nod14PntX ((Standard_Real*)Nod14RValues)[ 0]
#define Nod14PntY ((Standard_Real*)Nod14RValues)[ 1]
@@ -337,9 +337,9 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define Nod14Scal ((Standard_Real*)Nod14RValues)[10]
#define Nod21NdSg ((Standard_Integer*)Nod21Indices)[0]
#define Nod21Flag ((Standard_Boolean*)Nod21Indices)[1]
#define Nod21Edg1 ((Standard_Boolean*)Nod21Indices)[2]
#define Nod21Edg2 ((Standard_Boolean*)Nod21Indices)[3]
#define Nod21Flag ((Standard_Integer*)Nod21Indices)[1]
#define Nod21Edg1 ((Standard_Integer*)Nod21Indices)[2]
#define Nod21Edg2 ((Standard_Integer*)Nod21Indices)[3]
#define Nod21PntX ((Standard_Real*)Nod21RValues)[ 0]
#define Nod21PntY ((Standard_Real*)Nod21RValues)[ 1]
@@ -354,9 +354,9 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define Nod21Scal ((Standard_Real*)Nod21RValues)[10]
#define Nod2ANdSg ((Standard_Integer*)Nod2AIndices)[0]
#define Nod2AFlag ((Standard_Boolean*)Nod2AIndices)[1]
#define Nod2AEdg1 ((Standard_Boolean*)Nod2AIndices)[2]
#define Nod2AEdg2 ((Standard_Boolean*)Nod2AIndices)[3]
#define Nod2AFlag ((Standard_Integer*)Nod2AIndices)[1]
#define Nod2AEdg1 ((Standard_Integer*)Nod2AIndices)[2]
#define Nod2AEdg2 ((Standard_Integer*)Nod2AIndices)[3]
#define Nod2APntX ((Standard_Real*)Nod2ARValues)[ 0]
#define Nod2APntY ((Standard_Real*)Nod2ARValues)[ 1]
@@ -371,9 +371,9 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define Nod2AScal ((Standard_Real*)Nod2ARValues)[10]
#define Nod2BNdSg ((Standard_Integer*)Nod2BIndices)[0]
#define Nod2BFlag ((Standard_Boolean*)Nod2BIndices)[1]
#define Nod2BEdg1 ((Standard_Boolean*)Nod2BIndices)[2]
#define Nod2BEdg2 ((Standard_Boolean*)Nod2BIndices)[3]
#define Nod2BFlag ((Standard_Integer*)Nod2BIndices)[1]
#define Nod2BEdg1 ((Standard_Integer*)Nod2BIndices)[2]
#define Nod2BEdg2 ((Standard_Integer*)Nod2BIndices)[3]
#define Nod2BPntX ((Standard_Real*)Nod2BRValues)[ 0]
#define Nod2BPntY ((Standard_Real*)Nod2BRValues)[ 1]
@@ -388,9 +388,9 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define Nod2BScal ((Standard_Real*)Nod2BRValues)[10]
#define Nod22NdSg ((Standard_Integer*)Nod22Indices)[0]
#define Nod22Flag ((Standard_Boolean*)Nod22Indices)[1]
#define Nod22Edg1 ((Standard_Boolean*)Nod22Indices)[2]
#define Nod22Edg2 ((Standard_Boolean*)Nod22Indices)[3]
#define Nod22Flag ((Standard_Integer*)Nod22Indices)[1]
#define Nod22Edg1 ((Standard_Integer*)Nod22Indices)[2]
#define Nod22Edg2 ((Standard_Integer*)Nod22Indices)[3]
#define Nod22PntX ((Standard_Real*)Nod22RValues)[ 0]
#define Nod22PntY ((Standard_Real*)Nod22RValues)[ 1]
@@ -405,9 +405,9 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define Nod22Scal ((Standard_Real*)Nod22RValues)[10]
#define Nod23NdSg ((Standard_Integer*)Nod23Indices)[0]
#define Nod23Flag ((Standard_Boolean*)Nod23Indices)[1]
#define Nod23Edg1 ((Standard_Boolean*)Nod23Indices)[2]
#define Nod23Edg2 ((Standard_Boolean*)Nod23Indices)[3]
#define Nod23Flag ((Standard_Integer*)Nod23Indices)[1]
#define Nod23Edg1 ((Standard_Integer*)Nod23Indices)[2]
#define Nod23Edg2 ((Standard_Integer*)Nod23Indices)[3]
#define Nod23PntX ((Standard_Real*)Nod23RValues)[ 0]
#define Nod23PntY ((Standard_Real*)Nod23RValues)[ 1]
@@ -422,9 +422,9 @@ IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
#define Nod23Scal ((Standard_Real*)Nod23RValues)[10]
#define Nod24NdSg ((Standard_Integer*)Nod24Indices)[0]
#define Nod24Flag ((Standard_Boolean*)Nod24Indices)[1]
#define Nod24Edg1 ((Standard_Boolean*)Nod24Indices)[2]
#define Nod24Edg2 ((Standard_Boolean*)Nod24Indices)[3]
#define Nod24Flag ((Standard_Integer*)Nod24Indices)[1]
#define Nod24Edg1 ((Standard_Integer*)Nod24Indices)[2]
#define Nod24Edg2 ((Standard_Integer*)Nod24Indices)[3]
#define Nod24PntX ((Standard_Real*)Nod24RValues)[ 0]
#define Nod24PntY ((Standard_Real*)Nod24RValues)[ 1]
@@ -1272,7 +1272,7 @@ InitBiPointsWithConnexity (const Standard_Integer e,
&(((HLRAlgo_Array1OfPINod*)PINod1)->ChangeValue(Pol1(iPol)));
Standard_Address Nod1AIndices = (*pi1pA)->Indices();
Standard_Address Nod1ARValues = (*pi1pA)->RValues();
if (Nod1AEdg1 == 0 || Nod1AEdg1 == (Standard_Boolean) e) {
if (Nod1AEdg1 == 0 || Nod1AEdg1 == e) {
Nod1AEdg1 = e;
Nod1APCu1 = par->Value(iPol);
}
@@ -1288,8 +1288,8 @@ InitBiPointsWithConnexity (const Standard_Integer e,
XTI2 = X2 = Nod12PntX;
YTI2 = Y2 = Nod12PntY;
ZTI2 = Z2 = Nod12PntZ;
if (Nod12Edg1 == (Standard_Boolean) e) U2 = Nod12PCu1;
else if (Nod12Edg2 == (Standard_Boolean) e) U2 = Nod12PCu2;
if (Nod12Edg1 == e) U2 = Nod12PCu1;
else if (Nod12Edg2 == e) U2 = Nod12PCu2;
#ifdef OCCT_DEBUG
else {
cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
@@ -1340,8 +1340,8 @@ InitBiPointsWithConnexity (const Standard_Integer e,
XTI2 = X2 = Nod12PntX;
YTI2 = Y2 = Nod12PntY;
ZTI2 = Z2 = Nod12PntZ;
if (Nod12Edg1 == (Standard_Boolean) e) U2 = Nod12PCu1;
else if (Nod12Edg2 == (Standard_Boolean) e) U2 = Nod12PCu2;
if (Nod12Edg1 == e) U2 = Nod12PCu1;
else if (Nod12Edg2 == e) U2 = Nod12PCu2;
#ifdef OCCT_DEBUG
else {
cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
@@ -1431,7 +1431,7 @@ InitBiPointsWithConnexity (const Standard_Integer e,
Standard_Address Nod2AIndices = (*pi2pA)->Indices();
Standard_Address Nod2ARValues = (*pi2pA)->RValues();
Standard_Real PCu = par->Value(iPol);
if (Nod1AEdg1 == 0 || Nod1AEdg1 == (Standard_Boolean) e) {
if (Nod1AEdg1 == 0 || Nod1AEdg1 == e) {
Nod1AEdg1 = e;
Nod1APCu1 = PCu;
}
@@ -1439,7 +1439,7 @@ InitBiPointsWithConnexity (const Standard_Integer e,
Nod1AEdg2 = e;
Nod1APCu2 = PCu;
}
if (Nod2AEdg1 == 0 || Nod2AEdg1 == (Standard_Boolean) e) {
if (Nod2AEdg1 == 0 || Nod2AEdg1 == e) {
Nod2AEdg1 = e;
Nod2APCu1 = PCu;
}
@@ -1458,8 +1458,8 @@ InitBiPointsWithConnexity (const Standard_Integer e,
XTI2 = X2 = Nod12PntX;
YTI2 = Y2 = Nod12PntY;
ZTI2 = Z2 = Nod12PntZ;
if (Nod12Edg1 == (Standard_Boolean) e) U2 = Nod12PCu1;
else if (Nod12Edg2 == (Standard_Boolean) e) U2 = Nod12PCu2;
if (Nod12Edg1 == e) U2 = Nod12PCu1;
else if (Nod12Edg2 == e) U2 = Nod12PCu2;
#ifdef OCCT_DEBUG
else {
cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
@@ -1531,8 +1531,8 @@ InitBiPointsWithConnexity (const Standard_Integer e,
XTI2 = X2 = Nod12PntX;
YTI2 = Y2 = Nod12PntY;
ZTI2 = Z2 = Nod12PntZ;
if (Nod12Edg1 == (Standard_Boolean) e) U2 = Nod12PCu1;
else if (Nod12Edg2 == (Standard_Boolean) e) U2 = Nod12PCu2;
if (Nod12Edg1 == e) U2 = Nod12PCu1;
else if (Nod12Edg2 == e) U2 = Nod12PCu2;
#ifdef OCCT_DEBUG
else {
cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
@@ -1727,7 +1727,7 @@ Interpolation (HLRAlgo_ListOfBPoint& List,
Standard_Real X3,Y3,Z3,XTI3,YTI3,ZTI3,coef3,U3;
Standard_Real X4,Y4,Z4,XTI4,YTI4,ZTI4,coef4,U4;
// gp_Pnt P3,PT3,P4,PT4;
Standard_Boolean flag = 0;
Standard_Integer flag = 0;
if (rg >= GeomAbs_G1) flag += 1;
if (rg >= GeomAbs_G2) flag += 2;
insP3 = Interpolation(U1,U2,Nod11RValues,Nod12RValues,
@@ -1884,7 +1884,7 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
const Standard_Real U3,
const Standard_Boolean insP3,
const Standard_Boolean mP3P1,
const Standard_Boolean flag) const
const Standard_Integer flag) const
{
Standard_Address TData2 = 0;
Standard_Address PISeg2 = 0;
@@ -1908,8 +1908,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
Nod11PntX = X3;
Nod11PntY = Y3;
Nod11PntZ = Z3;
if (Nod11Edg1 == (Standard_Boolean) e) Nod11PCu1 = U3;
else if (Nod11Edg2 == (Standard_Boolean) e) Nod11PCu2 = U3;
if (Nod11Edg1 == e) Nod11PCu1 = U3;
else if (Nod11Edg2 == e) Nod11PCu2 = U3;
#ifdef OCCT_DEBUG
else {
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
@@ -1946,8 +1946,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
Nod12PntX = X3;
Nod12PntY = Y3;
Nod12PntZ = Z3;
if (Nod12Edg1 == (Standard_Boolean) e) Nod12PCu1 = U3;
else if (Nod12Edg2 == (Standard_Boolean) e) Nod12PCu2 = U3;
if (Nod12Edg1 == e) Nod12PCu1 = U3;
else if (Nod12Edg2 == e) Nod12PCu2 = U3;
#ifdef OCCT_DEBUG
else {
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
@@ -2045,7 +2045,7 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
const Standard_Real U3,
const Standard_Boolean insP3,
const Standard_Boolean mP3P1,
const Standard_Boolean flag) const
const Standard_Integer flag) const
{
Standard_Boolean ins3 = insP3;
if (ins3 && mP3P1) { // P1 ---> P3
@@ -2071,8 +2071,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
Nod11PntX = X3;
Nod11PntY = Y3;
Nod11PntZ = Z3;
if (Nod11Edg1 == (Standard_Boolean) e) Nod11PCu1 = U3;
else if (Nod11Edg2 == (Standard_Boolean) e) Nod11PCu2 = U3;
if (Nod11Edg1 == e) Nod11PCu1 = U3;
else if (Nod11Edg2 == e) Nod11PCu2 = U3;
#ifdef OCCT_DEBUG
else {
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
@@ -2085,8 +2085,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
Nod21PntX = X3;
Nod21PntY = Y3;
Nod21PntZ = Z3;
if (Nod21Edg1 == (Standard_Boolean) e) Nod21PCu1 = U3;
else if (Nod21Edg2 == (Standard_Boolean) e) Nod21PCu2 = U3;
if (Nod21Edg1 == e) Nod21PCu1 = U3;
else if (Nod21Edg2 == e) Nod21PCu2 = U3;
#ifdef OCCT_DEBUG
else {
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
@@ -2128,8 +2128,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
Nod12PntX = X3;
Nod12PntY = Y3;
Nod12PntZ = Z3;
if (Nod12Edg1 == (Standard_Boolean) e) Nod12PCu1 = U3;
else if (Nod12Edg2 == (Standard_Boolean) e) Nod12PCu2 = U3;
if (Nod12Edg1 == e) Nod12PCu1 = U3;
else if (Nod12Edg2 == e) Nod12PCu2 = U3;
#ifdef OCCT_DEBUG
else {
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
@@ -2142,8 +2142,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
Nod22PntX = X3;
Nod22PntY = Y3;
Nod22PntZ = Z3;
if (Nod22Edg1 == (Standard_Boolean) e) Nod22PCu1 = U3;
else if (Nod22Edg2 == (Standard_Boolean) e) Nod22PCu2 = U3;
if (Nod22Edg1 == e) Nod22PCu1 = U3;
else if (Nod22Edg2 == e) Nod22PCu2 = U3;
#ifdef OCCT_DEBUG
else {
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
@@ -2265,7 +2265,7 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
const Standard_Real U4,
const Standard_Boolean insP4,
const Standard_Boolean mP4P1,
const Standard_Boolean flag) const
const Standard_Integer flag) const
{
Standard_Boolean ins3 = insP3;
Standard_Boolean ins4 = insP4;
@@ -2292,8 +2292,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
Nod11PntX = X3;
Nod11PntY = Y3;
Nod11PntZ = Z3;
if (Nod11Edg1 == (Standard_Boolean) e) Nod11PCu1 = U3;
else if (Nod11Edg2 == (Standard_Boolean) e) Nod11PCu2 = U3;
if (Nod11Edg1 == e) Nod11PCu1 = U3;
else if (Nod11Edg2 == e) Nod11PCu2 = U3;
#ifdef OCCT_DEBUG
else {
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
@@ -2306,8 +2306,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
Nod21PntX = X3;
Nod21PntY = Y3;
Nod21PntZ = Z3;
if (Nod21Edg1 == (Standard_Boolean) e) Nod21PCu1 = U3;
else if (Nod21Edg2 == (Standard_Boolean) e) Nod21PCu2 = U3;
if (Nod21Edg1 == e) Nod21PCu1 = U3;
else if (Nod21Edg2 == e) Nod21PCu2 = U3;
#ifdef OCCT_DEBUG
else {
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
@@ -2349,8 +2349,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
Nod12PntX = X4;
Nod12PntY = Y4;
Nod12PntZ = Z4;
if (Nod12Edg1 == (Standard_Boolean) e) Nod12PCu1 = U4;
else if (Nod12Edg2 == (Standard_Boolean) e) Nod12PCu2 = U4;
if (Nod12Edg1 == e) Nod12PCu1 = U4;
else if (Nod12Edg2 == e) Nod12PCu2 = U4;
#ifdef OCCT_DEBUG
else {
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
@@ -2363,8 +2363,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
Nod22PntX = X4;
Nod22PntY = Y4;
Nod22PntZ = Z4;
if (Nod22Edg1 == (Standard_Boolean) e) Nod22PCu1 = U4;
else if (Nod22Edg2 == (Standard_Boolean) e) Nod22PCu2 = U4;
if (Nod22Edg1 == e) Nod22PCu1 = U4;
else if (Nod22Edg2 == e) Nod22PCu2 = U4;
#ifdef OCCT_DEBUG
else {
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
@@ -3163,9 +3163,9 @@ HLRBRep_PolyAlgo::OrientTriangle(const Standard_Integer,
const Standard_Address Nod3Indices,
const Standard_Address Nod3RValues) const
{
Standard_Boolean o1 = Nod1Flag & NMskOutL;
Standard_Boolean o2 = Nod2Flag & NMskOutL;
Standard_Boolean o3 = Nod3Flag & NMskOutL;
Standard_Boolean o1 = (Nod1Flag & NMskOutL) != 0;
Standard_Boolean o2 = (Nod2Flag & NMskOutL) != 0;
Standard_Boolean o3 = (Nod3Flag & NMskOutL) != 0;
Tri1Flags &= ~FMskFlat;
Tri1Flags &= ~FMskOnOutL;
if (o1 && o2 && o3) {