Merge pull request #20478 from rogday:onnx_refactor_master

4 years ago · 610e3dccb7
parent e9db7fea5b 27392f832d
commit 610e3dccb7
3 changed files with 1602 additions and 1400 deletions
--- a/modules/dnn/src/dnn_common.hpp
+++ b/modules/dnn/src/dnn_common.hpp
@ -14,6 +14,7 @@ Mutex& getInitializationMutex();
 void initializeLayerFactory();

 namespace detail {
+#define CALL_MEMBER_FN(object, ptrToMemFn)  ((object).*(ptrToMemFn))

 class NotImplemented : public Layer
 {
--- a/modules/dnn/src/onnx/onnx_importer.cpp
+++ b/modules/dnn/src/onnx/onnx_importer.cpp
--- a/modules/dnn/src/tensorflow/tf_importer.cpp
+++ b/modules/dnn/src/tensorflow/tf_importer.cpp
@ -2894,7 +2894,7 @@ void TFImporter::parseNode(const tensorflow::NodeDef& layer)
        DispatchMap::const_iterator iter = dispatch.find(type);
        if (iter != dispatch.end())
        {
-            ((*this).*(iter->second))(net, layer, layerParams);
+            CALL_MEMBER_FN(*this, iter->second)(net, layer, layerParams);
        }
        else if (!DNN_DIAGNOSTICS_RUN || !layerHandler->handleMissing(layer))
        {