fixed some more MSVC2010 warnings

This commit is contained in:
Vadim Pisarevsky
2010-07-17 10:35:17 +00:00
parent ad66d33e81
commit 08cba33f9d
13 changed files with 43 additions and 24 deletions

View File

@@ -63,6 +63,11 @@ extern "C" {
#define CV_UNREFERENCED(arg) arg
#endif
#if !defined __cplusplus && defined _MSC_VER && _MSC_VER >= 1400
#pragma warning(push)
#pragma warning(disable: 4100)
#endif
typedef int CvMatType;
typedef int CvDisMaskType;
typedef CvMat CvMatArray;
@@ -871,6 +876,10 @@ CV_INLINE void cvUnDistort( const CvArr* src, CvArr* dst,
cvUnDistortOnce( src, dst, a, data.fl + 4, 1 );
}
#if !defined __cplusplus && defined _MSC_VER && _MSC_VER >= 1400
#pragma warning(pop)
#endif
#ifdef __cplusplus
}
#endif