From: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Date: Mon, 11 Nov 2019 18:24:05 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/3.4' into merge-3.4
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1^2~60
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6a58818bb6b30a1f9d982b3f3f53228ea5a13c1;p=platform%2Fupstream%2Fopencv.git

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

b6a58818bb6b30a1f9d982b3f3f53228ea5a13c1
diff --cc modules/dnn/include/opencv2/dnn/version.hpp
index 3b372f9,0000000..9b1c6e1
mode 100644,000000..100644
--- a/modules/dnn/include/opencv2/dnn/version.hpp
+++ b/modules/dnn/include/opencv2/dnn/version.hpp
@@@ -1,21 -1,0 +1,21 @@@
 +// This file is part of OpenCV project.
 +// It is subject to the license terms in the LICENSE file found in the top-level directory
 +// of this distribution and at http://opencv.org/license.html.
 +
 +#ifndef OPENCV_DNN_VERSION_HPP
 +#define OPENCV_DNN_VERSION_HPP
 +
 +/// Use with major OpenCV version only.
- #define OPENCV_DNN_API_VERSION 20191024
++#define OPENCV_DNN_API_VERSION 20191111
 +
 +#if !defined CV_DOXYGEN && !defined CV_STATIC_ANALYSIS && !defined CV_DNN_DONT_ADD_INLINE_NS
 +#define CV__DNN_INLINE_NS __CV_CAT(dnn4_v, OPENCV_DNN_API_VERSION)
 +#define CV__DNN_INLINE_NS_BEGIN namespace CV__DNN_INLINE_NS {
 +#define CV__DNN_INLINE_NS_END }
 +namespace cv { namespace dnn { namespace CV__DNN_INLINE_NS { } using namespace CV__DNN_INLINE_NS; }}
 +#else
 +#define CV__DNN_INLINE_NS_BEGIN
 +#define CV__DNN_INLINE_NS_END
 +#endif
 +
 +#endif  // OPENCV_DNN_VERSION_HPP
diff --cc modules/dnn/src/layers/eltwise_layer.cpp
index c67b198,f077866..f65fda5
--- a/modules/dnn/src/layers/eltwise_layer.cpp
+++ b/modules/dnn/src/layers/eltwise_layer.cpp
@@@ -104,8 -101,7 +107,8 @@@ public
      virtual bool supportBackend(int backendId) CV_OVERRIDE
      {
          return backendId == DNN_BACKEND_OPENCV ||
-                backendId == DNN_BACKEND_CUDA ||
--               backendId == DNN_BACKEND_HALIDE ||
++               (backendId == DNN_BACKEND_CUDA && op != DIV) ||  // TODO: not implemented, see PR #15811
++               (backendId == DNN_BACKEND_HALIDE && op != DIV) ||  // TODO: not implemented, see PR #15811
                 (backendId == DNN_BACKEND_INFERENCE_ENGINE && !variableChannels &&
                  (preferableTarget != DNN_TARGET_OPENCL || coeffs.empty()));
      }