Skip to content

Commit 2959363

Browse files
committed
licence updated
1 parent 2ad612f commit 2959363

File tree

2 files changed

+10
-86
lines changed

2 files changed

+10
-86
lines changed

modules/core/include/opencv2/core/softfloat.hpp

Lines changed: 5 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,8 @@
1-
/*M///////////////////////////////////////////////////////////////////////////////////////
2-
//
3-
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
4-
//
5-
// By downloading, copying, installing or using the software you agree to this license.
6-
// If you do not agree to this license, do not download, install,
7-
// copy or use the software.
8-
//
9-
//
10-
// License Agreement
11-
// For Open Source Computer Vision Library
12-
//
13-
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
14-
// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
15-
// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
16-
// Copyright (C) 2015, Itseez Inc., all rights reserved.
17-
// Third party copyrights are property of their respective owners.
18-
//
19-
// Redistribution and use in source and binary forms, with or without modification,
20-
// are permitted provided that the following conditions are met:
21-
//
22-
// * Redistribution's of source code must retain the above copyright notice,
23-
// this list of conditions and the following disclaimer.
24-
//
25-
// * Redistribution's in binary form must reproduce the above copyright notice,
26-
// this list of conditions and the following disclaimer in the documentation
27-
// and/or other materials provided with the distribution.
28-
//
29-
// * The name of the copyright holders may not be used to endorse or promote products
30-
// derived from this software without specific prior written permission.
31-
//
32-
// This software is provided by the copyright holders and contributors "as is" and
33-
// any express or implied warranties, including, but not limited to, the implied
34-
// warranties of merchantability and fitness for a particular purpose are disclaimed.
35-
// In no event shall the Intel Corporation or contributors be liable for any direct,
36-
// indirect, incidental, special, exemplary, or consequential damages
37-
// (including, but not limited to, procurement of substitute goods or services;
38-
// loss of use, data, or profits; or business interruption) however caused
39-
// and on any theory of liability, whether in contract, strict liability,
40-
// or tort (including negligence or otherwise) arising in any way out of
41-
// the use of this software, even if advised of the possibility of such damage.
42-
//
43-
//M*/
1+
// This file is part of OpenCV project.
2+
// It is subject to the license terms in the LICENSE file found in the top-level directory
3+
// of this distribution and at http://opencv.org/license.html
4+
5+
// This file is based on files from package issued with the following license:
446

457
/*============================================================================
468

modules/core/src/softfloat.cpp

Lines changed: 5 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,8 @@
1-
/*M///////////////////////////////////////////////////////////////////////////////////////
2-
//
3-
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
4-
//
5-
// By downloading, copying, installing or using the software you agree to this license.
6-
// If you do not agree to this license, do not download, install,
7-
// copy or use the software.
8-
//
9-
//
10-
// License Agreement
11-
// For Open Source Computer Vision Library
12-
//
13-
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
14-
// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
15-
// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
16-
// Copyright (C) 2015, Itseez Inc., all rights reserved.
17-
// Third party copyrights are property of their respective owners.
18-
//
19-
// Redistribution and use in source and binary forms, with or without modification,
20-
// are permitted provided that the following conditions are met:
21-
//
22-
// * Redistribution's of source code must retain the above copyright notice,
23-
// this list of conditions and the following disclaimer.
24-
//
25-
// * Redistribution's in binary form must reproduce the above copyright notice,
26-
// this list of conditions and the following disclaimer in the documentation
27-
// and/or other materials provided with the distribution.
28-
//
29-
// * The name of the copyright holders may not be used to endorse or promote products
30-
// derived from this software without specific prior written permission.
31-
//
32-
// This software is provided by the copyright holders and contributors "as is" and
33-
// any express or implied warranties, including, but not limited to, the implied
34-
// warranties of merchantability and fitness for a particular purpose are disclaimed.
35-
// In no event shall the Intel Corporation or contributors be liable for any direct,
36-
// indirect, incidental, special, exemplary, or consequential damages
37-
// (including, but not limited to, procurement of substitute goods or services;
38-
// loss of use, data, or profits; or business interruption) however caused
39-
// and on any theory of liability, whether in contract, strict liability,
40-
// or tort (including negligence or otherwise) arising in any way out of
41-
// the use of this software, even if advised of the possibility of such damage.
42-
//
43-
//M*/
1+
// This file is part of OpenCV project.
2+
// It is subject to the license terms in the LICENSE file found in the top-level directory
3+
// of this distribution and at http://opencv.org/license.html
4+
5+
// This file is based on files from package issued with the following license:
446

457
/*============================================================================
468

0 commit comments

Comments
 (0)