From 9dbdfcb44e54ef61758e194b9e31f790f0822535 Mon Sep 17 00:00:00 2001 From: eap Date: Tue, 1 Mar 2011 14:48:48 +0000 Subject: [PATCH] 0021196: [CEA 456] Integration and merge modification for debian packages geom-fix-powerpc.patch: Rename PPC variable, this is a macro on PowerPC --- src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx | 6 +++--- src/GEOMImpl/GEOMImpl_PipeDriver.cxx | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx index 57deaa5d7..d6a259787 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx @@ -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); } diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx index 87a0e5e16..aef2c9d33 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx @@ -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 -- 2.39.2