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

Merge pull request #10706 from alalek:exception_opencv_version

Browse Source
This commit is contained in:
Alexander Alekhin 2018-02-01 18:32:13 +00:00
commit bbfa239036
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/core/src/system.cpp
View File

@ -249,9 +249,9 @@ const char* Exception::what() const throw() { return msg.c_str(); }
void Exception::formatMessage() void Exception::formatMessage()
{ {
if( func.size() > 0 ) if( func.size() > 0 )
msg = format("%s:%d: error: (%d) %s in function %s\n", file.c_str(), line, code, err.c_str(), func.c_str()); msg = format("OpenCV(%s) %s:%d: error: (%d) %s in function %s\n", CV_VERSION, file.c_str(), line, code, err.c_str(), func.c_str());
else else
msg = format("%s:%d: error: (%d) %s\n", file.c_str(), line, code, err.c_str()); msg = format("OpenCV(%s) %s:%d: error: (%d) %s\n", CV_VERSION, file.c_str(), line, code, err.c_str());
} }
static const char* g_hwFeatureNames[CV_HARDWARE_MAX_FEATURE] = { NULL }; static const char* g_hwFeatureNames[CV_HARDWARE_MAX_FEATURE] = { NULL };
@ -957,7 +957,8 @@ void error( const Exception& exc )
char buf[1 << 12]; char buf[1 << 12];
cv_snprintf(buf, sizeof(buf), cv_snprintf(buf, sizeof(buf),
"OpenCV Error: %s (%s) in %s, file %s, line %d", "OpenCV(%s) Error: %s (%s) in %s, file %s, line %d",
CV_VERSION,
errorStr, exc.err.c_str(), exc.func.size() > 0 ? errorStr, exc.err.c_str(), exc.func.size() > 0 ?
exc.func.c_str() : "unknown function", exc.file.c_str(), exc.line); exc.func.c_str() : "unknown function", exc.file.c_str(), exc.line);
fprintf( stderr, "%s\n", buf ); fprintf( stderr, "%s\n", buf );