Merge pull request #20453 from rogday:onnx_importer_fix

Split layer dispatch into functions in ONNXImporter * split layer dispatch into functions * fixes * identation and comment fixes * fix constness
4 years ago · cff0168f3a
parent d83901e665
commit cff0168f3a
3 changed files with 1566 additions and 1359 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))

 struct NetImplBase
 {
--- 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
@ -2869,7 +2869,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
        {