Merge pull request #768 from mshabunin:fix-warnings

modules/cvv/src/qtutil/zoomableimage.cpp

@@ -64,8 +64,8 @@ template <int depth, int channels>
 std::string printPixel(const cv::Mat &mat, int spalte, int zeile)
 {
 	std::stringstream ss{};
-	auto p = mat.at<cv::Vec<cvv::qtutil::DepthType<depth>, channels>>(
-	    zeile, spalte);
+	typedef cv::Vec<cvv::qtutil::DepthType<depth>, channels> VecType;
+	const VecType &p = mat.at<VecType>(zeile, spalte);
 
 	putInStream<depth>(ss, p[0]);
 	for (int c = 1; c < mat.channels(); c++)

modules/cvv/test/test_location.cpp

@@ -10,7 +10,7 @@
 TEST(LocationTest, FileLineFunction)
 {
 	auto locationMacroResult = CVVISUAL_LOCATION;
-	auto line = __LINE__ - 1;
+	size_t line = __LINE__ - 1;
 	auto file = __FILE__;
 	auto fun = CVVISUAL_FUNCTION_NAME_MACRO;
 	EXPECT_EQ(locationMacroResult.isKnown, true);

modules/cvv/test/test_main.cpp

 #include "test_precomp.hpp"
 
-CV_TEST_MAIN(".")
+CV_TEST_MAIN(".", /*Empty VA_ARGS for C++11*/)

modules/dnn/test/cnpy.h

@@ -95,7 +95,7 @@ namespace cnpy {
 
     template<typename T> std::vector<char>& operator+=(std::vector<char>& lhs, const T rhs) {
         //write in little endian
-        for(char byte = 0; byte < sizeof(T); byte++) {
+        for(char byte = 0; (size_t)byte < sizeof(T); byte++) {
             char val = *((char*)&rhs+byte);
             lhs.push_back(val);
         }

modules/dnn/test/test_layers.cpp

@@ -306,7 +306,7 @@ TEST_F(Layer_LSTM_Test, get_set_test)
     inputs.push_back(Blob(inpResShape));
     runLayer(layer, inputs, outputs);
 
-    EXPECT_EQ(2, outputs.size());
+    EXPECT_EQ(2u, outputs.size());
     EXPECT_EQ(outResShape, outputs[0].shape());
     EXPECT_EQ(outResShape, outputs[1].shape());
 
@@ -388,7 +388,7 @@ TEST_F(Layer_RNN_Test, get_set_test)
     inputs.push_back(Blob(BlobShape(nT, nS, 1, nX)));
     runLayer(layer, inputs, outputs);
 
-    EXPECT_EQ(outputs.size(), 2);
+    EXPECT_EQ(outputs.size(), 2u);
     EXPECT_EQ(outputs[0].shape(), BlobShape(nT, nS, nO));
     EXPECT_EQ(outputs[1].shape(), BlobShape(nT, nS, nH));
 }

modules/ximgproc/src/l0_smooth.cpp

@@ -212,14 +212,6 @@ namespace
         D.copyTo(dst);
     }
 
-    void addComplex(InputArray aSrc, int bSrc, OutputArray dst)
-    {
-        Mat panels[2];
-        split(aSrc.getMat(), panels);
-        panels[0] = panels[0] + bSrc;
-        merge(panels, 2, dst);
-    }
-
     void divComplexByRealMultiChannel(vector<Mat> &numer,
         vector<Mat> &denom, vector<Mat> &dst)
     {