1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00

Merge pull request #15970 from akemimadoka:master

* Fix android armv7 c++_static init crash

* core: move initialization of 'ios_base::Init' for Android
This commit is contained in:
Natsu
2019-11-22 23:42:25 +08:00
committed by Alexander Alekhin
parent ca28274895
commit 54e6f5c237
2 changed files with 17 additions and 0 deletions
+2
View File
@@ -21,6 +21,8 @@ namespace logging {
static LogLevel parseLogLevelConfiguration()
{
(void)getInitializationMutex(); // ensure initialization of global objects
static cv::String param_log_level = utils::getConfigurationParameterString("OPENCV_LOG_LEVEL",
#if defined NDEBUG
"WARNING"