0031668: Visualization - WebGL sample doesn't work on Emscripten 1.39

[occt.git] / src / CPnts / CPnts_AbscissaPoint.cxx

diff --git a/src/CPnts/CPnts_AbscissaPoint.cxx b/src/CPnts/CPnts_AbscissaPoint.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 764d554..b40750e
--- a/src/CPnts/CPnts_AbscissaPoint.cxx
+++ b/src/CPnts/CPnts_AbscissaPoint.cxx
@@ -1,20 +1,16 @@
 // Copyright (c) 1995-1999 Matra Datavision
-// Copyright (c) 1999-2012 OPEN CASCADE SAS
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
 //
-// The content of this file is subject to the Open CASCADE Technology Public
-// License Version 6.5 (the "License"). You may not use the content of this file
-// except in compliance with the License. Please obtain a copy of the License
-// at http://www.opencascade.org and read it completely before using this file.
+// This file is part of Open CASCADE Technology software library.
 //
-// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
-// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
 //
-// The Original Code and all software distributed under the License is
-// distributed on an "AS IS" basis, without warranty of any kind, and the
-// Initial Developer hereby disclaims all such warranties, including without
-// limitation, any warranties of merchantability, fitness for a particular
-// purpose or non-infringement. Please see the License for the specific terms
-// and conditions governing the rights and limitations under the License.
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
 
 //------------------------------------------------------------------------
 //  Calculate a point with given abscissa starting from a given point 
@@ -27,32 +23,35 @@
 //  by succsessive iteration find the point and its associated parameter
 //  call to FunctionRoot
 
-#include <CPnts_AbscissaPoint.ixx>
-
-#include <math_GaussSingleIntegration.hxx>
-#include <math_FunctionRoot.hxx>
-#include <StdFail_NotDone.hxx>
-#include <Standard_ConstructionError.hxx>
-
-#include <gp_Vec.hxx>
-#include <gp_Vec2d.hxx>
-#include <Geom_BezierCurve.hxx>
-#include <Geom_BSplineCurve.hxx>
+#include <Adaptor2d_Curve2d.hxx>
+#include <Adaptor3d_Curve.hxx>
+#include <CPnts_AbscissaPoint.hxx>
 #include <Geom2d_BezierCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BSplineCurve.hxx>
+#include <gp_Vec.hxx>
+#include <gp_Vec2d.hxx>
+#include <math_FunctionRoot.hxx>
+#include <math_GaussSingleIntegration.hxx>
 #include <Precision.hxx>
+#include <Standard_ConstructionError.hxx>
+#include <StdFail_NotDone.hxx>
 
 // auxiliary functions to compute the length of the derivative
-
 static Standard_Real f3d(const Standard_Real X, const Standard_Address C)
 {
-  gp_Vec V = ((Adaptor3d_Curve*)C)->DN(X,1);
+  gp_Pnt P;
+  gp_Vec V;
+  ((Adaptor3d_Curve*)C)->D1(X,P,V);
   return V.Magnitude();
 }
 
 static Standard_Real f2d(const Standard_Real X, const Standard_Address C)
 {
-  gp_Vec2d V = ((Adaptor2d_Curve2d*)C)->DN(X,1);
+  gp_Pnt2d P;
+  gp_Vec2d V;
+  ((Adaptor2d_Curve2d*)C)->D1(X,P,V);
   return V.Magnitude();
 }
 
@@ -67,10 +66,10 @@ static Standard_Integer order(const Adaptor3d_Curve& C)
     return 5;
 
   case GeomAbs_BezierCurve :
-    return Min(24, 2*C.Bezier()->Degree());
+    return Min(24, 2*C.Degree());
 
   case GeomAbs_BSplineCurve :
-    return Min(24, 2*C.BSpline()->NbPoles()-1);
+    return Min(24, 2*C.NbPoles()-1);
     
     default :
       return 10;
@@ -160,7 +159,7 @@ Standard_Real CPnts_AbscissaPoint::Length(const Adaptor3d_Curve& C,
 //  FG.Init(f3d,(Standard_Address)&C);
   math_GaussSingleIntegration TheLength(FG, U1, U2, order(C));
   if (!TheLength.IsDone()) {
-    Standard_ConstructionError::Raise();
+    throw Standard_ConstructionError();
   }
   return Abs(TheLength.Value());
 }
@@ -181,7 +180,7 @@ Standard_Real CPnts_AbscissaPoint::Length(const Adaptor2d_Curve2d& C,
 //  FG.Init(f2d,(Standard_Address)&C);
   math_GaussSingleIntegration TheLength(FG, U1, U2, order(C));
   if (!TheLength.IsDone()) {
-    Standard_ConstructionError::Raise();
+    throw Standard_ConstructionError();
   }
   return Abs(TheLength.Value());
 }
@@ -203,7 +202,7 @@ Standard_Real CPnts_AbscissaPoint::Length(const Adaptor3d_Curve& C,
 //  FG.Init(f3d,(Standard_Address)&C);
   math_GaussSingleIntegration TheLength(FG, U1, U2, order(C), Tol);
   if (!TheLength.IsDone()) {
-    Standard_ConstructionError::Raise();
+    throw Standard_ConstructionError();
   }
   return Abs(TheLength.Value());
 }
@@ -225,7 +224,7 @@ Standard_Real CPnts_AbscissaPoint::Length(const Adaptor2d_Curve2d& C,
 //  FG.Init(f2d,(Standard_Address)&C);
   math_GaussSingleIntegration TheLength(FG, U1, U2, order(C), Tol);
   if (!TheLength.IsDone()) {
-    Standard_ConstructionError::Raise();
+    throw Standard_ConstructionError();
   }
   return Abs(TheLength.Value());
 }