Merge pull request #479 from sturkmen72:patch-1

alalek · alalek · commit e8937cc02806 · 2015-12-21T15:57:58.000Z
diff --git a/modules/dnn/src/blob.cpp b/modules/dnn/src/blob.cpp
@@ -57,7 +57,7 @@ namespace dnn
        return (mat.dims <= 2) ? mat.channels() : mat.size[0];
     }
 
-    static BlobShape getBlobShpae(std::vector<Mat> &vmat, int requestedCn = -1)
+    static BlobShape getBlobShape(std::vector<Mat> &vmat, int requestedCn = -1)
     {
         BlobShape shape(4);
         int cnSum = 0, matCn;
@@ -123,7 +123,7 @@ namespace dnn
     {
         CV_Assert(dstCn == -1 || dstCn > 0);
         std::vector<Mat> inMats = extractMatVector(image);
-        BlobShape dstShape = getBlobShpae(inMats, dstCn);
+        BlobShape dstShape = getBlobShape(inMats, dstCn);
 
         m.create(dstShape.dims(), dstShape.ptr(), CV_32F);
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ namespace dnn`
`57`	`57`	`return (mat.dims <= 2) ? mat.channels() : mat.size[0];`
`58`	`58`	`}`
`59`	`59`
`60`		`- static BlobShape getBlobShpae(std::vector<Mat> &vmat, int requestedCn = -1)`
	`60`	`+ static BlobShape getBlobShape(std::vector<Mat> &vmat, int requestedCn = -1)`
`61`	`61`	`{`
`62`	`62`	`BlobShape shape(4);`
`63`	`63`	`int cnSum = 0, matCn;`
`@@ -123,7 +123,7 @@ namespace dnn`
`123`	`123`	`{`
`124`	`124`	`CV_Assert(dstCn == -1 \|\| dstCn > 0);`
`125`	`125`	`std::vector<Mat> inMats = extractMatVector(image);`
`126`		`- BlobShape dstShape = getBlobShpae(inMats, dstCn);`
	`126`	`+ BlobShape dstShape = getBlobShape(inMats, dstCn);`
`127`	`127`
`128`	`128`	`m.create(dstShape.dims(), dstShape.ptr(), CV_32F);`
`129`	`129`