From 75b3ea9f72fdb083140fc63855b7677d67748376 Mon Sep 17 00:00:00 2001 From: Vladislav Samsonov Date: Wed, 22 Jun 2016 13:53:03 +0300 Subject: [PATCH] Fixing some compiler warnings --- modules/optflow/include/opencv2/optflow/pcaflow.hpp | 2 ++ modules/optflow/src/pcaflow.cpp | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/modules/optflow/include/opencv2/optflow/pcaflow.hpp b/modules/optflow/include/opencv2/optflow/pcaflow.hpp index 58167f515..6a399c3dc 100644 --- a/modules/optflow/include/opencv2/optflow/pcaflow.hpp +++ b/modules/optflow/include/opencv2/optflow/pcaflow.hpp @@ -116,6 +116,8 @@ private: void getSystem( OutputArray A1Out, OutputArray A2Out, OutputArray b1Out, OutputArray b2Out, const std::vector &features, const std::vector &predictedFeatures, const Size size ); + + OpticalFlowPCAFlow& operator=( const OpticalFlowPCAFlow& ); // make it non-assignable }; CV_EXPORTS_W Ptr createOptFlow_PCAFlow(); diff --git a/modules/optflow/src/pcaflow.cpp b/modules/optflow/src/pcaflow.cpp index 1ad00e99f..1ea20adb1 100644 --- a/modules/optflow/src/pcaflow.cpp +++ b/modules/optflow/src/pcaflow.cpp @@ -43,6 +43,17 @@ #include "opencv2/ximgproc/edge_filter.hpp" #include "precomp.hpp" +/* Disable "from double to float" and "from size_t to int" warnings. + * Fixing these would make the code look ugly by introducing explicit cast all around. + * Here these warning are pointless anyway. + */ +#ifdef _MSC_VER +#pragma warning( disable : 4305 4244 4267 4838 ) +#endif +#ifdef __clang__ +#pragma clang diagnostic ignored "-Wshorten-64-to-32" +#endif + namespace cv { namespace optflow