Administrator/opencv-MIRROR
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-15 07:29:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7370 from souch55:Fixxn

Browse Source
This commit is contained in:
Alexander Alekhin
2016-10-01 10:44:55 +00:00
parent 16b4ccb846 a34fbf7bb1
commit 1c18b1d245
273 changed files with 657 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/opencv/cv.h
View File

@@ -40,8 +40,8 @@
//
//M*/
#ifndef __OPENCV_OLD_CV_H__
#define __OPENCV_OLD_CV_H__
#ifndef OPENCV_OLD_CV_H
#define OPENCV_OLD_CV_H
#if defined(_MSC_VER)
#define CV_DO_PRAGMA(x) __pragma(x)

4
include/opencv/cv.hpp
View File

@@ -40,8 +40,8 @@
//
//M*/
#ifndef __OPENCV_OLD_CV_HPP__
#define __OPENCV_OLD_CV_HPP__
#ifndef OPENCV_OLD_CV_HPP
#define OPENCV_OLD_CV_HPP
//#if defined(__GNUC__)
//#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"

4
include/opencv/cvaux.h
View File

@@ -39,8 +39,8 @@
//
//M*/
#ifndef __OPENCV_OLD_AUX_H__
#define __OPENCV_OLD_AUX_H__
#ifndef OPENCV_OLD_AUX_H
#define OPENCV_OLD_AUX_H
//#if defined(__GNUC__)
//#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"

4
include/opencv/cvaux.hpp
View File

@@ -39,8 +39,8 @@
//
//M*/
#ifndef __OPENCV_OLD_AUX_HPP__
#define __OPENCV_OLD_AUX_HPP__
#ifndef OPENCV_OLD_AUX_HPP
#define OPENCV_OLD_AUX_HPP
//#if defined(__GNUC__)
//#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"

4
include/opencv/cvwimage.h
View File

@@ -38,8 +38,8 @@
// the use of this software, even if advised of the possibility of such damage.
#ifndef __OPENCV_OLD_WIMAGE_HPP__
#define __OPENCV_OLD_WIMAGE_HPP__
#ifndef OPENCV_OLD_WIMAGE_HPP
#define OPENCV_OLD_WIMAGE_HPP
#include "opencv2/core/wimage.hpp"

4
include/opencv/cxcore.h
View File

@@ -40,8 +40,8 @@
//
//M*/
#ifndef __OPENCV_OLD_CXCORE_H__
#define __OPENCV_OLD_CXCORE_H__
#ifndef OPENCV_OLD_CXCORE_H
#define OPENCV_OLD_CXCORE_H
//#if defined(__GNUC__)
//#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"

4
include/opencv/cxcore.hpp
View File

@@ -40,8 +40,8 @@
//
//M*/
#ifndef __OPENCV_OLD_CXCORE_HPP__
#define __OPENCV_OLD_CXCORE_HPP__
#ifndef OPENCV_OLD_CXCORE_HPP
#define OPENCV_OLD_CXCORE_HPP
//#if defined(__GNUC__)
//#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"

4
include/opencv/cxeigen.hpp
View File

@@ -40,8 +40,8 @@
//
//M*/
#ifndef __OPENCV_OLD_EIGEN_HPP__
#define __OPENCV_OLD_EIGEN_HPP__
#ifndef OPENCV_OLD_EIGEN_HPP
#define OPENCV_OLD_EIGEN_HPP
#include "opencv2/core/eigen.hpp"

4
include/opencv/cxmisc.h
View File

@@ -1,5 +1,5 @@
#ifndef __OPENCV_OLD_CXMISC_H__
#define __OPENCV_OLD_CXMISC_H__
#ifndef OPENCV_OLD_CXMISC_H
#define OPENCV_OLD_CXMISC_H
#ifdef __cplusplus
# include "opencv2/core/utility.hpp"

4
include/opencv/highgui.h
View File

@@ -39,8 +39,8 @@
//
//M*/
#ifndef __OPENCV_OLD_HIGHGUI_H__
#define __OPENCV_OLD_HIGHGUI_H__
#ifndef OPENCV_OLD_HIGHGUI_H
#define OPENCV_OLD_HIGHGUI_H
#include "opencv2/core/core_c.h"
#include "opencv2/highgui/highgui_c.h"

4
include/opencv/ml.h
View File

@@ -38,8 +38,8 @@
//
//M*/
#ifndef __OPENCV_OLD_ML_H__
#define __OPENCV_OLD_ML_H__
#ifndef OPENCV_OLD_ML_H
#define OPENCV_OLD_ML_H
#include "opencv2/core/core_c.h"
#include "opencv2/ml.hpp"

4
include/opencv2/opencv.hpp
View File

@@ -40,8 +40,8 @@
//
//M*/
#ifndef __OPENCV_ALL_HPP__
#define __OPENCV_ALL_HPP__
#ifndef OPENCV_ALL_HPP
#define OPENCV_ALL_HPP
// File that defines what modules where included during the build of OpenCV
// These are purely the defines of the correct HAVE_OPENCV_modulename values