fixing setting the locale back to what should be expected
authorStevenPuttemans <steven.puttemans@kuleuven.be>
Tue, 5 Aug 2014 14:05:10 +0000 (16:05 +0200)
committerStevenPuttemans <steven.puttemans@kuleuven.be>
Tue, 5 Aug 2014 14:20:08 +0000 (16:20 +0200)
fix should be applyed for every window interface and generation

modules/highgui/src/window_QT.cpp
modules/highgui/src/window_carbon.cpp
modules/highgui/src/window_cocoa.mm
modules/highgui/src/window_w32.cpp

index 64ebf08..1a38303 100644 (file)
@@ -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";
 
index 3d092e7..e440935 100644 (file)
@@ -146,6 +146,7 @@ CV_IMPL int cvInitSystem( int argc, char** argv )
         }
         wasInitialized = 1;
     }
+    setlocale(LC_NUMERIC,"C");
 
     return 0;
 }
index 433e437..74f6c05 100644 (file)
@@ -156,6 +156,8 @@ CV_IMPL int cvInitSystem( int , char** )
     //[application finishLaunching];
     //atexit(icvCocoaCleanup);
 
+    setlocale(LC_NUMERIC,"C");
+
     return 0;
 }
 
index b5cbc55..fb5b6b5 100644 (file)
@@ -250,6 +250,7 @@ CV_IMPL int cvInitSystem( int, char** )
 
         wasInitialized = 1;
     }
+    setlocale(LC_NUMERIC,"C");
 
     return 0;
 }