0028599: Replacement of old Boolean operations with new ones in BRepProj_Projection...

[occt.git] / src / GeomAPI / GeomAPI_ExtremaCurveSurface.cxx

diff --git a/src/GeomAPI/GeomAPI_ExtremaCurveSurface.cxx b/src/GeomAPI/GeomAPI_ExtremaCurveSurface.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 1a1fd0a..742c8e3
--- a/src/GeomAPI/GeomAPI_ExtremaCurveSurface.cxx
+++ b/src/GeomAPI/GeomAPI_ExtremaCurveSurface.cxx
@@ -1,39 +1,37 @@
 // Created on: 1994-03-18
 // Created by: Bruno DUMORTIER
 // Copyright (c) 1994-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.
 
 
-#include <GeomAPI_ExtremaCurveSurface.ixx>
-
-#include <GeomAdaptor_Curve.hxx>
-#include <GeomAdaptor_Surface.hxx>
+#include <Extrema_ExtCS.hxx>
 #include <Extrema_POnCurv.hxx>
 #include <Extrema_POnSurf.hxx>
-
+#include <Geom_Curve.hxx>
+#include <Geom_Surface.hxx>
+#include <GeomAdaptor_Curve.hxx>
+#include <GeomAdaptor_Surface.hxx>
+#include <GeomAPI_ExtremaCurveSurface.hxx>
+#include <gp_Pnt.hxx>
 #include <Precision.hxx>
-
+#include <Standard_OutOfRange.hxx>
+#include <StdFail_NotDone.hxx>
 
 //=======================================================================
 //function : GeomAPI_ExtremaCurveSurface
 //purpose  : 
 //=======================================================================
-
 GeomAPI_ExtremaCurveSurface::GeomAPI_ExtremaCurveSurface()
 {
   myIsDone = Standard_False;
@@ -88,7 +86,7 @@ void GeomAPI_ExtremaCurveSurface::Init
   Extrema_ExtCS theExtCS(TheCurve,TheSurface,Tol,Tol);
   myExtCS = theExtCS;
 
-  myIsDone = myExtCS.IsDone() && ( myExtCS.NbExt() > 0);
+  myIsDone = myExtCS.IsDone() && (myExtCS.IsParallel() || myExtCS.NbExt() > 0);
 
   if ( myIsDone) {
 
@@ -131,7 +129,7 @@ void GeomAPI_ExtremaCurveSurface::Init
                              Wmin,Wmax,Umin,Umax,Vmin,Vmax,Tol,Tol);
   myExtCS = theExtCS;
 
-  myIsDone = myExtCS.IsDone() && ( myExtCS.NbExt() > 0);
+  myIsDone = myExtCS.IsDone() && (myExtCS.IsParallel() || myExtCS.NbExt() > 0);
 
   if ( myIsDone) {