patch.patch
| modules/calib3d/include/opencv2/calib3d/calib3d.hpp (working copy) | ||
|---|---|---|
| 760 | 760 | |
| 761 | 761 |
#endif |
| 762 | 762 | |
| 763 |
// Auto linking by "#pragma comment(lib)" syntax |
|
| 764 |
#include "opencv2/core/pragma_lib.hpp" |
|
| 765 |
#if PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 766 |
#pragma OPENCV_COMMENT_LIB_FNAME("calib3d")
|
|
| 767 |
#endif // PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 768 | ||
| 763 | 769 |
#endif |
| modules/contrib/include/opencv2/contrib/contrib.hpp (working copy) | ||
|---|---|---|
| 629 | 629 | |
| 630 | 630 |
#endif |
| 631 | 631 | |
| 632 |
#endif |
|
| 632 |
// Auto linking by "#pragma comment(lib)" syntax |
|
| 633 |
#include "opencv2/core/pragma_lib.hpp" |
|
| 634 |
#if PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 635 |
#pragma OPENCV_COMMENT_LIB_FNAME("contrib")
|
|
| 636 |
#endif // PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 633 | 637 | |
| 638 |
#endif |
|
| modules/core/include/opencv2/core/core.hpp (working copy) | ||
|---|---|---|
| 4381 | 4381 |
#include "opencv2/core/operations.hpp" |
| 4382 | 4382 |
#include "opencv2/core/mat.hpp" |
| 4383 | 4383 | |
| 4384 |
// Auto linking by "#pragma comment(lib)" syntax |
|
| 4385 |
#include "opencv2/core/pragma_lib.hpp" |
|
| 4386 |
#if PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 4387 |
#pragma OPENCV_COMMENT_LIB_FNAME("core")
|
|
| 4388 |
#endif |
|
| 4389 | ||
| 4384 | 4390 |
#endif /*__OPENCV_CORE_HPP__*/ |
| modules/core/include/opencv2/core/pragma_lib.hpp (working copy) | ||
|---|---|---|
| 1 |
/*! \file pragma_include.hpp |
|
| 2 |
\brief #pragmas for auto library linking |
|
| 3 |
*/ |
|
| 4 |
/*M/////////////////////////////////////////////////////////////////////////////////////// |
|
| 5 |
// |
|
| 6 |
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. |
|
| 7 |
// |
|
| 8 |
// By downloading, copying, installing or using the software you agree to this license. |
|
| 9 |
// If you do not agree to this license, do not download, install, |
|
| 10 |
// copy or use the software. |
|
| 11 |
// |
|
| 12 |
// |
|
| 13 |
// License Agreement |
|
| 14 |
// For Open Source Computer Vision Library |
|
| 15 |
// |
|
| 16 |
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. |
|
| 17 |
// Copyright (C) 2009-2011, Willow Garage Inc., all rights reserved. |
|
| 18 |
// Third party copyrights are property of their respective owners. |
|
| 19 |
// |
|
| 20 |
// Redistribution and use in source and binary forms, with or without modification, |
|
| 21 |
// are permitted provided that the following conditions are met: |
|
| 22 |
// |
|
| 23 |
// * Redistribution's of source code must retain the above copyright notice, |
|
| 24 |
// this list of conditions and the following disclaimer. |
|
| 25 |
// |
|
| 26 |
// * Redistribution's in binary form must reproduce the above copyright notice, |
|
| 27 |
// this list of conditions and the following disclaimer in the documentation |
|
| 28 |
// and/or other materials provided with the distribution. |
|
| 29 |
// |
|
| 30 |
// * The name of the copyright holders may not be used to endorse or promote products |
|
| 31 |
// derived from this software without specific prior written permission. |
|
| 32 |
// |
|
| 33 |
// This software is provided by the copyright holders and contributors "as is" and |
|
| 34 |
// any express or implied warranties, including, but not limited to, the implied |
|
| 35 |
// warranties of merchantability and fitness for a particular purpose are disclaimed. |
|
| 36 |
// In no event shall the Intel Corporation or contributors be liable for any direct, |
|
| 37 |
// indirect, incidental, special, exemplary, or consequential damages |
|
| 38 |
// (including, but not limited to, procurement of substitute goods or services; |
|
| 39 |
// loss of use, data, or profits; or business interruption) however caused |
|
| 40 |
// and on any theory of liability, whether in contract, strict liability, |
|
| 41 |
// or tort (including negligence or otherwise) arising in any way out of |
|
| 42 |
// the use of this software, even if advised of the possibility of such damage. |
|
| 43 |
// |
|
| 44 |
//M*/ |
|
| 45 |
|
|
| 46 |
#ifndef __OPENCV_PRAGMA_LIB_HPP__ |
|
| 47 |
#define __OPENCV_PRAGMA_LIB_HPP__ 1 |
|
| 48 |
|
|
| 49 |
#if (defined(_MSC_VER) && !defined(PRAGMA_COMMENT_SUPPORT)) \ |
|
| 50 |
&& !defined(CVAPI_EXPORTS) |
|
| 51 |
#define PRAGMA_COMMENT_SUPPORT 1 |
|
| 52 |
#elif !defined(PRAGMA_COMMENT_SUPPORT) |
|
| 53 |
#define PRAGMA_COMMENT_SUPPORT 0 |
|
| 54 |
#endif |
|
| 55 |
|
|
| 56 |
#ifndef CV_MAJOR_VERSION |
|
| 57 |
#pragma message("WARM: Any OpenCV header included before pragma_lib.hpp")
|
|
| 58 |
#include "opencv2/core/version.hpp" |
|
| 59 |
#endif |
|
| 60 |
|
|
| 61 |
// version string which contains in library's file name such as "232" |
|
| 62 |
#define OPENCV_LIBVERSTR \ |
|
| 63 |
CVAUX_STR(CV_MAJOR_VERSION) \ |
|
| 64 |
CVAUX_STR(CV_MINOR_VERSION) \ |
|
| 65 |
CVAUX_STR(CV_SUBMINOR_VERSION) |
|
| 66 |
|
|
| 67 |
// generate #pragma arguments string |
|
| 68 |
#ifndef _DEBUG // Release |
|
| 69 |
#define OPENCV_COMMENT_LIB_FNAME(name) \ |
|
| 70 |
comment(lib, "opencv_" name OPENCV_LIBVERSTR ".lib") |
|
| 71 |
#else // Debug |
|
| 72 |
#define OPENCV_COMMENT_LIB_FNAME(name) \ |
|
| 73 |
comment(lib, "opencv_" name OPENCV_LIBVERSTR "d.lib") |
|
| 74 |
#endif |
|
| 75 |
|
|
| 76 |
// defined macro search, |
|
| 77 |
// OPENCV_DEFINE_SEARCH(modulename) is only true |
|
| 78 |
// when header file of modulename is included. |
|
| 79 |
#define OPENCV_DEFINE_SEARCH(modulename) \ |
|
| 80 |
( \ |
|
| 81 |
defined( __OPENCV_##modulename##_HPP__ ) || \ |
|
| 82 |
defined( _OPENCV_##modulename##_HPP_ ) || \ |
|
| 83 |
defined( __OPENCV_##modulename##_H__ ) || \ |
|
| 84 |
defined( __OPENCV_##modulename##_##name##_C_H ) \ |
|
| 85 |
) |
|
| 86 |
|
|
| 87 |
#ifndef OPENCV_AUTO_LINK |
|
| 88 |
#define OPENCV_AUTO_LINK 1 |
|
| 89 |
#endif |
|
| 90 |
|
|
| 91 |
#endif // #ifndef __OPENCV_PRAGMA_LIB_HPP__ |
|
| modules/features2d/include/opencv2/features2d/features2d.hpp (working copy) | ||
|---|---|---|
| 3048 | 3048 | |
| 3049 | 3049 |
#endif /* __cplusplus */ |
| 3050 | 3050 | |
| 3051 |
// Auto linking by "#pragma comment(lib)" syntax |
|
| 3052 |
#include "opencv2/core/pragma_lib.hpp" |
|
| 3053 |
#if PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 3054 |
#pragma OPENCV_COMMENT_LIB_FNAME("features2d")
|
|
| 3055 |
#endif // PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 3056 | ||
| 3051 | 3057 |
#endif |
| 3052 | 3058 | |
| 3053 | 3059 |
/* End of file. */ |
| modules/flann/include/opencv2/flann/flann.hpp (working copy) | ||
|---|---|---|
| 40 | 40 |
// |
| 41 | 41 |
//M*/ |
| 42 | 42 | |
| 43 |
#ifndef _OPENCV_FLANN_HPP_
|
|
| 44 |
#define _OPENCV_FLANN_HPP_
|
|
| 43 |
#ifndef __OPENCV_FLANN_HPP__
|
|
| 44 |
#define __OPENCV_FLANN_HPP__
|
|
| 45 | 45 | |
| 46 | 46 |
#ifdef __cplusplus |
| 47 | 47 | |
| ... | ... | |
| 415 | 415 |
} } // namespace cv::flann |
| 416 | 416 | |
| 417 | 417 |
#endif // __cplusplus |
| 418 |
|
|
| 419 |
// Auto linking by "#pragma comment(lib)" syntax |
|
| 420 |
#include "opencv2/core/pragma_lib.hpp" |
|
| 421 |
#if PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 422 |
#pragma OPENCV_COMMENT_LIB_FNAME("flann")
|
|
| 423 |
#endif // PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 418 | 424 | |
| 419 | 425 |
#endif |
| modules/gpu/include/opencv2/gpu/gpu.hpp (working copy) | ||
|---|---|---|
| 1565 | 1565 |
|
| 1566 | 1566 |
} // namespace cv |
| 1567 | 1567 |
|
| 1568 |
// Auto linking by "#pragma comment(lib)" syntax |
|
| 1569 |
#include "opencv2/core/pragma_lib.hpp" |
|
| 1570 |
#if PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 1571 |
#pragma OPENCV_COMMENT_LIB_FNAME("gpu")
|
|
| 1572 |
#endif // PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 1573 |
|
|
| 1568 | 1574 |
#endif /* __OPENCV_GPU_HPP__ */ |
| modules/highgui/include/opencv2/highgui/highgui.hpp (working copy) | ||
|---|---|---|
| 253 | 253 | |
| 254 | 254 |
#endif |
| 255 | 255 | |
| 256 |
// Auto linking by "#pragma comment(lib)" syntax |
|
| 257 |
#include "opencv2/core/pragma_lib.hpp" |
|
| 258 |
#if PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 259 |
#pragma OPENCV_COMMENT_LIB_FNAME("highgui")
|
|
| 260 |
#endif // PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 261 | ||
| 256 | 262 |
#endif |
| modules/imgproc/include/opencv2/imgproc/imgproc.hpp (working copy) | ||
|---|---|---|
| 1149 | 1149 | |
| 1150 | 1150 |
#endif /* __cplusplus */ |
| 1151 | 1151 | |
| 1152 |
// Auto linking by "#pragma comment(lib)" syntax |
|
| 1153 |
#include "opencv2/core/pragma_lib.hpp" |
|
| 1154 |
#if PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 1155 |
#pragma OPENCV_COMMENT_LIB_FNAME("imgproc")
|
|
| 1156 |
#endif // PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 1157 | ||
| 1152 | 1158 |
#endif |
| 1153 | 1159 | |
| 1154 | 1160 |
/* End of file. */ |
| modules/legacy/include/opencv2/legacy/legacy.hpp (working copy) | ||
|---|---|---|
| 1764 | 1764 |
//#include "cvvidsurv.hpp" |
| 1765 | 1765 |
#endif |
| 1766 | 1766 | |
| 1767 |
// Auto linking by "#pragma comment(lib)" syntax |
|
| 1768 |
#include "opencv2/core/pragma_lib.hpp" |
|
| 1769 |
#if PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 1770 |
#pragma OPENCV_COMMENT_LIB_FNAME("legacy")
|
|
| 1771 |
#endif // PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 1772 | ||
| 1767 | 1773 |
#endif |
| 1768 | 1774 | |
| 1769 | 1775 |
/* End of file. */ |
| modules/ml/include/opencv2/ml/ml.hpp (working copy) | ||
|---|---|---|
| 2156 | 2156 |
|
| 2157 | 2157 |
} |
| 2158 | 2158 | |
| 2159 |
// Auto linking by "#pragma comment(lib)" syntax |
|
| 2160 |
#include "opencv2/core/pragma_lib.hpp" |
|
| 2161 |
#if PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 2162 |
#pragma OPENCV_COMMENT_LIB_FNAME("ml")
|
|
| 2163 |
#endif // PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 2164 | ||
| 2159 | 2165 |
#endif |
| 2160 | 2166 |
/* End of file. */ |
| modules/objdetect/include/opencv2/objdetect/objdetect.hpp (working copy) | ||
|---|---|---|
| 658 | 658 |
CV_EXPORTS std::deque<CvDataMatrixCode> cvFindDataMatrix(CvMat *im); |
| 659 | 659 |
#endif |
| 660 | 660 | |
| 661 |
// Auto linking by "#pragma comment(lib)" syntax |
|
| 662 |
#include "opencv2/core/pragma_lib.hpp" |
|
| 663 |
#if PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 664 |
#pragma OPENCV_COMMENT_LIB_FNAME("objdetect")
|
|
| 665 |
#endif // PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 666 | ||
| 661 | 667 |
#endif |
| modules/stitching/include/opencv2/stitching/stitcher.hpp (working copy) | ||
|---|---|---|
| 167 | 167 | |
| 168 | 168 |
} // namespace cv |
| 169 | 169 | |
| 170 |
// Auto linking by "#pragma comment(lib)" syntax |
|
| 171 |
#include "opencv2/core/pragma_lib.hpp" |
|
| 172 |
#if PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 173 |
#pragma OPENCV_COMMENT_LIB_FNAME("stitching")
|
|
| 174 |
#endif // PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 175 | ||
| 170 | 176 |
#endif // __OPENCV_STITCHING_STITCHER_HPP__ |
| modules/video/include/opencv2/video/video.hpp (working copy) | ||
|---|---|---|
| 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 |
// Third party copyrights are property of their respective owners. |
|
| 16 |
// |
|
| 17 |
// Redistribution and use in source and binary forms, with or without modification, |
|
| 18 |
// are permitted provided that the following conditions are met: |
|
| 19 |
// |
|
| 20 |
// * Redistribution's of source code must retain the above copyright notice, |
|
| 21 |
// this list of conditions and the following disclaimer. |
|
| 22 |
// |
|
| 23 |
// * Redistribution's in binary form must reproduce the above copyright notice, |
|
| 24 |
// this list of conditions and the following disclaimer in the documentation |
|
| 25 |
// and/or other materials provided with the distribution. |
|
| 26 |
// |
|
| 27 |
// * The name of the copyright holders may not be used to endorse or promote products |
|
| 28 |
// derived from this software without specific prior written permission. |
|
| 29 |
// |
|
| 30 |
// This software is provided by the copyright holders and contributors "as is" and |
|
| 31 |
// any express or implied warranties, including, but not limited to, the implied |
|
| 32 |
// warranties of merchantability and fitness for a particular purpose are disclaimed. |
|
| 33 |
// In no event shall the Intel Corporation or contributors be liable for any direct, |
|
| 34 |
// indirect, incidental, special, exemplary, or consequential damages |
|
| 35 |
// (including, but not limited to, procurement of substitute goods or services; |
|
| 36 |
// loss of use, data, or profits; or business interruption) however caused |
|
| 37 |
// and on any theory of liability, whether in contract, strict liability, |
|
| 38 |
// or tort (including negligence or otherwise) arising in any way out of |
|
| 39 |
// the use of this software, even if advised of the possibility of such damage. |
|
| 40 |
// |
|
| 41 |
//M*/ |
|
| 42 | ||
| 43 |
#ifndef __OPENCV_VIDEO_HPP__ |
|
| 44 |
#define __OPENCV_VIDEO_HPP__ |
|
| 45 | ||
| 46 |
#include "opencv2/video/tracking.hpp" |
|
| 47 |
#include "opencv2/video/background_segm.hpp" |
|
| 48 | ||
| 49 |
#endif //__OPENCV_VIDEO_HPP__ |
|
| 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 |
// Third party copyrights are property of their respective owners. |
|
| 16 |
// |
|
| 17 |
// Redistribution and use in source and binary forms, with or without modification, |
|
| 18 |
// are permitted provided that the following conditions are met: |
|
| 19 |
// |
|
| 20 |
// * Redistribution's of source code must retain the above copyright notice, |
|
| 21 |
// this list of conditions and the following disclaimer. |
|
| 22 |
// |
|
| 23 |
// * Redistribution's in binary form must reproduce the above copyright notice, |
|
| 24 |
// this list of conditions and the following disclaimer in the documentation |
|
| 25 |
// and/or other materials provided with the distribution. |
|
| 26 |
// |
|
| 27 |
// * The name of the copyright holders may not be used to endorse or promote products |
|
| 28 |
// derived from this software without specific prior written permission. |
|
| 29 |
// |
|
| 30 |
// This software is provided by the copyright holders and contributors "as is" and |
|
| 31 |
// any express or implied warranties, including, but not limited to, the implied |
|
| 32 |
// warranties of merchantability and fitness for a particular purpose are disclaimed. |
|
| 33 |
// In no event shall the Intel Corporation or contributors be liable for any direct, |
|
| 34 |
// indirect, incidental, special, exemplary, or consequential damages |
|
| 35 |
// (including, but not limited to, procurement of substitute goods or services; |
|
| 36 |
// loss of use, data, or profits; or business interruption) however caused |
|
| 37 |
// and on any theory of liability, whether in contract, strict liability, |
|
| 38 |
// or tort (including negligence or otherwise) arising in any way out of |
|
| 39 |
// the use of this software, even if advised of the possibility of such damage. |
|
| 40 |
// |
|
| 41 |
//M*/ |
|
| 42 |
|
|
| 43 |
#ifndef __OPENCV_VIDEO_HPP__ |
|
| 44 |
#define __OPENCV_VIDEO_HPP__ |
|
| 45 |
|
|
| 46 |
#include "opencv2/video/tracking.hpp" |
|
| 47 |
#include "opencv2/video/background_segm.hpp" |
|
| 48 |
|
|
| 49 |
// Auto linking by "#pragma comment(lib)" syntax |
|
| 50 |
#include "opencv2/core/pragma_lib.hpp" |
|
| 51 |
#if PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 52 |
#pragma OPENCV_COMMENT_LIB_FNAME("video")
|
|
| 53 |
#endif // PRAGMA_COMMENT_SUPPORT && OPENCV_AUTO_LINK |
|
| 54 |
|
|
| 55 |
#endif //__OPENCV_VIDEO_HPP__ |
|