From aa46e31c6dec6d831404ace0ba54925f13ddaebf Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Fri, 22 Dec 2017 15:20:13 +0300 Subject: [PATCH] Replaced incorrect CV_Assert calls with CV_Error --- modules/dnn/src/tensorflow/tf_importer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/dnn/src/tensorflow/tf_importer.cpp b/modules/dnn/src/tensorflow/tf_importer.cpp index 66943dd0bb..3081c9c129 100644 --- 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;