Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv_contrib
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv_contrib
Commits
e8937cc0
Commit
e8937cc0
authored
Dec 21, 2015
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #479 from sturkmen72:patch-1
parents
6b1483ec
e3d11d99
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
blob.cpp
modules/dnn/src/blob.cpp
+2
-2
No files found.
modules/dnn/src/blob.cpp
View file @
e8937cc0
...
...
@@ -57,7 +57,7 @@ namespace dnn
return
(
mat
.
dims
<=
2
)
?
mat
.
channels
()
:
mat
.
size
[
0
];
}
static
BlobShape
getBlobSh
pa
e
(
std
::
vector
<
Mat
>
&
vmat
,
int
requestedCn
=
-
1
)
static
BlobShape
getBlobSh
ap
e
(
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
=
getBlobSh
pa
e
(
inMats
,
dstCn
);
BlobShape
dstShape
=
getBlobSh
ap
e
(
inMats
,
dstCn
);
m
.
create
(
dstShape
.
dims
(),
dstShape
.
ptr
(),
CV_32F
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment