Skip to content

O
opencv
Commit bdd10c11 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

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

parent 2dc0cf23
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
include/opencv/cv.h
View file @ bdd10c11
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
#endif #endif
#define CV_WARNING(x) CV_MSG_PRAGMA("Warning: " #x) #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_c.h"
#include "opencv2/core/core.hpp" #include "opencv2/core/core.hpp"
......
include/opencv/cv.hpp
View file @ bdd10c11
...@@ -43,9 +43,9 @@ ...@@ -43,9 +43,9 @@
#ifndef __OPENCV_OLD_CV_HPP__ #ifndef __OPENCV_OLD_CV_HPP__
#define __OPENCV_OLD_CV_HPP__ #define __OPENCV_OLD_CV_HPP__
#if defined(__GNUC__) //#if defined(__GNUC__)
#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module" //#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
#endif //#endif
#include <cv.h> #include <cv.h>
......
include/opencv/cvaux.h
View file @ bdd10c11
...@@ -42,9 +42,9 @@ ...@@ -42,9 +42,9 @@
#ifndef __OPENCV_OLD_AUX_H__ #ifndef __OPENCV_OLD_AUX_H__
#define __OPENCV_OLD_AUX_H__ #define __OPENCV_OLD_AUX_H__
#if defined(__GNUC__) //#if defined(__GNUC__)
#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module" //#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
#endif //#endif
#include "opencv2/core/core_c.h" #include "opencv2/core/core_c.h"
#include "opencv2/core/core.hpp" #include "opencv2/core/core.hpp"
......
include/opencv/cvaux.hpp
View file @ bdd10c11
...@@ -42,9 +42,9 @@ ...@@ -42,9 +42,9 @@
#ifndef __OPENCV_OLD_AUX_HPP__ #ifndef __OPENCV_OLD_AUX_HPP__
#define __OPENCV_OLD_AUX_HPP__ #define __OPENCV_OLD_AUX_HPP__
#if defined(__GNUC__) //#if defined(__GNUC__)
#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module" //#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
#endif //#endif
#include <cvaux.h> #include <cvaux.h>
......
include/opencv/cxcore.h
View file @ bdd10c11
...@@ -43,9 +43,9 @@ ...@@ -43,9 +43,9 @@
#ifndef __OPENCV_OLD_CXCORE_H__ #ifndef __OPENCV_OLD_CXCORE_H__
#define __OPENCV_OLD_CXCORE_H__ #define __OPENCV_OLD_CXCORE_H__
#if defined(__GNUC__) //#if defined(__GNUC__)
#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module" //#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
#endif //#endif
#include "opencv2/core/core_c.h" #include "opencv2/core/core_c.h"
#include "opencv2/core/core.hpp" #include "opencv2/core/core.hpp"
......
include/opencv/cxcore.hpp
View file @ bdd10c11
...@@ -43,9 +43,9 @@ ...@@ -43,9 +43,9 @@
#ifndef __OPENCV_OLD_CXCORE_HPP__ #ifndef __OPENCV_OLD_CXCORE_HPP__
#define __OPENCV_OLD_CXCORE_HPP__ #define __OPENCV_OLD_CXCORE_HPP__
#if defined(__GNUC__) //#if defined(__GNUC__)
#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module" //#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
#endif //#endif
#include <cxcore.h> #include <cxcore.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment