[SCM] OCE packaging branch, upstream, updated. OCE-0.6.0-230-g17bea23
davyw
davy.wouters at gmail.com
Fri Feb 24 18:50:28 UTC 2012
The following commit has been merged in the upstream branch:
commit 7f274a38c539dbfee59250287efcc2de556d8264
Author: davyw <davy.wouters at gmail.com>
Date: Sun Jan 15 14:08:55 2012 +0100
Fixes ambiguity errors on bcc32 compiler for 'BRepLib_MakeVertex'.
('BRepLib_MakeVertex::operator TopoDS_Vertex()' and 'BRepLib_MakeShape::operator TopoDS_Shape')
diff --git a/src/BRepFill/BRepFill_Evolved.cxx b/src/BRepFill/BRepFill_Evolved.cxx
index 5f4b691..b1a2edf 100644
--- a/src/BRepFill/BRepFill_Evolved.cxx
+++ b/src/BRepFill/BRepFill_Evolved.cxx
@@ -3225,8 +3225,8 @@ void CutEdge (const TopoDS_Edge& E,
gp_Pnt2d P1 = CT2d->Value(m1);
gp_Pnt2d P2 = CT2d->Value(m2);
- TopoDS_Vertex VL1 = BRepLib_MakeVertex(gp_Pnt(P1.X(), P1.Y(), 0.));
- TopoDS_Vertex VL2 = BRepLib_MakeVertex(gp_Pnt(P2.X(), P2.Y(), 0.));
+ TopoDS_Vertex VL1 = (TopoDS_Vertex) BRepLib_MakeVertex(gp_Pnt(P1.X(), P1.Y(), 0.));
+ TopoDS_Vertex VL2 = (TopoDS_Vertex) BRepLib_MakeVertex(gp_Pnt(P2.X(), P2.Y(), 0.));
TopoDS_Shape aLocalShape1 = E.EmptyCopied();
TopoDS_Shape aLocalShape2 = E.EmptyCopied();
TopoDS_Shape aLocalShape3 = E.EmptyCopied();
diff --git a/src/BRepOffset/BRepOffset_Inter2d.cxx b/src/BRepOffset/BRepOffset_Inter2d.cxx
index f67a699..70e026f 100644
--- a/src/BRepOffset/BRepOffset_Inter2d.cxx
+++ b/src/BRepOffset/BRepOffset_Inter2d.cxx
@@ -358,7 +358,7 @@ static void EdgeInter(const TopoDS_Face& F,
}
gp_Pnt P = ResPoints(i); //ponc1.Value();
- TopoDS_Vertex aNewVertex = BRepLib_MakeVertex(P);
+ TopoDS_Vertex aNewVertex = (TopoDS_Vertex) BRepLib_MakeVertex(P);
B.UpdateVertex( aNewVertex, aT1, E1, Tol );
B.UpdateVertex( aNewVertex, aT2, E2, Tol );
gp_Pnt P1 = CE1.Value(aT1);
@@ -439,7 +439,7 @@ static void EdgeInter(const TopoDS_Face& F,
gp_Pnt P2 = BRep_Tool::Pnt(V2[k]);
Standard_Real Dist = P1.Distance(P2);
if (Dist < TolConf) {
- TopoDS_Vertex V = BRepLib_MakeVertex(P1);
+ TopoDS_Vertex V = (TopoDS_Vertex) BRepLib_MakeVertex(P1);
U1 = (j == 0) ? f[1] : l[1];
U2 = (k == 0) ? f[2] : l[2];
TopoDS_Shape aLocalShape = V.Oriented(TopAbs_INTERNAL);
@@ -628,7 +628,7 @@ static void RefEdgeInter(const TopoDS_Face& F,
}
gp_Pnt P = ResPoints(i); //ponc1.Value();
- TopoDS_Vertex aNewVertex = BRepLib_MakeVertex(P);
+ TopoDS_Vertex aNewVertex = (TopoDS_Vertex) BRepLib_MakeVertex(P);
B.UpdateVertex( aNewVertex, aT1, E1, Tol );
B.UpdateVertex( aNewVertex, aT2, E2, Tol );
gp_Pnt P1 = CE1.Value(aT1);
@@ -708,7 +708,7 @@ static void RefEdgeInter(const TopoDS_Face& F,
gp_Pnt P2 = BRep_Tool::Pnt(V2[k]);
Standard_Real Dist = P1.Distance(P2);
if (Dist < TolConf) {
- TopoDS_Vertex V = BRepLib_MakeVertex(P1);
+ TopoDS_Vertex V = (TopoDS_Vertex) BRepLib_MakeVertex(P1);
U1 = (j == 0) ? f[1] : l[1];
U2 = (k == 0) ? f[2] : l[2];
TopoDS_Shape aLocalShape = V.Oriented(TopAbs_INTERNAL);
diff --git a/src/BRepOffset/BRepOffset_Inter3d.cxx b/src/BRepOffset/BRepOffset_Inter3d.cxx
index d4a6bf4..fcd1770 100644
--- a/src/BRepOffset/BRepOffset_Inter3d.cxx
+++ b/src/BRepOffset/BRepOffset_Inter3d.cxx
@@ -73,8 +73,8 @@ static void ExtentEdge(const TopoDS_Face& F,
BRep_Builder B;
B.Range(NE,f,l);
BRepAdaptor_Curve CE(E);
- TopoDS_Vertex V1 = BRepLib_MakeVertex(CE.Value(f));
- TopoDS_Vertex V2 = BRepLib_MakeVertex(CE.Value(l));
+ TopoDS_Vertex V1 = (TopoDS_Vertex) BRepLib_MakeVertex(CE.Value(f));
+ TopoDS_Vertex V2 = (TopoDS_Vertex) BRepLib_MakeVertex(CE.Value(l));
B.Add(NE,V1.Oriented(TopAbs_FORWARD));
B.Add(NE,V2.Oriented(TopAbs_REVERSED));
NE.Orientation(E.Orientation());
diff --git a/src/BRepOffset/BRepOffset_Tool.cxx b/src/BRepOffset/BRepOffset_Tool.cxx
index fda1793..4db9080 100644
--- a/src/BRepOffset/BRepOffset_Tool.cxx
+++ b/src/BRepOffset/BRepOffset_Tool.cxx
@@ -2468,7 +2468,7 @@ void BRepOffset_Tool::Inter2d (const TopoDS_Face& F,
}
if (YaSol) {
gp_Pnt P = S->Value(P2d.X(),P2d.Y());
- TopoDS_Vertex V = BRepLib_MakeVertex(P);
+ TopoDS_Vertex V = (TopoDS_Vertex) BRepLib_MakeVertex(P);
V.Orientation(TopAbs_INTERNAL);
TopoDS_Shape aLocalEdge = E1.Oriented(TopAbs_FORWARD);
B.UpdateVertex(V,U1,TopoDS::Edge(aLocalEdge),TolConf);
diff --git a/src/BRepTest/BRepTest_CurveCommands.cxx b/src/BRepTest/BRepTest_CurveCommands.cxx
index 6054adc..b75a8a1 100644
--- a/src/BRepTest/BRepTest_CurveCommands.cxx
+++ b/src/BRepTest/BRepTest_CurveCommands.cxx
@@ -1582,7 +1582,7 @@ Standard_Integer edgeintersector(Draw_Interpretor& di,
for (;EInter.MorePoint();EInter.NextPoint()) {
const TopOpeBRep_Point2d& P2D = EInter.Point();
gp_Pnt P = P2D.Value();
- TopoDS_Vertex V = BRepLib_MakeVertex(P);
+ TopoDS_Vertex V = (TopoDS_Vertex) BRepLib_MakeVertex(P);
NbV ++;
sprintf(name,"%s_%d",a[1],NbV);
DBRep::Set(name,V);
diff --git a/src/LocOpe/LocOpe_DPrism.cxx b/src/LocOpe/LocOpe_DPrism.cxx
index 3b33f5b..5dad4c8 100644
--- a/src/LocOpe/LocOpe_DPrism.cxx
+++ b/src/LocOpe/LocOpe_DPrism.cxx
@@ -73,12 +73,12 @@ LocOpe_DPrism::LocOpe_DPrism(const TopoDS_Face& Spine,
Standard_Real y = Height1*sin(Angle);
Standard_Real z = Height1*cos(Angle);
- TopoDS_Vertex Vert2 = BRepLib_MakeVertex(gp_Pnt(0,y,z));
+ TopoDS_Vertex Vert2 = (TopoDS_Vertex) BRepLib_MakeVertex(gp_Pnt(0,y,z));
Standard_Real y1 = -Height2*sin(Angle);
Standard_Real z1 = -Height2*cos(Angle);
- TopoDS_Vertex Vert1 = BRepLib_MakeVertex(gp_Pnt(0,y1,z1));
+ TopoDS_Vertex Vert1 = (TopoDS_Vertex) BRepLib_MakeVertex(gp_Pnt(0,y1,z1));
myProfile2 = BRepLib_MakeEdge(Vert1, Vert2);
@@ -92,7 +92,7 @@ LocOpe_DPrism::LocOpe_DPrism(const TopoDS_Face& Spine,
Standard_Real Deltay = Max(Umax-Umin,Vmax-Vmin) + Abs(y);
Deltay*=2;
- TopoDS_Vertex Vert3 = BRepLib_MakeVertex(gp_Pnt(0, y + Deltay, z));
+ TopoDS_Vertex Vert3 = (TopoDS_Vertex) BRepLib_MakeVertex(gp_Pnt(0, y + Deltay, z));
myProfile3 = BRepLib_MakeEdge(Vert2, Vert3);
Umax = 0.;
@@ -104,7 +104,7 @@ LocOpe_DPrism::LocOpe_DPrism(const TopoDS_Face& Spine,
Standard_Real Deltay1 = Max(Umax-Umin,Vmax-Vmin) + Abs(y1);
Deltay1*=2;
- TopoDS_Vertex Vert4 = BRepLib_MakeVertex(gp_Pnt(0, y1+Deltay1, z1));
+ TopoDS_Vertex Vert4 = (TopoDS_Vertex) BRepLib_MakeVertex(gp_Pnt(0, y1+Deltay1, z1));
myProfile1 = BRepLib_MakeEdge(Vert4, Vert1);
myProfile = BRepLib_MakeWire(myProfile1,myProfile2,myProfile3);
@@ -346,8 +346,8 @@ LocOpe_DPrism::LocOpe_DPrism(const TopoDS_Face& Spine,
Standard_Real y = Height*sin(Angle);
Standard_Real z = Height*cos(Angle);
- TopoDS_Vertex Vert1 = BRepLib_MakeVertex(gp_Pnt(0, 0, 0));
- TopoDS_Vertex Vert2 = BRepLib_MakeVertex(gp_Pnt(0,y,z));
+ TopoDS_Vertex Vert1 = (TopoDS_Vertex) BRepLib_MakeVertex(gp_Pnt(0, 0, 0));
+ TopoDS_Vertex Vert2 = (TopoDS_Vertex) BRepLib_MakeVertex(gp_Pnt(0,y,z));
myProfile2 = BRepLib_MakeEdge(Vert1, Vert2);
Standard_Real Umin,Umax,Vmin,Vmax;
@@ -355,10 +355,10 @@ LocOpe_DPrism::LocOpe_DPrism(const TopoDS_Face& Spine,
Standard_Real Deltay = Max(Umax-Umin,Vmax-Vmin) + Abs(y);
Deltay*=2;
- TopoDS_Vertex Vert3 = BRepLib_MakeVertex(gp_Pnt(0, y + Deltay,z));
+ TopoDS_Vertex Vert3 = (TopoDS_Vertex) BRepLib_MakeVertex(gp_Pnt(0, y + Deltay,z));
myProfile3 = BRepLib_MakeEdge(Vert2, Vert3);
- TopoDS_Vertex Vert4 = BRepLib_MakeVertex(gp_Pnt(0, Deltay,0));
+ TopoDS_Vertex Vert4 = (TopoDS_Vertex) BRepLib_MakeVertex(gp_Pnt(0, Deltay,0));
myProfile1 = BRepLib_MakeEdge(Vert4, Vert1);
myProfile = BRepLib_MakeWire(myProfile1,myProfile2,myProfile3);
--
OCE packaging
More information about the debian-science-commits
mailing list