mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-28 21:20:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7675 from filnet:msys2

Browse Source
This commit is contained in:
Alexander Alekhin 2016-11-15 15:59:27 +00:00
commit c3f0ee0768
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -621,7 +621,7 @@ String tempfile( const char* suffix )
return fname;
}
static CvErrorCallback customErrorCallback = 0;
static ErrorCallback customErrorCallback = 0;
static void* customErrorCallbackData = 0;
static bool breakOnError = false;
@ -666,13 +666,13 @@ void error(int _code, const String& _err, const char* _func, const char* _file,
error(cv::Exception(_code, _err, _func, _file, _line));
}
CvErrorCallback
redirectError( CvErrorCallback errCallback, void* userdata, void** prevUserdata)
ErrorCallback
redirectError( ErrorCallback errCallback, void* userdata, void** prevUserdata)
{
if( prevUserdata )
*prevUserdata = customErrorCallbackData;
CvErrorCallback prevCallback = customErrorCallback;
ErrorCallback prevCallback = customErrorCallback;
customErrorCallback = errCallback;
customErrorCallbackData = userdata;