potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2019-06-21 17:27:14 +03:00
parent e69ff71302 4b205680df
commit f33f88de31
10 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/src/layers/batch_norm_layer.cpp
+1
View File
@@ -33,6 +33,7 @@ public:
BatchNormLayerImpl(const LayerParams& params)
: dims(-1)
{
setParamsFrom(params);
CV_Assert(blobs.size() >= 2);
modules/dnn/src/layers/mvn_layer.cpp
+2
View File
@@ -147,6 +147,7 @@ public:
UMat &inpMat = inputs[inpIdx];
UMat &outMat = outputs[inpIdx];
int newRows = total(shape(inpMat), 0, splitDim);
CV_Assert(newRows != 0);
MatShape s = shape(newRows, inpMat.total() / newRows);
UMat meanMat = UMat(s[0], 1, (use_half) ? CV_16S : CV_32F);
@@ -221,6 +222,7 @@ public:
UMat &inpMat = inputs[inpIdx];
UMat &outMat = outputs[inpIdx];
int newRows = total(shape(inpMat), 0, splitDim);
CV_Assert(newRows != 0);
MatShape s = shape(newRows, inpMat.total() / newRows);
UMat oneMat = UMat::ones(s[1], 1, CV_32F);
modules/dnn/src/layers/reshape_layer.cpp
+1
View File
@@ -138,6 +138,7 @@ static void computeShapeByReshapeMask(const MatShape &srcShape,
size_t srcTotal = total(srcShape);
size_t dstTotal = total(dstShape);
CV_Assert(dstTotal != 0);
if (inferDim != -1)
{
modules/dnn/src/onnx/onnx_importer.cpp
+2
View File
@@ -162,6 +162,8 @@ void runLayer(LayerParams& params, const std::vector<Mat>& inputs,
std::vector<Mat>& outputs)
{
Ptr<Layer> layer = LayerFactory::createLayerInstance(params.type, params);
CV_Assert((bool)layer);
std::vector<MatShape> inpShapes(inputs.size());
int ddepth = CV_32F;
for (size_t i = 0; i < inputs.size(); ++i)