Merge pull request #14914 from Nuzhny007:3.4

6 years ago · c531e275cc
parent e59c6caee5 031e57b359
commit c531e275cc
2 changed files with 2 additions and 2 deletions
--- a/modules/dnn/src/op_inf_engine.cpp
+++ b/modules/dnn/src/op_inf_engine.cpp
@ -482,7 +482,7 @@ bool InfEngineBackendNet::isInitialized()
    return (bool)enginePtr;
 }

-void InfEngineBackendNet::addBlobs(const std::vector<Ptr<BackendWrapper> >& ptrs)
+void InfEngineBackendNet::addBlobs(const std::vector<cv::Ptr<BackendWrapper> >& ptrs)
 {
    auto wrappers = infEngineWrappers(ptrs);
    for (const auto& wrapper : wrappers)
--- a/modules/dnn/src/op_inf_engine.hpp
+++ b/modules/dnn/src/op_inf_engine.hpp
@ -84,7 +84,7 @@ public:

    void initPlugin(InferenceEngine::ICNNNetwork& net);

-    void addBlobs(const std::vector<Ptr<BackendWrapper> >& ptrs);
+    void addBlobs(const std::vector<cv::Ptr<BackendWrapper> >& ptrs);

 private:
    InferenceEngine::Builder::Network netBuilder;