From: Maksim Shabunin Date: Fri, 22 Dec 2017 12:20:13 +0000 (+0300) Subject: Replaced incorrect CV_Assert calls with CV_Error X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~246^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa46e31c6dec6d831404ace0ba54925f13ddaebf;p=platform%2Fupstream%2Fopencv.git Replaced incorrect CV_Assert calls with CV_Error --- diff --git a/modules/dnn/src/tensorflow/tf_importer.cpp b/modules/dnn/src/tensorflow/tf_importer.cpp index 66943dd..3081c9c 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;