mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-20 11:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10397 from mshabunin:fix-incorrect-assert

Browse Source
This commit is contained in:
Alexander Alekhin 2017-12-22 14:07:02 +00:00
commit 97af608030
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/dnn/src/tensorflow/tf_importer.cpp
View File

@ -930,7 +930,7 @@ void TFImporter::populateNet(Net dstNet)
data_layouts[name] = DATA_LAYOUT_NHWC; data_layouts[name] = DATA_LAYOUT_NHWC;
} }
else else
CV_Assert(Error::StsParseError, "Only NHWC <-> NCHW permutations are allowed."); CV_Error(Error::StsParseError, "Only NHWC <-> NCHW permutations are allowed.");
} }
else if (data_layouts[layer.input(0)] == DATA_LAYOUT_NCHW) else if (data_layouts[layer.input(0)] == DATA_LAYOUT_NCHW)
{ {
@ -947,7 +947,7 @@ void TFImporter::populateNet(Net dstNet)
data_layouts[name] = DATA_LAYOUT_NCHW; data_layouts[name] = DATA_LAYOUT_NCHW;
} }
else else
CV_Assert(Error::StsParseError, "Only NHWC <-> NCHW permutations are allowed."); CV_Error(Error::StsParseError, "Only NHWC <-> NCHW permutations are allowed.");
} }
int id = dstNet.addLayer(name, "Identity", layerParams); int id = dstNet.addLayer(name, "Identity", layerParams);
layer_id[name] = id; layer_id[name] = id;