From 87018b452ab1d78ff5d48c0c4eae9c5e42532e95 Mon Sep 17 00:00:00 2001 From: kgv Date: Wed, 28 Aug 2019 10:09:56 +0300 Subject: [PATCH] 0030924: Coding - incorrect header in file OSD_ThreadPool.hxx Fixed license statements within files BRepGProp_MeshProps.cxx, BRepGProp_MeshProps.hxx, OSD_ThreadPool.cxx and OSD_ThreadPool.hxx. Removed non-ASCII char from BRepMesh_ModelHealer.hxx. --- src/BRepGProp/BRepGProp_MeshProps.cxx | 31 ++++++++++++----------- src/BRepGProp/BRepGProp_MeshProps.hxx | 36 ++++++++++++--------------- src/BRepMesh/BRepMesh_ModelHealer.hxx | 10 ++++---- src/OSD/OSD_ThreadPool.cxx | 19 +++++++------- src/OSD/OSD_ThreadPool.hxx | 19 +++++++------- 5 files changed, 55 insertions(+), 60 deletions(-) diff --git a/src/BRepGProp/BRepGProp_MeshProps.cxx b/src/BRepGProp/BRepGProp_MeshProps.cxx index 9611dce602..0fc8af88fe 100644 --- a/src/BRepGProp/BRepGProp_MeshProps.cxx +++ b/src/BRepGProp/BRepGProp_MeshProps.cxx @@ -1,25 +1,26 @@ // Copyright (c) 2018 OPEN CASCADE SAS -// This file is part of commercial software by OPEN CASCADE SAS, -// furnished in accordance with the terms and conditions of the contract -// and with the inclusion of this copyright notice. -// This file or any part thereof may not be provided or otherwise -// made available to any third party. -// -// No ownership title to the software is transferred hereby. -// -// OPEN CASCADE SAS makes no representation or warranties with respect to the -// performance of this software, and specifically disclaims any responsibility -// for any damages, special or consequential, connected with its use. +// +// This file is part of Open CASCADE Technology software library. +// +// 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. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. #include + +#include +#include +#include #include +#include #include #include -#include -#include -#include #include -#include //======================================================================= //function : CalculateElSProps diff --git a/src/BRepGProp/BRepGProp_MeshProps.hxx b/src/BRepGProp/BRepGProp_MeshProps.hxx index 77bc69d133..379d6ef41d 100644 --- a/src/BRepGProp/BRepGProp_MeshProps.hxx +++ b/src/BRepGProp/BRepGProp_MeshProps.hxx @@ -1,23 +1,19 @@ // Copyright (c) 2018 OPEN CASCADE SAS -// This file is part of commercial software by OPEN CASCADE SAS, -// furnished in accordance with the terms and conditions of the contract -// and with the inclusion of this copyright notice. -// This file or any part thereof may not be provided or otherwise -// made available to any third party. -// -// No ownership title to the software is transferred hereby. -// -// OPEN CASCADE SAS makes no representation or warranties with respect to the -// performance of this software, and specifically disclaims any responsibility -// for any damages, special or consequential, connected with its use. +// +// This file is part of Open CASCADE Technology software library. +// +// 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. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. #ifndef _BRepGProp_MeshProps_HeaderFile #define _BRepGProp_MeshProps_HeaderFile -#include -#include -#include -#include #include #include #include @@ -36,11 +32,11 @@ public: DEFINE_STANDARD_ALLOC - //! Describes types of geometric objects. - //! - Vinert is 3D closed region of space delimited with - //! Point and surface mesh; - //! - Sinert is surface mesh in 3D space. - typedef enum { Vinert = 0, Sinert } BRepGProp_MeshObjType; + //! Describes types of geometric objects. + //! - Vinert is 3D closed region of space delimited with + //! Point and surface mesh; + //! - Sinert is surface mesh in 3D space. + typedef enum { Vinert = 0, Sinert } BRepGProp_MeshObjType; //! Constructor takes the type of object. BRepGProp_MeshProps(const BRepGProp_MeshObjType theType) : diff --git a/src/BRepMesh/BRepMesh_ModelHealer.hxx b/src/BRepMesh/BRepMesh_ModelHealer.hxx index 14d804e9d7..2e95c02da4 100644 --- a/src/BRepMesh/BRepMesh_ModelHealer.hxx +++ b/src/BRepMesh/BRepMesh_ModelHealer.hxx @@ -25,14 +25,14 @@ //! Class implements functionality of model healer tool. //! Iterates over model's faces and checks consistency of their wires, //! i.e.whether wires are closed and do not contain self - intersections. -//! In case if wire contains disconnected parts, ends of adjacent edges -//! forming the gaps are connected in parametric space forcibly. The notion -//! of this operation is to create correct discrete model defined relatively +//! In case if wire contains disconnected parts, ends of adjacent edges +//! forming the gaps are connected in parametric space forcibly. The notion +//! of this operation is to create correct discrete model defined relatively //! parametric space of target face taking into account connectivity and //! tolerances of 3D space only. This means that there are no specific //! computations are made for the sake of determination of U and V tolerance. -//! Registers intersections on edges forming the face’s shape and tries to -//! amplify discrete represenation by decreasing of deflection for the target edge. +//! Registers intersections on edges forming the face's shape and tries to +//! amplify discrete represenation by decreasing of deflection for the target edge. //! Checks can be performed in parallel mode. class BRepMesh_ModelHealer : public IMeshTools_ModelAlgo { diff --git a/src/OSD/OSD_ThreadPool.cxx b/src/OSD/OSD_ThreadPool.cxx index 17c5370cf1..22c687703e 100644 --- a/src/OSD/OSD_ThreadPool.cxx +++ b/src/OSD/OSD_ThreadPool.cxx @@ -1,17 +1,16 @@ // Created by: Kirill Gavrilov -// Copyright (c) 2017 OPEN CASCADE SAS +// Copyright (c) 2017-2019 OPEN CASCADE SAS // -// This file is part of commercial software by OPEN CASCADE SAS. +// This file is part of Open CASCADE Technology software library. // -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of this copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any third party. -// No ownership title to the software is transferred hereby. +// 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. // -// OPEN CASCADE SAS makes no representation or warranties with respect to the -// performance of this software, and specifically disclaims any responsibility -// for any damages, special or consequential, connected with its use. +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. #include diff --git a/src/OSD/OSD_ThreadPool.hxx b/src/OSD/OSD_ThreadPool.hxx index 50b8f006ab..0cef1510dc 100644 --- a/src/OSD/OSD_ThreadPool.hxx +++ b/src/OSD/OSD_ThreadPool.hxx @@ -1,17 +1,16 @@ // Created by: Kirill Gavrilov -// Copyright (c) 2017 OPEN CASCADE SAS +// Copyright (c) 2017-2019 OPEN CASCADE SAS // -// This file is part of commercial software by OPEN CASCADE SAS. +// This file is part of Open CASCADE Technology software library. // -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of this copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any third party. -// No ownership title to the software is transferred hereby. +// 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. // -// OPEN CASCADE SAS makes no representation or warranties with respect to the -// performance of this software, and specifically disclaims any responsibility -// for any damages, special or consequential, connected with its use. +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. #ifndef _OSD_ThreadPool_HeaderFile #define _OSD_ThreadPool_HeaderFile