From 9e47cb7d6f8976f36c80aa8010fb27023e8cbfde Mon Sep 17 00:00:00 2001 From: biagio montesano Date: Sun, 10 Aug 2014 12:43:36 +0200 Subject: [PATCH] Added window's pragma warning --- .../include/opencv2/line_descriptor/array32.hpp | 4 ++++ .../include/opencv2/line_descriptor/bitarray.hpp | 4 ++++ .../include/opencv2/line_descriptor/bitops.hpp | 1 + .../include/opencv2/line_descriptor/bucket_group.hpp | 4 ++++ .../include/opencv2/line_descriptor/ed_line_detector.hpp | 4 ++++ .../include/opencv2/line_descriptor/mihasher.hpp | 4 ++++ .../include/opencv2/line_descriptor/sparse_hashtable.hpp | 4 ++++ .../line_descriptor/include/opencv2/line_descriptor/types.hpp | 4 ++++ modules/line_descriptor/src/precomp.hpp | 4 ++++ 9 files changed, 33 insertions(+) diff --git a/modules/line_descriptor/include/opencv2/line_descriptor/array32.hpp b/modules/line_descriptor/include/opencv2/line_descriptor/array32.hpp index 816d032cc..9a90d13db 100644 --- a/modules/line_descriptor/include/opencv2/line_descriptor/array32.hpp +++ b/modules/line_descriptor/include/opencv2/line_descriptor/array32.hpp @@ -43,6 +43,10 @@ #ifndef __OPENCV_ARRAY32_HPP #define __OPENCV_ARRAY32_HPP +#ifdef _WIN32 +#pragma warning( disable : 4267 ) +#endif + #include "types.hpp" class Array32 diff --git a/modules/line_descriptor/include/opencv2/line_descriptor/bitarray.hpp b/modules/line_descriptor/include/opencv2/line_descriptor/bitarray.hpp index 7f1eb9b45..3353ea56d 100644 --- a/modules/line_descriptor/include/opencv2/line_descriptor/bitarray.hpp +++ b/modules/line_descriptor/include/opencv2/line_descriptor/bitarray.hpp @@ -43,6 +43,10 @@ #ifndef __OPENCV_BITARRAY_HPP #define __OPENCV_BITARRAY_HPP +#ifdef _WIN32 +#pragma warning( disable : 4267 ) +#endif + #include "types.hpp" #include #include diff --git a/modules/line_descriptor/include/opencv2/line_descriptor/bitops.hpp b/modules/line_descriptor/include/opencv2/line_descriptor/bitops.hpp index db40b15e2..80ed7dab9 100644 --- a/modules/line_descriptor/include/opencv2/line_descriptor/bitops.hpp +++ b/modules/line_descriptor/include/opencv2/line_descriptor/bitops.hpp @@ -47,6 +47,7 @@ # include # define popcnt __popcnt # define popcntll __popcnt64 +# pragma warning( disable : 4267 ) #else # define popcntll __builtin_popcountll # define popcnt __builtin_popcount diff --git a/modules/line_descriptor/include/opencv2/line_descriptor/bucket_group.hpp b/modules/line_descriptor/include/opencv2/line_descriptor/bucket_group.hpp index e71c2223c..7299de062 100644 --- a/modules/line_descriptor/include/opencv2/line_descriptor/bucket_group.hpp +++ b/modules/line_descriptor/include/opencv2/line_descriptor/bucket_group.hpp @@ -43,6 +43,10 @@ #ifndef __OPENCV_BUCKET_GROUP_HPP #define __OPENCV_BUCKET_GROUP_HPP +#ifdef _WIN32 +#pragma warning( disable : 4267 ) +#endif + #include "types.hpp" #include "array32.hpp" #include "bitarray.hpp" diff --git a/modules/line_descriptor/include/opencv2/line_descriptor/ed_line_detector.hpp b/modules/line_descriptor/include/opencv2/line_descriptor/ed_line_detector.hpp index 2899e3b8b..7505e4b13 100644 --- a/modules/line_descriptor/include/opencv2/line_descriptor/ed_line_detector.hpp +++ b/modules/line_descriptor/include/opencv2/line_descriptor/ed_line_detector.hpp @@ -41,6 +41,10 @@ #ifndef __OPENCV_ED_LINE_DETECTOR_HH_ #define __OPENCV_ED_LINE_DETECTOR_HH_ +#ifdef _WIN32 +#pragma warning( disable : 4267 ) +#endif + #include #include #include diff --git a/modules/line_descriptor/include/opencv2/line_descriptor/mihasher.hpp b/modules/line_descriptor/include/opencv2/line_descriptor/mihasher.hpp index 01696db33..aa64565f8 100644 --- a/modules/line_descriptor/include/opencv2/line_descriptor/mihasher.hpp +++ b/modules/line_descriptor/include/opencv2/line_descriptor/mihasher.hpp @@ -43,6 +43,10 @@ #ifndef __OPENCV_MIHASHER_HPP #define __OPENCV_MIHASHER_HPP +#ifdef _WIN32 +#pragma warning( disable : 4267 ) +#endif + #include "types.hpp" #include "bitops.hpp" #include "sparse_hashtable.hpp" diff --git a/modules/line_descriptor/include/opencv2/line_descriptor/sparse_hashtable.hpp b/modules/line_descriptor/include/opencv2/line_descriptor/sparse_hashtable.hpp index ee754c42b..98586a3a9 100644 --- a/modules/line_descriptor/include/opencv2/line_descriptor/sparse_hashtable.hpp +++ b/modules/line_descriptor/include/opencv2/line_descriptor/sparse_hashtable.hpp @@ -43,6 +43,10 @@ #ifndef __OPENCV_SPARSE_HASHTABLE_HPP #define __OPENCV_SPARSE_HASHTABLE_HPP +#ifdef _WIN32 +#pragma warning( disable : 4267 ) +#endif + #include "types.hpp" #include "bucket_group.hpp" diff --git a/modules/line_descriptor/include/opencv2/line_descriptor/types.hpp b/modules/line_descriptor/include/opencv2/line_descriptor/types.hpp index ac16810d2..ac55a9d8e 100644 --- a/modules/line_descriptor/include/opencv2/line_descriptor/types.hpp +++ b/modules/line_descriptor/include/opencv2/line_descriptor/types.hpp @@ -45,6 +45,10 @@ #ifndef __OPENCV_TYPES_HPP #define __OPENCV_TYPES_HPP +#ifdef _WIN32 +#pragma warning( disable : 4267 ) +#endif + /* define data types */ typedef uint64_t UINT64; typedef uint32_t UINT32; diff --git a/modules/line_descriptor/src/precomp.hpp b/modules/line_descriptor/src/precomp.hpp index b3ba9c1bc..219b981e7 100644 --- a/modules/line_descriptor/src/precomp.hpp +++ b/modules/line_descriptor/src/precomp.hpp @@ -42,6 +42,10 @@ #ifndef __OPENCV_PRECOMP_H__ #define __OPENCV_PRECOMP_H__ +#ifdef _WIN32 +#pragma warning( disable : 4267 ) +#endif + #define _USE_MATH_DEFINES #include