projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
361eb63
)
fixing locale settings - making it universal
author
StevenPuttemans
<steven.puttemans@kuleuven.be>
Fri, 6 Mar 2015 11:59:26 +0000
(12:59 +0100)
committer
StevenPuttemans
<steven.puttemans@kuleuven.be>
Fri, 6 Mar 2015 12:13:53 +0000
(13:13 +0100)
modules/highgui/src/window_QT.cpp
patch
|
blob
|
history
modules/highgui/src/window_carbon.cpp
patch
|
blob
|
history
modules/highgui/src/window_cocoa.mm
patch
|
blob
|
history
modules/highgui/src/window_w32.cpp
patch
|
blob
|
history
diff --git
a/modules/highgui/src/window_QT.cpp
b/modules/highgui/src/window_QT.cpp
index
7f37e14
..
c89918e
100644
(file)
--- a/
modules/highgui/src/window_QT.cpp
+++ b/
modules/highgui/src/window_QT.cpp
@@
-464,6
+464,7
@@
static int icvInitSystem(int* c, char** v)
if (!QApplication::instance())
{
new QApplication(*c, v);
if (!QApplication::instance())
{
new QApplication(*c, v);
+ setlocale(LC_NUMERIC,"C");
qDebug() << "init done";
qDebug() << "init done";
diff --git
a/modules/highgui/src/window_carbon.cpp
b/modules/highgui/src/window_carbon.cpp
index
93d9e4f
..
bbc6007
100644
(file)
--- a/
modules/highgui/src/window_carbon.cpp
+++ b/
modules/highgui/src/window_carbon.cpp
@@
-146,6
+146,7
@@
CV_IMPL int cvInitSystem( int argc, char** argv )
}
wasInitialized = 1;
}
}
wasInitialized = 1;
}
+ setlocale(LC_NUMERIC,"C");
return 0;
}
return 0;
}
diff --git
a/modules/highgui/src/window_cocoa.mm
b/modules/highgui/src/window_cocoa.mm
index
414ed64
..
b9efe35
100644
(file)
--- a/
modules/highgui/src/window_cocoa.mm
+++ b/
modules/highgui/src/window_cocoa.mm
@@
-156,6
+156,8
@@
CV_IMPL int cvInitSystem( int , char** )
//[application finishLaunching];
//atexit(icvCocoaCleanup);
//[application finishLaunching];
//atexit(icvCocoaCleanup);
+ setlocale(LC_NUMERIC,"C");
+
return 0;
}
return 0;
}
diff --git
a/modules/highgui/src/window_w32.cpp
b/modules/highgui/src/window_w32.cpp
index
0878bff
..
29b1e41
100644
(file)
--- a/
modules/highgui/src/window_w32.cpp
+++ b/
modules/highgui/src/window_w32.cpp
@@
-260,6
+260,8
@@
CV_IMPL int cvInitSystem( int, char** )
wasInitialized = 1;
}
wasInitialized = 1;
}
+ setlocale(LC_NUMERIC,"C");
+
return 0;
}
return 0;
}