From: Dmitry Kurtaev <dmitry.kurtaev+github@gmail.com>
Date: Sun, 17 Dec 2017 11:36:38 +0000 (+0300)
Subject: Fix default pooling layer type
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~276^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b43d4f47750d47f705bb9d53772340ebad9c851;p=platform%2Fupstream%2Fopencv.git

Fix default pooling layer type
---

diff --git a/modules/dnn/src/layers/pooling_layer.cpp b/modules/dnn/src/layers/pooling_layer.cpp
index 0574458..fab977b 100644
--- a/modules/dnn/src/layers/pooling_layer.cpp
+++ b/modules/dnn/src/layers/pooling_layer.cpp
@@ -67,13 +67,14 @@ class PoolingLayerImpl : public PoolingLayer
 public:
     PoolingLayerImpl(const LayerParams& params)
     {
-        type = MAX;
         computeMaxIdx = true;
         globalPooling = false;
+        stride = Size(1, 1);
 
-        if (params.has("pool"))
+        if (params.has("pool") || params.has("kernel_size") ||
+            params.has("kernel_w") || params.has("kernel_h"))
         {
-            String pool = params.get<String>("pool").toLowerCase();
+            String pool = params.get<String>("pool", "max").toLowerCase();
             if (pool == "max")
                 type = MAX;
             else if (pool == "ave")
@@ -90,6 +91,8 @@ public:
             type = ROI;
             computeMaxIdx = false;
         }
+        else
+            CV_Error(Error::StsBadArg, "Cannot determine pooling type");
         setParamsFrom(params);
         ceilMode = params.get<bool>("ceil_mode", true);
         pooledSize.width = params.get<uint32_t>("pooled_w", 1);