From 673aa91bacdb5948cca6711dd3f30101cf5900d4 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Wed, 24 Oct 2012 20:27:20 +0400 Subject: [PATCH 1/2] Fix remaining windows build warnings --- modules/imgproc/perf/perf_warp.cpp | 2 +- modules/objdetect/src/haar.cpp | 10 ++++++++-- samples/cpp/pca.cpp | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/imgproc/perf/perf_warp.cpp b/modules/imgproc/perf/perf_warp.cpp index a79768e76..18e441f6d 100644 --- a/modules/imgproc/perf/perf_warp.cpp +++ b/modules/imgproc/perf/perf_warp.cpp @@ -119,7 +119,7 @@ PERF_TEST_P( TestWarpPerspectiveNear_t, WarpPerspectiveNear, resize(src, src, size); - int shift = src.cols*0.04; + int shift = static_cast(src.cols*0.04); Mat srcVertices = (Mat_(1, 4) << Vec2f(0, 0), Vec2f(static_cast(size.width-1), 0), Vec2f(static_cast(size.width-1), static_cast(size.height-1)), diff --git a/modules/objdetect/src/haar.cpp b/modules/objdetect/src/haar.cpp index 92da4ac25..96bc7603b 100644 --- a/modules/objdetect/src/haar.cpp +++ b/modules/objdetect/src/haar.cpp @@ -728,8 +728,14 @@ double icvEvalHidHaarClassifierAVX( CvHidHaarClassifier* classifier, sum = _mm256_add_ps(sum,_mm256_load_ps(tmp)); - __m256 left = _mm256_set_ps(nodes[7]->left, nodes[6]->left, nodes[5]->left, nodes[4]->left, nodes[3]->left, nodes[2]->left, nodes[1]->left, nodes[0]->left ); - __m256 right = _mm256_set_ps(nodes[7]->right,nodes[6]->right,nodes[5]->right,nodes[4]->right,nodes[3]->right,nodes[2]->right,nodes[1]->right,nodes[0]->right); + __m256 left = _mm256_set_ps(static_cast(nodes[7]->left), static_cast(nodes[6]->left), + static_cast(nodes[5]->left), static_cast(nodes[4]->left), + static_cast(nodes[3]->left), static_cast(nodes[2]->left), + static_cast(nodes[1]->left), static_cast(nodes[0]->left)); + __m256 right = _mm256_set_ps(static_cast(nodes[7]->right),static_cast(nodes[6]->right), + static_cast(nodes[5]->right),static_cast(nodes[4]->right), + static_cast(nodes[3]->right),static_cast(nodes[2]->right), + static_cast(nodes[1]->right),static_cast(nodes[0]->right)); _mm256_store_si256((__m256i*)idxV, _mm256_cvttps_epi32(_mm256_blendv_ps(right, left, _mm256_cmp_ps(sum, t, _CMP_LT_OQ)))); diff --git a/samples/cpp/pca.cpp b/samples/cpp/pca.cpp index eb891be58..ed23c7622 100644 --- a/samples/cpp/pca.cpp +++ b/samples/cpp/pca.cpp @@ -64,7 +64,7 @@ static void read_imgList(const string& filename, vector& images) { static Mat formatImagesForPCA(const vector &data) { - Mat dst(data.size(), data[0].rows*data[0].cols, CV_32F); + Mat dst(static_cast(data.size()), data[0].rows*data[0].cols, CV_32F); for(unsigned int i = 0; i < data.size(); i++) { Mat image_row = data[i].clone().reshape(1,1); From 2b0072d823a776429a54c4cc5ab15f444de872f7 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Wed, 24 Oct 2012 20:36:30 +0400 Subject: [PATCH 2/2] Suppress more warnings in gtest on OS X --- modules/calib3d/perf/perf_precomp.hpp | 5 ++++- modules/calib3d/test/test_precomp.hpp | 5 ++++- modules/contrib/test/test_precomp.hpp | 5 ++++- modules/core/perf/perf_precomp.hpp | 5 ++++- modules/core/test/test_precomp.hpp | 5 ++++- modules/features2d/perf/perf_precomp.hpp | 5 ++++- modules/features2d/test/test_precomp.hpp | 5 ++++- modules/gpu/perf/perf_precomp.hpp | 5 ++++- modules/gpu/test/test_precomp.hpp | 5 ++++- modules/highgui/perf/perf_precomp.hpp | 5 ++++- modules/highgui/test/test_precomp.hpp | 5 ++++- modules/imgproc/perf/perf_precomp.hpp | 5 ++++- modules/imgproc/test/test_precomp.hpp | 5 ++++- modules/legacy/test/test_precomp.hpp | 5 ++++- modules/ml/test/test_precomp.hpp | 5 ++++- modules/nonfree/perf/perf_precomp.hpp | 5 ++++- modules/nonfree/test/test_precomp.hpp | 5 ++++- modules/objdetect/perf/perf_precomp.hpp | 5 ++++- modules/objdetect/test/test_precomp.hpp | 5 ++++- modules/photo/perf/perf_precomp.hpp | 5 ++++- modules/photo/test/test_precomp.hpp | 5 ++++- modules/stitching/perf/perf_precomp.hpp | 5 ++++- modules/stitching/test/test_precomp.hpp | 5 ++++- modules/video/perf/perf_precomp.hpp | 5 ++++- modules/video/test/test_precomp.hpp | 5 ++++- 25 files changed, 100 insertions(+), 25 deletions(-) diff --git a/modules/calib3d/perf/perf_precomp.hpp b/modules/calib3d/perf/perf_precomp.hpp index b13bd664c..85058e8ee 100644 --- a/modules/calib3d/perf/perf_precomp.hpp +++ b/modules/calib3d/perf/perf_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_PERF_PRECOMP_HPP__ diff --git a/modules/calib3d/test/test_precomp.hpp b/modules/calib3d/test/test_precomp.hpp index a95fc1cdc..0984fe4b4 100644 --- a/modules/calib3d/test/test_precomp.hpp +++ b/modules/calib3d/test/test_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_TEST_PRECOMP_HPP__ diff --git a/modules/contrib/test/test_precomp.hpp b/modules/contrib/test/test_precomp.hpp index 03e1cfe29..eca300da4 100644 --- a/modules/contrib/test/test_precomp.hpp +++ b/modules/contrib/test/test_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_TEST_PRECOMP_HPP__ diff --git a/modules/core/perf/perf_precomp.hpp b/modules/core/perf/perf_precomp.hpp index 184e84bc4..213de58b2 100644 --- a/modules/core/perf/perf_precomp.hpp +++ b/modules/core/perf/perf_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_PERF_PRECOMP_HPP__ diff --git a/modules/core/test/test_precomp.hpp b/modules/core/test/test_precomp.hpp index 1326195a5..9560b6b23 100644 --- a/modules/core/test/test_precomp.hpp +++ b/modules/core/test/test_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_TEST_PRECOMP_HPP__ diff --git a/modules/features2d/perf/perf_precomp.hpp b/modules/features2d/perf/perf_precomp.hpp index 286852b54..b4e7a6209 100644 --- a/modules/features2d/perf/perf_precomp.hpp +++ b/modules/features2d/perf/perf_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_PERF_PRECOMP_HPP__ diff --git a/modules/features2d/test/test_precomp.hpp b/modules/features2d/test/test_precomp.hpp index e2daba111..6887a477a 100644 --- a/modules/features2d/test/test_precomp.hpp +++ b/modules/features2d/test/test_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_TEST_PRECOMP_HPP__ diff --git a/modules/gpu/perf/perf_precomp.hpp b/modules/gpu/perf/perf_precomp.hpp index ab35148f2..3a3cb5eec 100644 --- a/modules/gpu/perf/perf_precomp.hpp +++ b/modules/gpu/perf/perf_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_PERF_PRECOMP_HPP__ diff --git a/modules/gpu/test/test_precomp.hpp b/modules/gpu/test/test_precomp.hpp index 46701f52c..6ef0b33ae 100644 --- a/modules/gpu/test/test_precomp.hpp +++ b/modules/gpu/test/test_precomp.hpp @@ -41,7 +41,10 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_TEST_PRECOMP_HPP__ diff --git a/modules/highgui/perf/perf_precomp.hpp b/modules/highgui/perf/perf_precomp.hpp index f7fb98da1..ec7eb8ca4 100644 --- a/modules/highgui/perf/perf_precomp.hpp +++ b/modules/highgui/perf/perf_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_PERF_PRECOMP_HPP__ diff --git a/modules/highgui/test/test_precomp.hpp b/modules/highgui/test/test_precomp.hpp index 5c2c0f004..10f88c08c 100644 --- a/modules/highgui/test/test_precomp.hpp +++ b/modules/highgui/test/test_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_TEST_PRECOMP_HPP__ diff --git a/modules/imgproc/perf/perf_precomp.hpp b/modules/imgproc/perf/perf_precomp.hpp index 57e630051..a9135b2e0 100644 --- a/modules/imgproc/perf/perf_precomp.hpp +++ b/modules/imgproc/perf/perf_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_PERF_PRECOMP_HPP__ diff --git a/modules/imgproc/test/test_precomp.hpp b/modules/imgproc/test/test_precomp.hpp index f83a86455..d412dc9ab 100644 --- a/modules/imgproc/test/test_precomp.hpp +++ b/modules/imgproc/test/test_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_TEST_PRECOMP_HPP__ diff --git a/modules/legacy/test/test_precomp.hpp b/modules/legacy/test/test_precomp.hpp index dd9dd0e7e..2db92c1e8 100644 --- a/modules/legacy/test/test_precomp.hpp +++ b/modules/legacy/test/test_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_TEST_PRECOMP_HPP__ diff --git a/modules/ml/test/test_precomp.hpp b/modules/ml/test/test_precomp.hpp index 8cda65f83..4b391b6f6 100644 --- a/modules/ml/test/test_precomp.hpp +++ b/modules/ml/test/test_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_TEST_PRECOMP_HPP__ diff --git a/modules/nonfree/perf/perf_precomp.hpp b/modules/nonfree/perf/perf_precomp.hpp index 62b601e95..f4dffe643 100644 --- a/modules/nonfree/perf/perf_precomp.hpp +++ b/modules/nonfree/perf/perf_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_PERF_PRECOMP_HPP__ diff --git a/modules/nonfree/test/test_precomp.hpp b/modules/nonfree/test/test_precomp.hpp index 39ac7ecde..ab7ca5aba 100644 --- a/modules/nonfree/test/test_precomp.hpp +++ b/modules/nonfree/test/test_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_TEST_PRECOMP_HPP__ diff --git a/modules/objdetect/perf/perf_precomp.hpp b/modules/objdetect/perf/perf_precomp.hpp index 234cb83a3..1146da042 100644 --- a/modules/objdetect/perf/perf_precomp.hpp +++ b/modules/objdetect/perf/perf_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_PERF_PRECOMP_HPP__ diff --git a/modules/objdetect/test/test_precomp.hpp b/modules/objdetect/test/test_precomp.hpp index 041fa24c5..12d0ba00c 100644 --- a/modules/objdetect/test/test_precomp.hpp +++ b/modules/objdetect/test/test_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_TEST_PRECOMP_HPP__ diff --git a/modules/photo/perf/perf_precomp.hpp b/modules/photo/perf/perf_precomp.hpp index 49ab24809..0a172dc8a 100644 --- a/modules/photo/perf/perf_precomp.hpp +++ b/modules/photo/perf/perf_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_PERF_PRECOMP_HPP__ diff --git a/modules/photo/test/test_precomp.hpp b/modules/photo/test/test_precomp.hpp index 4496ac889..3fbf6fef7 100644 --- a/modules/photo/test/test_precomp.hpp +++ b/modules/photo/test/test_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_TEST_PRECOMP_HPP__ diff --git a/modules/stitching/perf/perf_precomp.hpp b/modules/stitching/perf/perf_precomp.hpp index dddeb07ca..9e6bd7087 100644 --- a/modules/stitching/perf/perf_precomp.hpp +++ b/modules/stitching/perf/perf_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_PERF_PRECOMP_HPP__ diff --git a/modules/stitching/test/test_precomp.hpp b/modules/stitching/test/test_precomp.hpp index 62dba4037..8189700c1 100644 --- a/modules/stitching/test/test_precomp.hpp +++ b/modules/stitching/test/test_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_TEST_PRECOMP_HPP__ diff --git a/modules/video/perf/perf_precomp.hpp b/modules/video/perf/perf_precomp.hpp index 18f414469..327184946 100644 --- a/modules/video/perf/perf_precomp.hpp +++ b/modules/video/perf/perf_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_VIDEO_PRECOMP_HPP__ diff --git a/modules/video/test/test_precomp.hpp b/modules/video/test/test_precomp.hpp index bef6bf665..3030767f8 100644 --- a/modules/video/test/test_precomp.hpp +++ b/modules/video/test/test_precomp.hpp @@ -1,6 +1,9 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" -# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX +# ifdef __APPLE__ +# pragma GCC diagnostic ignored "-Wmissing-prototypes" +# pragma GCC diagnostic ignored "-Wextra" +# endif #endif #ifndef __OPENCV_TEST_PRECOMP_HPP__