Merge pull request #3780 from StevenPuttemans:fix_locale_master

This commit is contained in:
Vadim Pisarevsky 2015-03-13 13:16:09 +00:00
commit 04f16965d5
4 changed files with 6 additions and 0 deletions

View File

@ -464,6 +464,7 @@ static int icvInitSystem(int* c, char** v)
if (!QApplication::instance())
{
new QApplication(*c, v);
setlocale(LC_NUMERIC,"C");
qDebug() << "init done";

View File

@ -146,6 +146,7 @@ CV_IMPL int cvInitSystem( int argc, char** argv )
}
wasInitialized = 1;
}
setlocale(LC_NUMERIC,"C");
return 0;
}

View File

@ -156,6 +156,8 @@ CV_IMPL int cvInitSystem( int , char** )
//[application finishLaunching];
//atexit(icvCocoaCleanup);
setlocale(LC_NUMERIC,"C");
return 0;
}

View File

@ -260,6 +260,8 @@ CV_IMPL int cvInitSystem( int, char** )
wasInitialized = 1;
}
setlocale(LC_NUMERIC,"C");
return 0;
}