Merge pull request #3780 from StevenPuttemans:fix_locale_master

pull/3833/head
Vadim Pisarevsky 10 years ago
commit 04f16965d5
  1. 1
      modules/highgui/src/window_QT.cpp
  2. 1
      modules/highgui/src/window_carbon.cpp
  3. 2
      modules/highgui/src/window_cocoa.mm
  4. 2
      modules/highgui/src/window_w32.cpp

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

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

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

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

Loading…
Cancel
Save