X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=blobdiff_plain;f=src%2FShapeBuild%2FShapeBuild_Vertex.cxx;h=f6107851ee3d8b4b08b866cfa3c33aa4079d235b;hp=3fb2ae03e573c90752469c6bd425fdb7b8b61bdd;hb=4c7a3faef5f292475c23ee615ad49d57fc039b58;hpb=b311480ed597aed47b7bfbf01ddcebb41202bd53 diff --git a/src/ShapeBuild/ShapeBuild_Vertex.cxx b/src/ShapeBuild/ShapeBuild_Vertex.cxx old mode 100755 new mode 100644 index 3fb2ae03e5..f6107851ee --- a/src/ShapeBuild/ShapeBuild_Vertex.cxx +++ b/src/ShapeBuild/ShapeBuild_Vertex.cxx @@ -1,32 +1,30 @@ -// 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. // rln 22.03.99: syntax correction in CombineVertex //szv#4 S4163 -#include + +#include #include +#include #include -#include +#include +#include //======================================================================= //function : CombineVertex //purpose : //======================================================================= - TopoDS_Vertex ShapeBuild_Vertex::CombineVertex (const TopoDS_Vertex& V1, const TopoDS_Vertex& V2, const Standard_Real tolFactor) const