Merge pull request #3046 from StevenPuttemans:fix_Qt_locale

pull/3058/head
Vadim Pisarevsky 11 years ago
commit 3334b1437b
  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. 1
      modules/highgui/src/window_w32.cpp

@ -447,6 +447,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;
}

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

Loading…
Cancel
Save