Merge branch 'master' into V9_dev

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx b/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx
index be10a6f71f04af5479e161c2b3ae883c2ee370ba..585b3eecceb3085c49b685bbf75f8f2d0ccd0bf9 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx
@@ -40,6 +40,9 @@
 #include <Precision.hxx>
 #include <GeomLib_IsPlanarSurface.hxx>
 
+// kernel includes
+#include <Basics_OCCTVersion.hxx>
+
 BLSURFPlugin_Attractor::BLSURFPlugin_Attractor ()
   : _face(),
   _attractorShape(),
@@ -181,7 +184,11 @@ void BLSURFPlugin_Attractor::edgeInit(Handle(Geom_Surface) theSurf, const TopoDS
   Handle(Geom_Curve) aCurve3d = BRep_Tool::Curve (anEdge, first, last);
   ShapeConstruct_ProjectCurveOnSurface curveProjector;
   curveProjector.Init(theSurf, Precision::Confusion());
+#if OCC_VERSION_LARGE > 0x07010000
+  curveProjector.Perform (aCurve3d, first, last, aCurve2d);
+#else
   curveProjector.PerformAdvanced (aCurve3d, first, last, aCurve2d);
+#endif
   
   int N = 1200;
   for (i=0; i<=N; i++){

diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
index d6666d83a0ccd2087f0b3b6455f199ef9e0d075f..e562e5c70e900320037ba527d1bdabff7c9b7b9b 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
@@ -477,7 +477,7 @@ projectionPoint getProjectionPoint(TopoDS_Face& theFace, const gp_Pnt& thePoint)
       throw SMESH_ComputeError(COMPERR_BAD_PARMETERS,
                                "getProjectionPoint: can't project a vertex to a face");
 
-    Quantity_Parameter u,v;
+    Standard_Real u,v;
     projector.LowerDistanceParameters(u,v);
     myPoint.uv = gp_XY(u,v);
     gp_Pnt aPnt = projector.NearestPoint();