From df10411e05a9f4e6fe3085cd9cb84b4bce32ba24 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 21 Apr 2020 06:19:16 +0000 Subject: [PATCH] features2d(sift): patent expiration note --- modules/features2d/src/sift.cpp | 45 +++++---------------------------- 1 file changed, 6 insertions(+), 39 deletions(-) diff --git a/modules/features2d/src/sift.cpp b/modules/features2d/src/sift.cpp index 2112971e94..a627502404 100644 --- a/modules/features2d/src/sift.cpp +++ b/modules/features2d/src/sift.cpp @@ -1,48 +1,15 @@ -/*M/////////////////////////////////////////////////////////////////////////////////////// +// This file is part of OpenCV project. +// It is subject to the license terms in the LICENSE file found in the top-level directory +// of this distribution and at http://opencv.org/license.html. // -// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. -// -// By downloading, copying, installing or using the software you agree to this license. -// If you do not agree to this license, do not download, install, -// copy or use the software. -// -// -// License Agreement -// For Open Source Computer Vision Library -// -// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. +// Copyright (c) 2006-2010, Rob Hess // Copyright (C) 2009, Willow Garage Inc., all rights reserved. -// Third party copyrights are property of their respective owners. -// -// Redistribution and use in source and binary forms, with or without modification, -// are permitted provided that the following conditions are met: -// -// * Redistribution's of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// * Redistribution's in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// -// * The name of the copyright holders may not be used to endorse or promote products -// derived from this software without specific prior written permission. -// -// This software is provided by the copyright holders and contributors "as is" and -// any express or implied warranties, including, but not limited to, the implied -// warranties of merchantability and fitness for a particular purpose are disclaimed. -// In no event shall the Intel Corporation or contributors be liable for any direct, -// indirect, incidental, special, exemplary, or consequential damages -// (including, but not limited to, procurement of substitute goods or services; -// loss of use, data, or profits; or business interruption) however caused -// and on any theory of liability, whether in contract, strict liability, -// or tort (including negligence or otherwise) arising in any way out of -// the use of this software, even if advised of the possibility of such damage. -// -//M*/ +// Copyright (C) 2020, Intel Corporation, all rights reserved. /**********************************************************************************************\ Implementation of SIFT is based on the code from http://blogs.oregonstate.edu/hess/code/sift/ Below is the original copyright. + Patent US6711293 expired in March 2020. // Copyright (c) 2006-2010, Rob Hess // All rights reserved.