mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-19 13:40:49 +03:00
0026042: OCCT won't work with the latest Xcode
Dereferenced null pointers was eliminated for PLib, BSplCLib and BSplSLib. All affected code was changed accordingly.
This commit is contained in:
@@ -173,8 +173,8 @@ void Convert_CompBezierCurves2dToBSplineCurve2d::Perform()
|
||||
Inc = myDegree - Deg;
|
||||
if ( Inc > 0) {
|
||||
BSplCLib::IncreaseDegree(myDegree,
|
||||
mySequence(i)->Array1(), PLib::NoWeights(),
|
||||
Points, PLib::NoWeights());
|
||||
mySequence(i)->Array1(), BSplCLib::NoWeights(),
|
||||
Points, BSplCLib::NoWeights());
|
||||
}
|
||||
else {
|
||||
Points = mySequence(i)->Array1();
|
||||
|
@@ -169,8 +169,8 @@ void Convert_CompBezierCurvesToBSplineCurve::Perform()
|
||||
Inc = myDegree - Deg;
|
||||
if ( Inc > 0) {
|
||||
BSplCLib::IncreaseDegree(myDegree,
|
||||
mySequence(i)->Array1(), PLib::NoWeights(),
|
||||
Points, PLib::NoWeights());
|
||||
mySequence(i)->Array1(), BSplCLib::NoWeights(),
|
||||
Points, BSplCLib::NoWeights());
|
||||
}
|
||||
else {
|
||||
Points = mySequence(i)->Array1();
|
||||
|
@@ -176,7 +176,7 @@ void CosAndSinRationalC1(Standard_Real Parameter,
|
||||
const Standard_Integer EvalDegree,
|
||||
const TColgp_Array1OfPnt2d& EvalPoles,
|
||||
const TColStd_Array1OfReal& EvalKnots,
|
||||
const TColStd_Array1OfInteger& EvalMults,
|
||||
const TColStd_Array1OfInteger* EvalMults,
|
||||
Standard_Real Result[2])
|
||||
{
|
||||
gp_Pnt2d a_point ;
|
||||
@@ -216,7 +216,7 @@ void CosAndSinQuasiAngular(Standard_Real Parameter,
|
||||
// const TColStd_Array1OfReal& EvalKnots,
|
||||
const TColStd_Array1OfReal& ,
|
||||
// const TColStd_Array1OfInteger& EvalMults,
|
||||
const TColStd_Array1OfInteger& ,
|
||||
const TColStd_Array1OfInteger* ,
|
||||
Standard_Real Result[2])
|
||||
{
|
||||
Standard_Real
|
||||
@@ -249,7 +249,7 @@ void AlgorithmicCosAndSin(Standard_Integer Degree,
|
||||
const Standard_Integer EvalDegree,
|
||||
const TColgp_Array1OfPnt2d& EvalPoles,
|
||||
const TColStd_Array1OfReal& EvalKnots,
|
||||
const TColStd_Array1OfInteger& EvalMults,
|
||||
const TColStd_Array1OfInteger* EvalMults,
|
||||
Convert_CosAndSinEvalFunction Evaluator,
|
||||
TColStd_Array1OfReal& CosNumerator,
|
||||
TColStd_Array1OfReal& SinNumerator,
|
||||
@@ -571,7 +571,7 @@ void Convert_ConicToBSplineCurve::BuildCosAndSin(
|
||||
temp_degree,
|
||||
temp_poles,
|
||||
temp_knots,
|
||||
temp_mults,
|
||||
&temp_mults,
|
||||
*EvaluatorPtr,
|
||||
CosNumeratorPtr->ChangeArray1(),
|
||||
SinNumeratorPtr->ChangeArray1(),
|
||||
@@ -744,9 +744,9 @@ void Convert_ConicToBSplineCurve::BuildCosAndSin(
|
||||
temp_degree,
|
||||
Standard_False,
|
||||
temp_cos_ptr->Array1(),
|
||||
temp_denominator_ptr->Array1(),
|
||||
&temp_denominator_ptr->Array1(),
|
||||
temp_knots_ptr->Array1(),
|
||||
temp_mults_ptr->Array1(),
|
||||
&temp_mults_ptr->Array1(),
|
||||
value1) ;
|
||||
|
||||
BSplCLib::D0(param,
|
||||
@@ -754,9 +754,9 @@ void Convert_ConicToBSplineCurve::BuildCosAndSin(
|
||||
temp_degree,
|
||||
Standard_False,
|
||||
temp_sin_ptr->Array1(),
|
||||
temp_denominator_ptr->Array1(),
|
||||
&temp_denominator_ptr->Array1(),
|
||||
temp_knots_ptr->Array1(),
|
||||
temp_mults_ptr->Array1(),
|
||||
&temp_mults_ptr->Array1(),
|
||||
value2) ;
|
||||
BSplCLib::D0(param,
|
||||
0,
|
||||
@@ -765,7 +765,7 @@ void Convert_ConicToBSplineCurve::BuildCosAndSin(
|
||||
temp_denominator_ptr->Array1(),
|
||||
BSplCLib::NoWeights(),
|
||||
temp_knots_ptr->Array1(),
|
||||
temp_mults_ptr->Array1(),
|
||||
&temp_mults_ptr->Array1(),
|
||||
value3) ;
|
||||
contact_order_array(ii) = 0 ;
|
||||
|
||||
|
@@ -25,7 +25,7 @@ typedef void Convert_CosAndSinEvalFunction(Standard_Real,
|
||||
const Standard_Integer,
|
||||
const TColgp_Array1OfPnt2d&,
|
||||
const TColStd_Array1OfReal&,
|
||||
const TColStd_Array1OfInteger&,
|
||||
const TColStd_Array1OfInteger*,
|
||||
Standard_Real Result[2]) ;
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user