generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #645 from taka-no-me:bump_headers

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-14 11:42:22 +04:00
committed by OpenCV Buildbot
parent b076b69e68 a42a0f5fca
commit d9cd753835
281 changed files with 22107 additions and 21404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4690
modules/core/include/opencv2/core/core.hpp
View File

File diff suppressed because it is too large Load Diff

2
modules/core/include/opencv2/core/eigen.hpp
View File

@@ -46,7 +46,7 @@
#ifdef __cplusplus
#include "opencv2/core/core_c.h"
#include "opencv2/core/core.hpp"
#include "opencv2/core.hpp"
#if defined _MSC_VER && _MSC_VER >= 1200
#pragma warning( disable: 4714 ) //__forceinline is not inlined

2
modules/core/include/opencv2/core/gpumat.hpp
View File

@@ -45,7 +45,7 @@
#ifdef __cplusplus
#include "opencv2/core/core.hpp"
#include "opencv2/core.hpp"
#include "opencv2/core/cuda_devptrs.hpp"
namespace cv { namespace gpu

2
modules/core/include/opencv2/core/opengl_interop.hpp → modules/core/include/opencv2/core/opengl.hpp
View File

@@ -45,7 +45,7 @@
#ifdef __cplusplus
#include "opencv2/core/core.hpp"
#include "opencv2/core.hpp"
namespace cv { namespace ogl {