Merge pull request #21323 from alalek:dnn_do_not_rebuilt_network_in_setInput

3 years ago · 011ed380aa
parent 9f17c62533 c408157a4d
commit 011ed380aa
1 changed files with 6 additions and 6 deletions
--- a/modules/dnn/src/dnn.cpp
+++ b/modules/dnn/src/dnn.cpp
@ -1339,6 +1339,11 @@ struct Net::Impl : public detail::NetImplBase
 #endif
            clear();

+            if (hasDynamicShapes)
+            {
+                updateLayersShapes();
+            }
+
            this->blobsToKeep = blobsToKeep_;

            allocateLayers(blobsToKeep_);
@ -3886,13 +3891,8 @@ void Net::setInput(InputArray blob, const String& name, double scalefactor, cons
    bool oldShape = prevShape == blobShape;

    blob_.copyTo(impl->netInputLayer->inputsData[pin.oid]);
-    if (!oldShape) {
+    if (!oldShape)
        ld.outputBlobs[pin.oid] = impl->netInputLayer->inputsData[pin.oid];
-        if (impl->hasDynamicShapes)
-        {
-            impl->updateLayersShapes();
-        }
-    }

    if (!ld.outputBlobsWrappers[pin.oid].empty())
    {