Merge pull request #2000 from apavlenko:license_copyright

diff --combined modules/ocl/include/opencv2/ocl.hpp
index ea1c214,508014d..542dbeb
--- 1/modules/ocl/include/opencv2/ocl.hpp
--- 2/modules/ocl/include/opencv2/ocl.hpp
+++ b/modules/ocl/include/opencv2/ocl.hpp
@@@ -1,45 -1,11 +1,11 @@@
- /*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
- //
+ // 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.
+ 
  // Copyright (C) 2010-2012, Institute Of Software Chinese Academy Of Science, all rights reserved.
  // Copyright (C) 2010-2012, Advanced Micro Devices, Inc., all rights reserved.
  // Copyright (C) 2010-2012, Multicoreware, 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_OCL_HPP__
  #define __OPENCV_OCL_HPP__
@@@ -118,7 -84,6 +84,7 @@@ namespace c
              const PlatformInfo* platform;
  
              DeviceInfo();
 +            ~DeviceInfo();
          };
  
          struct PlatformInfo
@@@ -137,7 -102,6 +103,7 @@@
              std::vector<const DeviceInfo*> devices;
  
              PlatformInfo();
 +            ~PlatformInfo();
          };
  
          //////////////////////////////// Initialization & Info ////////////////////////
@@@ -153,10 -117,6 +119,10 @@@
          // set device you want to use
          CV_EXPORTS void setDevice(const DeviceInfo* info);
  
 +        // Initialize from OpenCL handles directly.
 +        // Argument types is (pointers): cl_platform_id*, cl_context*, cl_device_id*
 +        CV_EXPORTS void initializeContext(void* pClPlatform, void* pClContext, void* pClDevice);
 +
          enum FEATURE_TYPE
          {
              FEATURE_CL_DOUBLE = 1,