0026042: OCCT won't work with the latest Xcode

[occt.git] / src / Geom2d / Geom2d_BSplineCurve.cxx

diff --git a/src/Geom2d/Geom2d_BSplineCurve.cxx b/src/Geom2d/Geom2d_BSplineCurve.cxx
index 1e37d8b..b3ad8d6 100644 (file)
--- a/src/Geom2d/Geom2d_BSplineCurve.cxx
+++ b/src/Geom2d/Geom2d_BSplineCurve.cxx
@@ -260,9 +260,9 @@ void Geom2d_BSplineCurve::IncreaseDegree
     
     BSplCLib::IncreaseDegree
       (deg,Degree, periodic,
-       poles->Array1(),weights->Array1(),
+       poles->Array1(),&weights->Array1(),
        knots->Array1(),mults->Array1(),
-       npoles->ChangeArray1(),nweights->ChangeArray1(),
+       npoles->ChangeArray1(),&nweights->ChangeArray1(),
        nknots->ChangeArray1(),nmults->ChangeArray1());
   }
   else {
@@ -270,10 +270,10 @@ void Geom2d_BSplineCurve::IncreaseDegree
     BSplCLib::IncreaseDegree
       (deg,Degree, periodic,
        poles->Array1(),
-       *((TColStd_Array1OfReal*) NULL),
+       BSplCLib::NoWeights(),
        knots->Array1(),mults->Array1(),
        npoles->ChangeArray1(),
-       *((TColStd_Array1OfReal*) NULL),
+       BSplCLib::NoWeights(),
        nknots->ChangeArray1(),nmults->ChangeArray1());
   }
 
@@ -368,7 +368,7 @@ void  Geom2d_BSplineCurve::InsertKnots(const TColStd_Array1OfReal& Knots,
 
   if (!BSplCLib::PrepareInsertKnots(deg,periodic,
                                    knots->Array1(),mults->Array1(),
-                                   Knots,Mults,nbpoles,nbknots,Epsilon,Add))
+                                   Knots,&Mults,nbpoles,nbknots,Epsilon,Add))
     Standard_ConstructionError::Raise("Geom2d_BSplineCurve::InsertKnots");
 
   if (nbpoles == poles->Length()) return;
@@ -386,10 +386,10 @@ void  Geom2d_BSplineCurve::InsertKnots(const TColStd_Array1OfReal& Knots,
     Handle(TColStd_HArray1OfReal) nweights = 
       new TColStd_HArray1OfReal(1,nbpoles);
     BSplCLib::InsertKnots(deg,periodic,
-                         poles->Array1(), weights->Array1(),
+                         poles->Array1(), &weights->Array1(),
                          knots->Array1(), mults->Array1(),
-                         Knots, Mults,
-                         npoles->ChangeArray1(), nweights->ChangeArray1(),
+                         Knots, &Mults,
+                         npoles->ChangeArray1(), &nweights->ChangeArray1(),
                          nknots->ChangeArray1(), nmults->ChangeArray1(),
                          Epsilon,Add);
     weights = nweights;
@@ -397,11 +397,11 @@ void  Geom2d_BSplineCurve::InsertKnots(const TColStd_Array1OfReal& Knots,
   else {
     BSplCLib::InsertKnots(deg,periodic,
                          poles->Array1(),
-                         *((TColStd_Array1OfReal*) NULL),
+                         BSplCLib::NoWeights(),
                          knots->Array1(), mults->Array1(),
-                         Knots, Mults,
+                         Knots, &Mults,
                          npoles->ChangeArray1(),
-                         *((TColStd_Array1OfReal*) NULL),
+                         BSplCLib::NoWeights(),
                          nknots->ChangeArray1(), nmults->ChangeArray1(),
                          Epsilon,Add);
   }
@@ -453,9 +453,9 @@ Standard_Boolean  Geom2d_BSplineCurve::RemoveKnot
       new TColStd_HArray1OfReal(1,npoles->Length());
     if (!BSplCLib::RemoveKnot
        (Index, M, deg, periodic,
-        poles->Array1(),weights->Array1(), 
+        poles->Array1(),&weights->Array1(), 
         knots->Array1(),mults->Array1(),
-        npoles->ChangeArray1(), nweights->ChangeArray1(),
+        npoles->ChangeArray1(), &nweights->ChangeArray1(),
         nknots->ChangeArray1(),nmults->ChangeArray1(),
         Tolerance))
       return Standard_False;
@@ -465,10 +465,10 @@ Standard_Boolean  Geom2d_BSplineCurve::RemoveKnot
     if (!BSplCLib::RemoveKnot
        (Index, M, deg, periodic,
         poles->Array1(),
-        *((TColStd_Array1OfReal*) NULL),
+        BSplCLib::NoWeights(),
         knots->Array1(),mults->Array1(),
         npoles->ChangeArray1(),
-        *((TColStd_Array1OfReal*) NULL),
+        BSplCLib::NoWeights(),
         nknots->ChangeArray1(),nmults->ChangeArray1(),
         Tolerance))
       return Standard_False;
@@ -1053,18 +1053,18 @@ void Geom2d_BSplineCurve::SetNotPeriodic ()
       
       BSplCLib::Unperiodize
        (deg,mults->Array1(),knots->Array1(),poles->Array1(),
-        weights->Array1(),nmults->ChangeArray1(),
+        &weights->Array1(),nmults->ChangeArray1(),
         nknots->ChangeArray1(),npoles->ChangeArray1(),
-        nweights->ChangeArray1());
+        &nweights->ChangeArray1());
       
     }
     else {
       
       BSplCLib::Unperiodize
        (deg,mults->Array1(),knots->Array1(),poles->Array1(),
-        *((TColStd_Array1OfReal*) NULL),nmults->ChangeArray1(),
+        BSplCLib::NoWeights(),nmults->ChangeArray1(),
         nknots->ChangeArray1(),npoles->ChangeArray1(),
-        *((TColStd_Array1OfReal*) NULL));
+        BSplCLib::NoWeights());
       
     }
     poles   = npoles;