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

alalek · alalek · commit 97af6080301d · 2017-12-22T14:07:02.000Z
diff --git a/modules/dnn/src/tensorflow/tf_importer.cpp b/modules/dnn/src/tensorflow/tf_importer.cpp
@@ -930,7 +930,7 @@ void TFImporter::populateNet(Net dstNet)
                         data_layouts[name] = DATA_LAYOUT_NHWC;
                     }
                     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)
                 {
@@ -947,7 +947,7 @@ void TFImporter::populateNet(Net dstNet)
                         data_layouts[name] = DATA_LAYOUT_NCHW;
                     }
                     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);
                 layer_id[name] = id;

Original file line number	Diff line number	Diff line change
`@@ -930,7 +930,7 @@ void TFImporter::populateNet(Net dstNet)`
`930`	`930`	`data_layouts[name] = DATA_LAYOUT_NHWC;`
`931`	`931`	`}`
`932`	`932`	`else`
`933`		`- CV_Assert(Error::StsParseError, "Only NHWC <-> NCHW permutations are allowed.");`
	`933`	`+ CV_Error(Error::StsParseError, "Only NHWC <-> NCHW permutations are allowed.");`
`934`	`934`	`}`
`935`	`935`	`else if (data_layouts[layer.input(0)] == DATA_LAYOUT_NCHW)`
`936`	`936`	`{`
`@@ -947,7 +947,7 @@ void TFImporter::populateNet(Net dstNet)`
`947`	`947`	`data_layouts[name] = DATA_LAYOUT_NCHW;`
`948`	`948`	`}`
`949`	`949`	`else`
`950`		`- CV_Assert(Error::StsParseError, "Only NHWC <-> NCHW permutations are allowed.");`
	`950`	`+ CV_Error(Error::StsParseError, "Only NHWC <-> NCHW permutations are allowed.");`
`951`	`951`	`}`
`952`	`952`	`int id = dstNet.addLayer(name, "Identity", layerParams);`
`953`	`953`	`layer_id[name] = id;`