Merge pull request #14914 from Nuzhny007:3.4

c531e275 · Alexander Alekhin · e59c6cae · 031e57b3 · c531e275 · c531e275
Commit c531e275 authored Jun 27, 2019 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

op_inf_engine.cpp modules/dnn/src/op_inf_engine.cpp +1 -1

op_inf_engine.hpp modules/dnn/src/op_inf_engine.hpp +1 -1

No files found.
--- 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;