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

[occt.git] / src / BRepIntCurveSurface / BRepIntCurveSurface_Inter.cxx

diff --git a/src/BRepIntCurveSurface/BRepIntCurveSurface_Inter.cxx b/src/BRepIntCurveSurface/BRepIntCurveSurface_Inter.cxx
index e11dda2..0bf8e39 100644 (file)
--- a/src/BRepIntCurveSurface/BRepIntCurveSurface_Inter.cxx
+++ b/src/BRepIntCurveSurface/BRepIntCurveSurface_Inter.cxx
@@ -14,20 +14,25 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <BRepIntCurveSurface_Inter.ixx>
+
+#include <Bnd_Box.hxx>
+#include <BndLib_Add3dCurve.hxx>
+#include <BRepAdaptor_HSurface.hxx>
+#include <BRepAdaptor_Surface.hxx>
+#include <BRepBndLib.hxx>
+#include <BRepIntCurveSurface_Inter.hxx>
+#include <BRepTopAdaptor_TopolTool.hxx>
 #include <Geom_Line.hxx>
+#include <GeomAdaptor_Curve.hxx>
+#include <GeomAdaptor_HCurve.hxx>
+#include <gp_Lin.hxx>
+#include <gp_Pnt.hxx>
+#include <IntCurveSurface_IntersectionPoint.hxx>
+#include <StdFail_NotDone.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Face.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepAdaptor_HSurface.hxx>
-#include <GeomAdaptor_HCurve.hxx>
-#include <BRepTopAdaptor_TopolTool.hxx>
-#include <BRepAdaptor_HSurface.hxx>
-#include <BRepBndLib.hxx>
-#include <Bnd_Box.hxx>
-#include <BndLib_Add3dCurve.hxx>
-
+#include <TopoDS_Shape.hxx>
 
 //===========================================================================
 //function :BRepIntCurveSurface_Inter::BRepIntCurveSurface_Inte
@@ -173,7 +178,8 @@ void BRepIntCurveSurface_Inter::Find()
     if( !myCurrentnbpoints)
       continue;
 
-    myFastClass->Initialize(aSurfForFastClass);
+    const Handle(Adaptor3d_HSurface)& aSurf = aSurfForFastClass; // to avoid ambiguity
+    myFastClass->Initialize(aSurf);
     myIndFace = i;
     if(FindPoint())
       return; 
@@ -222,7 +228,7 @@ Standard_Boolean BRepIntCurveSurface_Inter::FindPoint()
 IntCurveSurface_IntersectionPoint BRepIntCurveSurface_Inter::Point() const 
 {
   if(myCurrentindex==0) 
-    StdFail_NotDone::Raise();
+    throw StdFail_NotDone();
   const IntCurveSurface_IntersectionPoint& ICPS = myIntcs.Point(myCurrentindex);
   return(IntCurveSurface_IntersectionPoint(ICPS.Pnt(),
                                           myCurrentU,     // ICPS.U(),
@@ -239,7 +245,7 @@ IntCurveSurface_IntersectionPoint BRepIntCurveSurface_Inter::Point() const
 Standard_Real BRepIntCurveSurface_Inter::U() const 
 {
   if(myCurrentindex==0) 
-    StdFail_NotDone::Raise();
+    throw StdFail_NotDone();
   //-- return(myIntcs.Point(myCurrentindex).U());
   return(myCurrentU);
 }
@@ -251,7 +257,7 @@ Standard_Real BRepIntCurveSurface_Inter::U() const
 Standard_Real BRepIntCurveSurface_Inter::V() const 
 {
   if(myCurrentindex==0) 
-    StdFail_NotDone::Raise();
+    throw StdFail_NotDone();
   //-- return(myIntcs.Point(myCurrentindex).V());
   return(myCurrentV);
 }
@@ -263,7 +269,7 @@ Standard_Real BRepIntCurveSurface_Inter::V() const
 Standard_Real BRepIntCurveSurface_Inter::W() const 
 {
   if(myCurrentindex==0) 
-    StdFail_NotDone::Raise();
+    throw StdFail_NotDone();
   return(myIntcs.Point(myCurrentindex).W());
 }
 
@@ -274,7 +280,7 @@ Standard_Real BRepIntCurveSurface_Inter::W() const
 TopAbs_State BRepIntCurveSurface_Inter::State() const 
 {
   if(myCurrentindex==0) 
-    StdFail_NotDone::Raise();
+    throw StdFail_NotDone();
   //-- return(classifier.State());
   return(myCurrentstate);
 }
@@ -286,7 +292,7 @@ TopAbs_State BRepIntCurveSurface_Inter::State() const
 IntCurveSurface_TransitionOnCurve BRepIntCurveSurface_Inter::Transition() const 
 {
   if(myCurrentindex==0) 
-    StdFail_NotDone::Raise();
+    throw StdFail_NotDone();
   return(myIntcs.Point(myCurrentindex).Transition());
 }
 
@@ -305,7 +311,7 @@ const TopoDS_Face& BRepIntCurveSurface_Inter::Face() const
 //===========================================================================
 const gp_Pnt& BRepIntCurveSurface_Inter::Pnt() const { 
   if(myCurrentindex==0) 
-    StdFail_NotDone::Raise();
+    throw StdFail_NotDone();
   return(myIntcs.Point(myCurrentindex).Pnt());
 }