Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2020-11-27 14:06:34 +00:00
parent 23be514886 7c78c59e64
commit 2155296a13
12 changed files with 397 additions and 111 deletions
@@ -248,8 +248,6 @@ CV__DNN_INLINE_NS_BEGIN
        int type;
        std::vector<size_t> kernel_size, strides;
        std::vector<size_t> pads_begin, pads_end;
-        CV_DEPRECATED_EXTERNAL Size kernel, stride, pad;
-        CV_DEPRECATED_EXTERNAL int pad_l, pad_t, pad_r, pad_b;
        bool globalPooling; //!< Flag is true if at least one of the axes is global pooled.
        std::vector<bool> isGlobalPooling;
        bool computeMaxIdx;