[opencv] 12/19: Added missing copyright headers.

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to annotated tag 2.4.12.3
in repository opencv.

commit 8a37fc82238a8ade347ea1af483227db28737f0d
Author: Alexander Smorkalov <alexander.smorkalov at itseez.com>
Date:   Tue Oct 13 15:02:38 2015 +0300

    Added missing copyright headers.
    
    (cherry picked from commit 408107ce6d16ae118167ffe22fda6bdcdb9514cb)
---
 include/opencv/cxmisc.h                     | 42 +++++++++++++++++++++++++++++
 modules/flann/include/opencv2/flann/dummy.h | 29 ++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/include/opencv/cxmisc.h b/include/opencv/cxmisc.h
index 6446944..3a76656 100644
--- a/include/opencv/cxmisc.h
+++ b/include/opencv/cxmisc.h
@@ -1,3 +1,45 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+ * //
+ * //  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) 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*/
+
 #ifndef __OPENCV_OLD_CXMISC_H__
 #define __OPENCV_OLD_CXMISC_H__
 
diff --git a/modules/flann/include/opencv2/flann/dummy.h b/modules/flann/include/opencv2/flann/dummy.h
index 26bd3fa..3390981 100644
--- a/modules/flann/include/opencv2/flann/dummy.h
+++ b/modules/flann/include/opencv2/flann/dummy.h
@@ -1,3 +1,32 @@
+/***********************************************************************
+ * Software License Agreement (BSD License)
+ *
+ * Copyright 2008-2009  Marius Muja (mariusm at cs.ubc.ca). All rights reserved.
+ * Copyright 2008-2009  David G. Lowe (lowe at cs.ubc.ca). All rights reserved.
+ *
+ * THE BSD LICENSE
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ *************************************************************************/
 
 #ifndef OPENCV_FLANN_DUMMY_H_
 #define OPENCV_FLANN_DUMMY_H_

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git