From bdd10c11f3ed91d082819db1554e096b9457acb2 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Fri, 11 Jun 2010 18:43:20 +0000 Subject: [PATCH] temporarily comment off the warnings about obsolete cxcore.h, cv.h etc. --- include/opencv/cv.h | 2 +- include/opencv/cv.hpp | 6 +++--- include/opencv/cvaux.h | 6 +++--- include/opencv/cvaux.hpp | 6 +++--- include/opencv/cxcore.h | 6 +++--- include/opencv/cxcore.hpp | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/opencv/cv.h b/include/opencv/cv.h index 80f18fc..f5e53c3 100644 --- a/include/opencv/cv.h +++ b/include/opencv/cv.h @@ -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" diff --git a/include/opencv/cv.hpp b/include/opencv/cv.hpp index 8422f20..37b523b 100644 --- a/include/opencv/cv.hpp +++ b/include/opencv/cv.hpp @@ -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 diff --git a/include/opencv/cvaux.h b/include/opencv/cvaux.h index 733da1f..04dcb81 100644 --- a/include/opencv/cvaux.h +++ b/include/opencv/cvaux.h @@ -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" diff --git a/include/opencv/cvaux.hpp b/include/opencv/cvaux.hpp index ceecab9..952210b 100644 --- a/include/opencv/cvaux.hpp +++ b/include/opencv/cvaux.hpp @@ -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 diff --git a/include/opencv/cxcore.h b/include/opencv/cxcore.h index af01653..404b82a 100644 --- a/include/opencv/cxcore.h +++ b/include/opencv/cxcore.h @@ -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" diff --git a/include/opencv/cxcore.hpp b/include/opencv/cxcore.hpp index 04ec911..033b365 100644 --- a/include/opencv/cxcore.hpp +++ b/include/opencv/cxcore.hpp @@ -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 -- 2.7.4