calib3d: fix missing cv::redirectError symbol error

happens on msys2 with gcc 6.2.0
see also http://stackoverflow.com/questions/38552221/undefined-reference-to-cvredirecterror-while-creating-shared-build-of-opencv-3
pull/7675/head
Philippe Renon 8 years ago
parent c93fb14dd2
commit e79f83e573
  1. 8
      modules/core/src/system.cpp

@ -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;

Loading…
Cancel
Save