Merge pull request opencv#7689 from alalek:warnings_2.4

vpisarev · vpisarev · commit af8e6b06f702 · 2016-11-22T13:30:25.000Z
diff --git a/3rdparty/libtiff/CMakeLists.txt b/3rdparty/libtiff/CMakeLists.txt
@@ -86,7 +86,7 @@ else()
 endif()
 
 ocv_warnings_disable(CMAKE_C_FLAGS -Wno-unused-but-set-variable -Wmissing-prototypes -Wmissing-declarations -Wundef -Wunused -Wsign-compare
-                                   -Wcast-align -Wshadow -Wno-maybe-uninitialized -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast)
+                                   -Wcast-align -Wshadow -Wno-maybe-uninitialized -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -Wmisleading-indentation)
 ocv_warnings_disable(CMAKE_C_FLAGS -Wunused-parameter) # clang
 ocv_warnings_disable(CMAKE_CXX_FLAGS -Wmissing-declarations -Wunused-parameter)
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4018 /wd4100 /wd4127 /wd4311 /wd4701 /wd4706) # vs2005
@@ -95,7 +95,7 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4267 /wd4305 /wd4306) # vs2008 Win64
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4703) # vs2012
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4456 /wd4457 /wd4312) # vs2015
 
-ocv_warnings_disable(CMAKE_C_FLAGS /wd4267 /wd4244 /wd4018)
+ocv_warnings_disable(CMAKE_C_FLAGS /wd4267 /wd4244 /wd4018 /wd4311 /wd4312)
 
 if(UNIX AND (CMAKE_COMPILER_IS_GNUCXX OR CV_ICC))
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
diff --git a/3rdparty/openexr/CMakeLists.txt b/3rdparty/openexr/CMakeLists.txt
@@ -37,8 +37,8 @@ endif()
 source_group("Include" FILES ${lib_hdrs} )
 source_group("Src" FILES ${lib_srcs})
 
-ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow -Wunused -Wsign-compare -Wundef -Wmissing-declarations -Wuninitialized -Wswitch -Wparentheses -Warray-bounds -Wextra)
-ocv_warnings_disable(CMAKE_CXX_FLAGS -Wdeprecated-declarations)
+ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow -Wunused -Wsign-compare -Wundef -Wmissing-declarations -Wuninitialized -Wswitch -Wparentheses -Warray-bounds -Wextra
+                                     -Wdeprecated-declarations -Wmisleading-indentation)
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4018 /wd4099 /wd4100 /wd4101 /wd4127 /wd4189 /wd4245 /wd4305 /wd4389 /wd4512 /wd4701 /wd4702 /wd4706 /wd4800) # vs2005
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4334) # vs2005 Win64
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4244) # vs2008
diff --git a/apps/haartraining/createsamples.cpp b/apps/haartraining/createsamples.cpp
@@ -52,6 +52,11 @@
 #include <ctime>
 #include <memory>
 
+// std::auto_ptr
+#if defined(__GNUC__) && __GNUC__ >= 6
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 using namespace std;
 
 #include "cvhaartraining.h"
diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
@@ -95,6 +95,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     add_extra_compiler_option(-Wno-narrowing)
     add_extra_compiler_option(-Wno-delete-non-virtual-dtor)
     add_extra_compiler_option(-Wno-unnamed-type-template-args)
+    add_extra_compiler_option(-Wno-comment)
     add_extra_compiler_option(-Wno-array-bounds)
     add_extra_compiler_option(-Wno-aggressive-loop-optimizations)
   endif()
diff --git a/modules/calib3d/src/calibinit.cpp b/modules/calib3d/src/calibinit.cpp
@@ -1036,13 +1036,15 @@ icvRemoveQuadFromGroup(CvCBQuad **quads, int count, CvCBQuad *q0)
                 q->neighbors[j] = 0;
                 q->count--;
                 for(int k = 0; k < 4; k++ )
+                {
                     if( q0->neighbors[k] == q )
                     {
                         q0->neighbors[k] = 0;
                         q0->count--;
                         break;
                     }
-                    break;
+                }
+                break;
             }
         }
     }
diff --git a/modules/calib3d/test/test_cameracalibration.cpp b/modules/calib3d/test/test_cameracalibration.cpp
@@ -1339,13 +1339,15 @@ bool CV_StereoCalibrationTest::checkPandROI( int test_case_idx, const Mat& M, co
 
     undistortPoints(Mat(pts), upts, M, D, R, P );
     for( k = 0; k < N*N; k++ )
+    {
         if( upts[k].x < -imgsize.width*eps || upts[k].x > imgsize.width*(1+eps) ||
             upts[k].y < -imgsize.height*eps || upts[k].y > imgsize.height*(1+eps) )
         {
             ts->printf(cvtest::TS::LOG, "Test #%d. The point (%g, %g) was mapped to (%g, %g) which is out of image\n",
                 test_case_idx, pts[k].x, pts[k].y, upts[k].x, upts[k].y);
             return false;
         }
+    }
 
         // step 2. check that all the points inside ROI belong to the original source image
         Mat temp(imgsize, CV_8U), utemp, map1, map2;
diff --git a/modules/core/include/opencv2/core/cuda_devptrs.hpp b/modules/core/include/opencv2/core/cuda_devptrs.hpp
@@ -122,27 +122,23 @@ namespace cv
         typedef PtrStep<float> PtrStepf;
         typedef PtrStep<int> PtrStepi;
 
-
 #if defined __GNUC__
-    #define __CV_GPU_DEPR_BEFORE__
-    #define __CV_GPU_DEPR_AFTER__ __attribute__ ((deprecated))
+    #define CV_GPU_DEPRECATED __attribute__ ((deprecated))
 #elif defined(__MSVC__) //|| defined(__CUDACC__)
     #pragma deprecated(DevMem2D_)
-    #define __CV_GPU_DEPR_BEFORE__ __declspec(deprecated)
-    #define __CV_GPU_DEPR_AFTER__
+    #define CV_GPU_DEPRECATED __declspec(deprecated)
 #else
-    #define __CV_GPU_DEPR_BEFORE__
-    #define __CV_GPU_DEPR_AFTER__
+    #define CV_GPU_DEPRECATED
 #endif
 
-        template <typename T> struct __CV_GPU_DEPR_BEFORE__ DevMem2D_ : public PtrStepSz<T>
+        template <typename T> struct DevMem2D_ : public PtrStepSz<T>
         {
-            DevMem2D_() {}
-            DevMem2D_(int rows_, int cols_, T* data_, size_t step_) : PtrStepSz<T>(rows_, cols_, data_, step_) {}
+            CV_GPU_DEPRECATED DevMem2D_() {}
+            CV_GPU_DEPRECATED DevMem2D_(int rows_, int cols_, T* data_, size_t step_) : PtrStepSz<T>(rows_, cols_, data_, step_) {}
 
             template <typename U>
-            explicit __CV_GPU_DEPR_BEFORE__ DevMem2D_(const DevMem2D_<U>& d) : PtrStepSz<T>(d.rows, d.cols, (T*)d.data, d.step) {}
-        } __CV_GPU_DEPR_AFTER__ ;
+            explicit CV_GPU_DEPRECATED DevMem2D_(const DevMem2D_<U>& d) : PtrStepSz<T>(d.rows, d.cols, (T*)d.data, d.step) {}
+        };
 
         typedef DevMem2D_<unsigned char> DevMem2Db;
         typedef DevMem2Db DevMem2D;
@@ -174,8 +170,7 @@ namespace cv
         typedef PtrElemStep_<float> PtrElemStepf;
         typedef PtrElemStep_<int> PtrElemStepi;
 
-//#undef __CV_GPU_DEPR_BEFORE__
-//#undef __CV_GPU_DEPR_AFTER__
+//#undef CV_GPU_DEPRECATED
 
         namespace device
         {
diff --git a/modules/core/include/opencv2/core/gpumat.hpp b/modules/core/include/opencv2/core/gpumat.hpp
@@ -277,10 +277,9 @@ namespace cv { namespace gpu
         template <typename _Tp> operator PtrStep<_Tp>() const;
 
         // Deprecated function
-        __CV_GPU_DEPR_BEFORE__ template <typename _Tp> operator DevMem2D_<_Tp>() const __CV_GPU_DEPR_AFTER__;
-        __CV_GPU_DEPR_BEFORE__ template <typename _Tp> operator PtrStep_<_Tp>() const __CV_GPU_DEPR_AFTER__;
-        #undef __CV_GPU_DEPR_BEFORE__
-        #undef __CV_GPU_DEPR_AFTER__
+        template <typename _Tp> CV_GPU_DEPRECATED operator DevMem2D_<_Tp>() const;
+        template <typename _Tp> CV_GPU_DEPRECATED operator PtrStep_<_Tp>() const;
+        #undef CV_GPU_DEPRECATED
 
         /*! includes several bit-fields:
         - the magic signature
diff --git a/modules/core/include/opencv2/core/internal.hpp b/modules/core/include/opencv2/core/internal.hpp
@@ -292,7 +292,7 @@ namespace cv
         return classname##_info_var; \
     } \
     \
-    static ::cv::AlgorithmInfo& classname##_info_auto = classname##_info(); \
+    CV_ATTR_USED static ::cv::AlgorithmInfo& classname##_info_auto = classname##_info(); \
     \
     ::cv::AlgorithmInfo* classname::info() const \
     { \
diff --git a/modules/core/include/opencv2/core/types_c.h b/modules/core/include/opencv2/core/types_c.h
@@ -43,6 +43,15 @@
 #ifndef __OPENCV_CORE_TYPES_H__
 #define __OPENCV_CORE_TYPES_H__
 
+#if defined(__GNUC__) && !defined(COMPILER_ICC)
+# define CV_ATTR_UNUSED __attribute__((unused))
+# define CV_ATTR_USED __attribute__((used))
+#else
+# define CV_ATTR_UNUSED
+# define CV_ATTR_USED
+#endif
+
+
 #if !defined _CRT_SECURE_NO_DEPRECATE && defined _MSC_VER
 #  if _MSC_VER > 1300
 #    define _CRT_SECURE_NO_DEPRECATE /* to avoid multiple Visual Studio 2005 warnings */
diff --git a/modules/core/src/gpumat.cpp b/modules/core/src/gpumat.cpp
@@ -700,7 +700,7 @@ void cv::gpu::GpuMat::create(int _rows, int _cols, int _type)
 
         size_t esz = elemSize();
 
-        void* devPtr;
+        void* devPtr = NULL;
         gpuFuncTable()->mallocPitch(&devPtr, &step, esz * cols, rows);
 
         // Single row must be continuous
diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
@@ -908,6 +908,11 @@ int _interlockedExchangeAdd(int* addr, int delta)
 
 #elif defined __APPLE__
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #include <libkern/OSAtomic.h>
 
 struct Mutex::Impl
@@ -923,6 +928,10 @@ struct Mutex::Impl
     int refcount;
 };
 
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
 #elif defined __linux__ && !defined ANDROID && !defined __LINUXTHREADS_OLD__
 
 struct Mutex::Impl
diff --git a/modules/core/test/test_ds.cpp b/modules/core/test/test_ds.cpp
@@ -56,7 +56,7 @@ static void cvTsSimpleSeqShiftAndCopy( CvTsSimpleSeq* seq, int from_idx, int to_
                 (seq->count - from_idx)*elem_size );
     }
     seq->count += to_idx - from_idx;
-    if( elem && to_idx > from_idx )
+    if( elem )
         memcpy( seq->array + from_idx*elem_size, elem, (to_idx - from_idx)*elem_size );
 }
 
diff --git a/modules/flann/include/opencv2/flann/any.h b/modules/flann/include/opencv2/flann/any.h
@@ -80,7 +80,7 @@ struct big_any_policy : typed_base_any_policy<T>
 {
     virtual void static_delete(void** x)
     {
-        if (* x) delete (* reinterpret_cast<T**>(x)); *x = NULL;
+        if (* x) { delete (* reinterpret_cast<T**>(x)); *x = NULL; }
     }
     virtual void copy_from_value(void const* src, void** dest)
     {
diff --git a/modules/flann/include/opencv2/flann/flann.hpp b/modules/flann/include/opencv2/flann/flann.hpp
@@ -225,51 +225,58 @@ int GenericIndex<Distance>::radiusSearch(const Mat& query, Mat& indices, Mat& di
  * @deprecated Use GenericIndex class instead
  */
 template <typename T>
-class
-#ifndef _MSC_VER
- FLANN_DEPRECATED
-#endif
- Index_ {
+class Index_ {
 public:
         typedef typename L2<T>::ElementType ElementType;
         typedef typename L2<T>::ResultType DistanceType;
 
+    FLANN_DEPRECATED
     Index_(const Mat& features, const ::cvflann::IndexParams& params);
 
+    FLANN_DEPRECATED
     ~Index_();
 
+    FLANN_DEPRECATED
     void knnSearch(const vector<ElementType>& query, vector<int>& indices, vector<DistanceType>& dists, int knn, const ::cvflann::SearchParams& params);
+    FLANN_DEPRECATED
     void knnSearch(const Mat& queries, Mat& indices, Mat& dists, int knn, const ::cvflann::SearchParams& params);
 
+    FLANN_DEPRECATED
     int radiusSearch(const vector<ElementType>& query, vector<int>& indices, vector<DistanceType>& dists, DistanceType radius, const ::cvflann::SearchParams& params);
+    FLANN_DEPRECATED
     int radiusSearch(const Mat& query, Mat& indices, Mat& dists, DistanceType radius, const ::cvflann::SearchParams& params);
 
+    FLANN_DEPRECATED
     void save(std::string filename)
         {
             if (nnIndex_L1) nnIndex_L1->save(filename);
             if (nnIndex_L2) nnIndex_L2->save(filename);
         }
 
+    FLANN_DEPRECATED
     int veclen() const
     {
             if (nnIndex_L1) return nnIndex_L1->veclen();
             if (nnIndex_L2) return nnIndex_L2->veclen();
         }
 
+    FLANN_DEPRECATED
     int size() const
     {
             if (nnIndex_L1) return nnIndex_L1->size();
             if (nnIndex_L2) return nnIndex_L2->size();
         }
 
+        FLANN_DEPRECATED
         ::cvflann::IndexParams getParameters()
         {
             if (nnIndex_L1) return nnIndex_L1->getParameters();
             if (nnIndex_L2) return nnIndex_L2->getParameters();
 
         }
 
-        FLANN_DEPRECATED const ::cvflann::IndexParams* getIndexParameters()
+        FLANN_DEPRECATED
+        const ::cvflann::IndexParams* getIndexParameters()
         {
             if (nnIndex_L1) return nnIndex_L1->getIndexParameters();
             if (nnIndex_L2) return nnIndex_L2->getIndexParameters();
@@ -281,10 +288,6 @@ class
         ::cvflann::Index< L1<ElementType> >* nnIndex_L1;
 };
 
-#ifdef _MSC_VER
-template <typename T>
-class FLANN_DEPRECATED Index_;
-#endif
 
 template <typename T>
 Index_<T>::Index_(const Mat& dataset, const ::cvflann::IndexParams& params)
diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp
@@ -54,6 +54,12 @@
 #include "opencv2/objdetect/objdetect.hpp"
 #include "opencv2/features2d/features2d.hpp"
 
+// std::auto_ptr
+#if defined(__GNUC__) && __GNUC__ >= 6
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 namespace cv { namespace gpu {
 
 //////////////////////////////// CudaMem ////////////////////////////////
@@ -2527,4 +2533,8 @@ CV_EXPORTS void calcWobbleSuppressionMaps(
 
 } // namespace cv
 
+#if defined(__GNUC__) && __GNUC__ >= 6
+#pragma GCC diagnostic pop
+#endif
+
 #endif /* __OPENCV_GPU_HPP__ */
diff --git a/modules/highgui/src/cap_v4l.cpp b/modules/highgui/src/cap_v4l.cpp
@@ -380,12 +380,11 @@ static void icvInitCapture_V4L() {
       deviceHandle = open(deviceName, O_RDONLY);
       if (deviceHandle != -1) {
          /* This device does indeed exist - add it to the total so far */
-    // add indexList
-    indexList|=(1 << CameraNumber);
-        numCameras++;
-    }
-    if (deviceHandle != -1)
-      close(deviceHandle);
+         // add indexList
+         indexList|=(1 << CameraNumber);
+         numCameras++;
+         close(deviceHandle);
+      }
       /* Set up to test the next /dev/video source in line */
       CameraNumber++;
    } /* End while */
diff --git a/modules/legacy/test/test_optflow.cpp b/modules/legacy/test/test_optflow.cpp
@@ -166,6 +166,7 @@ double showFlowAndCalcError(const string& name, const Mat& gray, const Mat& flow
     bool all = true;
     Mat inner = flow(where);
     for(int y = 0; y < inner.rows; ++y)
+    {
         for(int x = 0; x < inner.cols; ++x)
         {
             const Point2f f = inner.at<Point2f>(y, x);
@@ -178,12 +179,14 @@ double showFlowAndCalcError(const string& name, const Mat& gray, const Mat& flow
             double a = atan2(f.y, f.x);
             error += fabs(angle - a);
         }
-        double res = all ? numeric_limits<double>::max() : error / (inner.cols * inner.rows);
+    }
+
+    double res = all ? numeric_limits<double>::max() : error / (inner.cols * inner.rows);
 
-        if (writeError)
-            cout << "Error " + name << " = " << res << endl;
+    if (writeError)
+        cout << "Error " + name << " = " << res << endl;
 
-        return res;
+    return res;
 }
 
 
diff --git a/modules/legacy/test/test_stereomatching.cpp b/modules/legacy/test/test_stereomatching.cpp
@@ -461,7 +461,9 @@ void CV_StereoMatchingTest::run(int)
         int dispScaleFactor = datasetsParams[datasetName].dispScaleFactor;
         Mat tmp; trueLeftDisp.convertTo( tmp, CV_32FC1, 1.f/dispScaleFactor ); trueLeftDisp = tmp; tmp.release();
         if( !trueRightDisp.empty() )
+        {
             trueRightDisp.convertTo( tmp, CV_32FC1, 1.f/dispScaleFactor ); trueRightDisp = tmp; tmp.release();
+        }
 
         Mat leftDisp, rightDisp;
         int ignBorder = max(runStereoMatchingAlgorithm(leftImg, rightImg, leftDisp, rightDisp, ci), EVAL_IGNORE_BORDER);
@@ -530,7 +532,7 @@ int CV_StereoMatchingTest::processStereoMatchingResults( FileStorage& fs, int ca
     // rightDisp is not used in current test virsion
     int code = cvtest::TS::OK;
     assert( fs.isOpened() );
-    assert( trueLeftDisp.type() == CV_32FC1 && trueRightDisp.type() == CV_32FC1 );
+    assert( trueLeftDisp.type() == CV_32FC1 && (trueRightDisp.empty() || trueRightDisp.type() == CV_32FC1) );
     assert( leftDisp.type() == CV_32FC1 && rightDisp.type() == CV_32FC1 );
 
     // get masks for unknown ground truth disparity values
diff --git a/modules/ocl/src/mssegmentation.cpp b/modules/ocl/src/mssegmentation.cpp
diff --git a/modules/ocl/test/utility.hpp b/modules/ocl/test/utility.hpp
diff --git a/modules/stitching/src/matchers.cpp b/modules/stitching/src/matchers.cpp
diff --git a/modules/ts/include/opencv2/ts/gpu_test.hpp b/modules/ts/include/opencv2/ts/gpu_test.hpp
diff --git a/modules/ts/include/opencv2/ts/ts_gtest.h b/modules/ts/include/opencv2/ts/ts_gtest.h
diff --git a/modules/ts/src/ts_func.cpp b/modules/ts/src/ts_func.cpp

Original file line number	Diff line number	Diff line change
`@@ -1036,13 +1036,15 @@ icvRemoveQuadFromGroup(CvCBQuad *quads, int count, CvCBQuad q0)`
`1036`	`1036`	`q->neighbors[j] = 0;`
`1037`	`1037`	`q->count--;`
`1038`	`1038`	`for(int k = 0; k < 4; k++ )`
	`1039`	`+ {`
`1039`	`1040`	`if( q0->neighbors[k] == q )`
`1040`	`1041`	`{`
`1041`	`1042`	`q0->neighbors[k] = 0;`
`1042`	`1043`	`q0->count--;`
`1043`	`1044`	`break;`
`1044`	`1045`	`}`
`1045`		`- break;`
	`1046`	`+ }`
	`1047`	`+ break;`
`1046`	`1048`	`}`
`1047`	`1049`	`}`
`1048`	`1050`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1339,13 +1339,15 @@ bool CV_StereoCalibrationTest::checkPandROI( int test_case_idx, const Mat& M, co`
`1339`	`1339`
`1340`	`1340`	`undistortPoints(Mat(pts), upts, M, D, R, P );`
`1341`	`1341`	`for( k = 0; k < N*N; k++ )`
	`1342`	`+ {`
`1342`	`1343`	`if( upts[k].x < -imgsize.widtheps \|\| upts[k].x > imgsize.width(1+eps) \|\|`
`1343`	`1344`	`upts[k].y < -imgsize.heighteps \|\| upts[k].y > imgsize.height(1+eps) )`
`1344`	`1345`	`{`
`1345`	`1346`	`ts->printf(cvtest::TS::LOG, "Test #%d. The point (%g, %g) was mapped to (%g, %g) which is out of image\n",`
`1346`	`1347`	`test_case_idx, pts[k].x, pts[k].y, upts[k].x, upts[k].y);`
`1347`	`1348`	`return false;`
`1348`	`1349`	`}`
	`1350`	`+ }`
`1349`	`1351`
`1350`	`1352`	`// step 2. check that all the points inside ROI belong to the original source image`
`1351`	`1353`	`Mat temp(imgsize, CV_8U), utemp, map1, map2;`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ namespace cv`
`292`	`292`	`return classname##_info_var; \`
`293`	`293`	`} \`
`294`	`294`	`\`
`295`		`- static ::cv::AlgorithmInfo& classname##_info_auto = classname##_info(); \`
	`295`	`+ CV_ATTR_USED static ::cv::AlgorithmInfo& classname##_info_auto = classname##_info(); \`
`296`	`296`	`\`
`297`	`297`	`::cv::AlgorithmInfo* classname::info() const \`
`298`	`298`	`{ \`