From e79f83e573ae2d5b60947d9f7964943425234b92 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Tue, 15 Nov 2016 00:33:11 +0100 Subject: [PATCH] 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 --- modules/core/src/system.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp index b2c0a3b..3c8f39d 100644 --- a/modules/core/src/system.cpp +++ b/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; -- 2.7.4