mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-13 04:52:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #23800 from kai-waang:4.x

Browse Source 
removing unreachable code and fixing a typo
This commit is contained in:
Alexander Smorkalov 2023-06-15 17:28:33 +03:00 committed by GitHub
commit 291689a178
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/dnn/src/caffe/caffe_importer.cpp
View File

@ -97,11 +97,11 @@ class CaffeImporter
public: public:
CaffeImporter(const char *pototxt, const char *caffeModel) CaffeImporter(const char *prototxt, const char *caffeModel)
{ {
CV_TRACE_FUNCTION(); CV_TRACE_FUNCTION();
ReadNetParamsFromTextFileOrDie(pototxt, &net); ReadNetParamsFromTextFileOrDie(prototxt, &net);
if (caffeModel && caffeModel[0]) if (caffeModel && caffeModel[0])
ReadNetParamsFromBinaryFileOrDie(caffeModel, &netBinary); ReadNetParamsFromBinaryFileOrDie(caffeModel, &netBinary);
@ -193,7 +193,6 @@ public:
break; break;
default: default:
CV_Error(Error::StsError, "Unknown type \"" + String(field->type_name()) + "\" in prototxt"); CV_Error(Error::StsError, "Unknown type \"" + String(field->type_name()) + "\" in prototxt");
break;
} }
} }
@ -556,7 +555,6 @@ public:
if (idx < 0) if (idx < 0)
{ {
CV_Error(Error::StsObjectNotFound, "Can't find output blob \"" + name + "\""); CV_Error(Error::StsObjectNotFound, "Can't find output blob \"" + name + "\"");
return;
} }
dstNet.connect(addedBlobs[idx].layerId, addedBlobs[idx].outNum, layerId, inNum); dstNet.connect(addedBlobs[idx].layerId, addedBlobs[idx].outNum, layerId, inNum);