From 97455f1593a9448a0de4015e9270b51f563a9afe Mon Sep 17 00:00:00 2001 From: Liubov Batanina Date: Mon, 20 Jan 2020 17:31:58 +0300 Subject: [PATCH] Remove useless condition --- modules/dnn/src/layers/layers_common.cpp | 40 +++++++++--------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/modules/dnn/src/layers/layers_common.cpp b/modules/dnn/src/layers/layers_common.cpp index 4675a380d4..dbe69b4b81 100644 --- a/modules/dnn/src/layers/layers_common.cpp +++ b/modules/dnn/src/layers/layers_common.cpp @@ -149,13 +149,10 @@ void getPoolingKernelParams(const LayerParams ¶ms, std::vector& kern std::vector& strides, cv::String &padMode) { bool is_global = params.get("global_pooling", false); - globalPooling = std::vector(3, is_global); - if (params.has("global_pooling_d")) - globalPooling[0] = params.get("global_pooling_d"); - if (params.has("global_pooling_h")) - globalPooling[1] = params.get("global_pooling_h"); - if (params.has("global_pooling_w")) - globalPooling[2] = params.get("global_pooling_w"); + globalPooling.resize(3); + globalPooling[0] = params.get("global_pooling_d", is_global); + globalPooling[1] = params.get("global_pooling_h", is_global); + globalPooling[2] = params.get("global_pooling_w", is_global); is_global = globalPooling[0] || globalPooling[1] || globalPooling[2]; if (!is_global) @@ -172,25 +169,18 @@ void getPoolingKernelParams(const LayerParams ¶ms, std::vector& kern CV_Error(cv::Error::StsBadArg, "In global_pooling mode, kernel_size (or kernel_h and kernel_w) cannot be specified"); } - kernel.resize(3, 1); + kernel.resize(3); pads_begin.resize(3, 0); pads_end.resize(3, 0); strides.resize(3, 1); - if (params.has("kernel_d")) - kernel[0] = params.get("kernel_d"); - if (params.has("kernel_h")) - kernel[1] = params.get("kernel_h"); - if (params.has("kernel_w")) - kernel[2] = params.get("kernel_w"); + kernel[0] = params.get("kernel_d", 1); + kernel[1] = params.get("kernel_h", 1); + kernel[2] = params.get("kernel_w", 1); - if (params.has("pad_t")) - pads_begin[1] = params.get("pad_t"); - if (params.has("pad_l")) - pads_begin[2] = params.get("pad_l"); - if (params.has("pad_b")) - pads_end[1] = params.get("pad_b"); - if (params.has("pad_r")) - pads_end[2] = params.get("pad_r"); + pads_begin[1] = params.get("pad_t", 0); + pads_begin[2] = params.get("pad_l", 0); + pads_end[1] = params.get("pad_b", 0); + pads_end[2] = params.get("pad_r", 0); if (params.has("pad_h")) { pads_begin[1] = params.get("pad_h"); pads_end[1] = params.get("pad_h"); @@ -219,10 +209,8 @@ void getPoolingKernelParams(const LayerParams ¶ms, std::vector& kern } } - if (params.has("stride_h")) - strides[1] = params.get("stride_h"); - if (params.has("stride_w")) - strides[2] = params.get("stride_w"); + strides[1] = params.get("stride_h", 1); + strides[2] = params.get("stride_w", 1); if (params.has("stride")) { DictValue param = params.get("stride"); for (int i = param.size() - 1, j = strides.size() - 1; i >= 0; i--, j--) {