Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

temporarily comment off the warnings about obsolete cxcore.h, cv.h etc.

Browse Source
pull/13383/head
Vadim Pisarevsky 15 years ago
parent 2dc0cf2388
commit bdd10c11f3
6 changed files with 16 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      include/opencv/cv.h
  2. 6
      include/opencv/cv.hpp
  3. 6
      include/opencv/cvaux.h
  4. 6
      include/opencv/cvaux.hpp
  5. 6
      include/opencv/cxcore.h
  6. 6
      include/opencv/cxcore.hpp

2
include/opencv/cv.h
Unescape View File

@ -58,7 +58,7 @@
#endif
#define CV_WARNING(x) CV_MSG_PRAGMA("Warning: " #x)
CV_WARNING("This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module")
//CV_WARNING("This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module")
#include "opencv2/core/core_c.h"
#include "opencv2/core/core.hpp"

6
include/opencv/cv.hpp
Unescape View File

@ -43,9 +43,9 @@
#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"
#endif
//#if defined(__GNUC__)
//#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
//#endif
#include <cv.h>

6
include/opencv/cvaux.h
Unescape View File

@ -42,9 +42,9 @@
#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"
#endif
//#if defined(__GNUC__)
//#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
//#endif
#include "opencv2/core/core_c.h"
#include "opencv2/core/core.hpp"

6
include/opencv/cvaux.hpp
Unescape View File

@ -42,9 +42,9 @@
#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"
#endif
//#if defined(__GNUC__)
//#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
//#endif
#include <cvaux.h>

6
include/opencv/cxcore.h
Unescape View File

@ -43,9 +43,9 @@
#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"
#endif
//#if defined(__GNUC__)
//#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
//#endif
#include "opencv2/core/core_c.h"
#include "opencv2/core/core.hpp"

6
include/opencv/cxcore.hpp
Unescape View File

@ -43,9 +43,9 @@
#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"
#endif
//#if defined(__GNUC__)
//#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
//#endif
#include <cxcore.h>

Write Preview
Loading…
Cancel
Save