ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-18 23:50:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021196: [CEA 456] Integration and merge modification for debian packages

Browse Source 
geom-fix-powerpc.patch:
   Rename PPC variable, this is a macro on PowerPC
This commit is contained in:
eap 2011-03-01 14:48:48 +00:00
parent 476819a618
commit 9dbdfcb44e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
View File

@ -2011,10 +2011,10 @@ Standard_Real GEOMImpl_IMeasureOperations::CurveCurvatureByPoint
#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
OCC_CATCH_SIGNALS;
#endif
GeomAPI_ProjectPointOnCurve PPC(aPoint, aCurve, aFP, aLP);
if(PPC.NbPoints()>0) {
GeomAPI_ProjectPointOnCurve PPCurve(aPoint, aCurve, aFP, aLP);
if(PPCurve.NbPoints()>0) {
GeomLProp_CLProps Prop = GeomLProp_CLProps
(aCurve, PPC.LowerDistanceParameter(), 2, Precision::Confusion());
(aCurve, PPCurve.LowerDistanceParameter(), 2, Precision::Confusion());
aRes = fabs(Prop.Curvature());
SetErrorCode(OK);
}

16
src/GEOMImpl/GEOMImpl_PipeDriver.cxx
View File

@ -760,10 +760,10 @@ static TopoDS_Shape CreatePipeForShellSections(const TopoDS_Wire& aWirePath,
// find distance between E and aLocs(jcurr)
double fp,lp;
Handle(Geom_Curve) C = BRep_Tool::Curve(E,fp,lp);
GeomAPI_ProjectPointOnCurve PPC (PLocs.Value(jcurr),C);
if( PPC.NbPoints()>0 &&
PLocs.Value(jcurr).Distance(PPC.Point(1)) < tol ) {
double param = PPC.Parameter(1);
GeomAPI_ProjectPointOnCurve PPCurve (PLocs.Value(jcurr),C);
if( PPCurve.NbPoints()>0 &&
PLocs.Value(jcurr).Distance(PPCurve.Point(1)) < tol ) {
double param = PPCurve.Parameter(1);
gp_Pnt PC1;
C->D0(param,PC1);
// split current edge
@ -2148,10 +2148,10 @@ Standard_Integer GEOMImpl_PipeDriver::Execute(TFunction_Logbook& log) const
// find distance between E and aLocs(jcurr)
double fp,lp;
Handle(Geom_Curve) C = BRep_Tool::Curve(E,fp,lp);
GeomAPI_ProjectPointOnCurve PPC (PLocs.Value(jcurr),C);
if( PPC.NbPoints()>0 &&
PLocs.Value(jcurr).Distance(PPC.Point(1)) < tol ) {
double param = PPC.Parameter(1);
GeomAPI_ProjectPointOnCurve PPCurve (PLocs.Value(jcurr),C);
if( PPCurve.NbPoints()>0 &&
PLocs.Value(jcurr).Distance(PPCurve.Point(1)) < tol ) {
double param = PPCurve.Parameter(1);
gp_Pnt PC1;
C->D0(param,PC1);
// split current edge