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

97af6080 · Alexander Alekhin · b85c7728 · aa46e31c · 97af6080
Commit 97af6080 authored Dec 22, 2017 by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

tf_importer.cpp modules/dnn/src/tensorflow/tf_importer.cpp +2 -2

No files found.
--- 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;