Merge pull request #9874 from dkurt:fix_identity_permute_layer

8 years ago · 825c0ffdb4
parent 69f2590359 a3a446c197
commit 825c0ffdb4
1 changed files with 8 additions and 1 deletions
--- a/modules/dnn/src/layers/permute_layer.cpp
+++ b/modules/dnn/src/layers/permute_layer.cpp
@ -117,7 +117,10 @@ public:
                         std::vector<MatShape> &internals) const
    {
        if(!_needsPermute)
+        {
+            Layer::getMemoryShapes(inputs, requiredOutputs, outputs, internals);
            return true;
+        }

        CV_Assert(inputs.size() > 0);
        CV_Assert((int)_numAxes == inputs[0].size());
@ -253,7 +256,11 @@ public:
        if(!_needsPermute)
        {
            for (k = 0; k < ninputs; k++)
-                outputs[k] = *inputs[k];
+            {
+                CV_Assert(outputs[k].total() == inputs[k]->total());
+                if (outputs[k].data != inputs[k]->data)
+                    inputs[k]->copyTo(outputs[k]);
+            }
        }
        else
        {