Merge pull request opencv#9874 from dkurt:fix_identity_permute_layer

vpisarev · vpisarev · commit 825c0ffdb4f4 · 2017-10-27T11:11:48.000Z
diff --git a/modules/dnn/src/layers/permute_layer.cpp b/modules/dnn/src/layers/permute_layer.cpp
@@ -117,7 +117,10 @@ class PermuteLayerImpl : public PermuteLayer
                          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 @@ class PermuteLayerImpl : public PermuteLayer
         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
         {

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,10 @@ class PermuteLayerImpl : public PermuteLayer`
`117`	`117`	`std::vector<MatShape> &internals) const`
`118`	`118`	`{`
`119`	`119`	`if(!_needsPermute)`
	`120`	`+ {`
	`121`	`+ Layer::getMemoryShapes(inputs, requiredOutputs, outputs, internals);`
`120`	`122`	`return true;`
	`123`	`+ }`
`121`	`124`
`122`	`125`	`CV_Assert(inputs.size() > 0);`
`123`	`126`	`CV_Assert((int)_numAxes == inputs[0].size());`
`@@ -253,7 +256,11 @@ class PermuteLayerImpl : public PermuteLayer`
`253`	`256`	`if(!_needsPermute)`
`254`	`257`	`{`
`255`	`258`	`for (k = 0; k < ninputs; k++)`
`256`		`- outputs[k] = *inputs[k];`
	`259`	`+ {`
	`260`	`+ CV_Assert(outputs[k].total() == inputs[k]->total());`
	`261`	`+ if (outputs[k].data != inputs[k]->data)`
	`262`	`+ inputs[k]->copyTo(outputs[k]);`
	`263`	`+ }`
`257`	`264`	`}`
`258`	`265`	`else`
`259`	`266`	`{`