From 92e9d4ec3a99d4c2e19fad5d5f4425de366b18a7 Mon Sep 17 00:00:00 2001
From: Maksim Shabunin <maksim.shabunin@gmail.com>
Date: Thu, 22 Feb 2018 13:20:35 +0300
Subject: [PATCH] Fixed several issues detected by static analysis

---
 modules/dnn/src/dnn.cpp                  | 2 +-
 modules/dnn/src/layers/pooling_layer.cpp | 2 +-
 modules/imgcodecs/src/grfmt_tiff.cpp     | 7 ++++---
 modules/ml/src/ann_mlp.cpp               | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/dnn/src/dnn.cpp b/modules/dnn/src/dnn.cpp
index 4b2b0a0..194648c 100644
--- a/modules/dnn/src/dnn.cpp
+++ b/modules/dnn/src/dnn.cpp
@@ -338,7 +338,7 @@ struct LayerPin
 
 struct LayerData
 {
-    LayerData() : id(-1), flag(0) {}
+    LayerData() : id(-1), skip(false), flag(0) {}
     LayerData(int _id, const String &_name, const String &_type, LayerParams &_params)
         : id(_id), name(_name), type(_type), params(_params), skip(false), flag(0)
     {
diff --git a/modules/dnn/src/layers/pooling_layer.cpp b/modules/dnn/src/layers/pooling_layer.cpp
index 10952ed..ee552b5 100644
--- a/modules/dnn/src/layers/pooling_layer.cpp
+++ b/modules/dnn/src/layers/pooling_layer.cpp
@@ -270,7 +270,7 @@ public:
         int poolingType;
         float spatialScale;
 
-        PoolingInvoker() : src(0), rois(0), dst(0), mask(0), nstripes(0),
+        PoolingInvoker() : src(0), rois(0), dst(0), mask(0), avePoolPaddedArea(false), nstripes(0),
                            computeMaxIdx(0), poolingType(MAX), spatialScale(0) {}
 
         static void run(const Mat& src, const Mat& rois, Mat& dst, Mat& mask, Size kernel,
diff --git a/modules/imgcodecs/src/grfmt_tiff.cpp b/modules/imgcodecs/src/grfmt_tiff.cpp
index f338240..372176e 100644
--- a/modules/imgcodecs/src/grfmt_tiff.cpp
+++ b/modules/imgcodecs/src/grfmt_tiff.cpp
@@ -587,12 +587,13 @@ bool TiffDecoder::readData_32FC1(Mat& img)
     tsize_t scanlength = TIFFScanlineSize(tif);
     tdata_t buf = _TIFFmalloc(scanlength);
     float* data;
+    bool result = true;
     for (uint32 row = 0; row < img_height; row++)
     {
         if (TIFFReadScanline(tif, buf, row) != 1)
         {
-            close();
-            return false;
+            result = false;
+            break;
         }
         data=(float*)buf;
         for (uint32 i=0; i<img_width; i++)
@@ -603,7 +604,7 @@ bool TiffDecoder::readData_32FC1(Mat& img)
     _TIFFfree(buf);
     close();
 
-    return true;
+    return result;
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
diff --git a/modules/ml/src/ann_mlp.cpp b/modules/ml/src/ann_mlp.cpp
index cd00024..22bacb3 100644
--- a/modules/ml/src/ann_mlp.cpp
+++ b/modules/ml/src/ann_mlp.cpp
@@ -92,7 +92,7 @@ protected:
     double varTmp;
     int index;
 public:
-    SimulatedAnnealingANN_MLP(ml::ANN_MLP& x, const Ptr<ml::TrainData>& d) : nn(x), data(d)
+    SimulatedAnnealingANN_MLP(ml::ANN_MLP& x, const Ptr<ml::TrainData>& d) : nn(x), data(d), varTmp(0.0), index(0)
     {
         initVarMap();
     }
-- 
2.7.4