diff --git a/modules/dnn/src/caffe/caffe_importer.cpp b/modules/dnn/src/caffe/caffe_importer.cpp index a7085a197..3c648804b 100644 --- a/modules/dnn/src/caffe/caffe_importer.cpp +++ b/modules/dnn/src/caffe/caffe_importer.cpp @@ -374,15 +374,7 @@ Ptr cv::dnn::createCaffeImporter(const String&, const String&) Net cv::dnn::readNetFromCaffe(const String &prototxt, const String &caffeModel /*= String()*/) { - Ptr caffeImporter; - try - { - caffeImporter = createCaffeImporter(prototxt, caffeModel); - } - catch(...) - { - } - + Ptr caffeImporter = createCaffeImporter(prototxt, caffeModel); Net net; if (caffeImporter) caffeImporter->populateNet(net); diff --git a/modules/dnn/src/tensorflow/tf_importer.cpp b/modules/dnn/src/tensorflow/tf_importer.cpp index 973856b7c..36e16fd1b 100644 --- a/modules/dnn/src/tensorflow/tf_importer.cpp +++ b/modules/dnn/src/tensorflow/tf_importer.cpp @@ -736,23 +736,6 @@ void TFImporter::populateNet(Net dstNet) } // namespace -Net cv::dnn::readNetFromTensorflow(const String &model) -{ - Ptr importer; - try - { - importer = createTensorflowImporter(model); - } - catch(...) - { - } - - Net net; - if (importer) - importer->populateNet(net); - return net; -} - Ptr cv::dnn::createTensorflowImporter(const String &model) { return Ptr(new TFImporter(model.c_str())); @@ -767,3 +750,12 @@ Ptr cv::dnn::createTensorflowImporter(const String&) } #endif //HAVE_PROTOBUF + +Net cv::dnn::readNetFromTensorflow(const String &model) +{ + Ptr importer = createTensorflowImporter(model); + Net net; + if (importer) + importer->populateNet(net); + return net; +} diff --git a/modules/dnn/src/torch/torch_importer.cpp b/modules/dnn/src/torch/torch_importer.cpp index 023ddc076..d1112de32 100644 --- a/modules/dnn/src/torch/torch_importer.cpp +++ b/modules/dnn/src/torch/torch_importer.cpp @@ -989,15 +989,7 @@ Mat readTorchBlob(const String&, bool) Net readNetFromTorch(const String &model, bool isBinary) { - Ptr importer; - try - { - importer = createTorchImporter(model, isBinary); - } - catch(...) - { - } - + Ptr importer = createTorchImporter(model, isBinary); Net net; if (importer) importer->populateNet(net);