Merge pull request opencv#10268 from dkurt:fix_scale_layer

vpisarev · vpisarev · commit c24f10d64722 · 2017-12-08T18:46:50.000Z
diff --git a/modules/dnn/src/layers/scale_layer.cpp b/modules/dnn/src/layers/scale_layer.cpp
@@ -74,8 +74,8 @@ class ScaleLayerImpl : public ScaleLayer
                 {
                     float w = blobs[0].at<float>(n);
                     float b = hasBias ? blobs[1].at<float>(n) : 0;
-                    Mat outBlobPlane = getPlane(outBlob, cn, n);
-                    Mat inpBlobPlane = getPlane(inpBlob, cn, n);
+                    Mat outBlobPlane = slice(outBlob, cn, n);
+                    Mat inpBlobPlane = slice(inpBlob, cn, n);
                     inpBlobPlane.convertTo(outBlobPlane, CV_32F, w, b);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,8 @@ class ScaleLayerImpl : public ScaleLayer`
`74`	`74`	`{`
`75`	`75`	`float w = blobs[0].at<float>(n);`
`76`	`76`	`float b = hasBias ? blobs[1].at<float>(n) : 0;`
`77`		`- Mat outBlobPlane = getPlane(outBlob, cn, n);`
`78`		`- Mat inpBlobPlane = getPlane(inpBlob, cn, n);`
	`77`	`+ Mat outBlobPlane = slice(outBlob, cn, n);`
	`78`	`+ Mat inpBlobPlane = slice(inpBlob, cn, n);`
`79`	`79`	`inpBlobPlane.convertTo(outBlobPlane, CV_32F, w, b);`
`80`	`80`	`}`
`81`	`81`	`}`