Merge pull request #14951 from alalek:issue_14937

bff90d46 · Alexander Alekhin · 6fdce865 · 65552bf4 · bff90d46
Commit bff90d46 authored Jul 01, 2019 by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

convolution_layer.cpp modules/dnn/src/layers/convolution_layer.cpp +2 -2

No files found.
--- a/modules/dnn/src/layers/convolution_layer.cpp
+++ b/modules/dnn/src/layers/convolution_layer.cpp
@@ -460,11 +460,11 @@ public:

        std::vector<Ptr<BackendWrapper> > blobsWrapper;

-        if (newWeightAndBias)
+        if (fusedWeights)
        {
            Mat wm;
            weightsMat.copyTo(wm); // to handle the case of isContinuous() == false
-            wm.reshape(1, blobs[0].dims, blobs[0].size);
+            wm = wm.reshape(1, blobs[0].dims, blobs[0].size);
            blobsWrapper.push_back(Ptr<BackendWrapper>(new VkComBackendWrapper(wm)));
        }
        else