From 654d0c29ad51b3434c0b6ba754ede2687321833b Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 29 Aug 2019 14:37:35 +0300 Subject: [PATCH] ts: fix callback function signature detected by UBSAN --- modules/ts/src/ts.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/ts/src/ts.cpp b/modules/ts/src/ts.cpp index 13bf51ec59..2e35bcb720 100644 --- a/modules/ts/src/ts.cpp +++ b/modules/ts/src/ts.cpp @@ -512,8 +512,9 @@ string TS::str_from_code( const TS::FailureCode code ) return "Generic/Unknown"; } -static int tsErrorCallback( int status, const char* func_name, const char* err_msg, const char* file_name, int line, TS* ts ) +static int tsErrorCallback( int status, const char* func_name, const char* err_msg, const char* file_name, int line, void* data ) { + TS* ts = (TS*)data; const char* delim = std::string(err_msg).find('\n') == std::string::npos ? "" : "\n"; ts->printf(TS::LOG, "OpenCV Error:\n\t%s (%s%s) in %s, file %s, line %d\n", cvErrorStr(status), delim, err_msg, func_name[0] != 0 ? func_name : "unknown function", file_name, line); return 0;