104 lines
3.5 KiB
Diff
104 lines
3.5 KiB
Diff
Index: rtengine/dcraw.c
|
|
--- rtengine/dcraw.c.orig
|
|
+++ rtengine/dcraw.c
|
|
@@ -9853,8 +9853,8 @@ int CLASS main (int argc, const char **argv)
|
|
putenv ((char *) "TZ=UTC");
|
|
#endif
|
|
#ifdef LOCALEDIR
|
|
- setlocale (LC_CTYPE, "");
|
|
- setlocale (LC_MESSAGES, "");
|
|
+ //setlocale (LC_CTYPE, "");
|
|
+ //setlocale (LC_MESSAGES, "");
|
|
bindtextdomain ("dcraw", LOCALEDIR);
|
|
textdomain ("dcraw");
|
|
#endif
|
|
Index: rtengine/procparams.cc
|
|
--- rtengine/procparams.cc.orig
|
|
+++ rtengine/procparams.cc
|
|
@@ -7606,7 +7606,7 @@ int ProcParams::save(const Glib::ustring& fname, const
|
|
|
|
int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
|
|
{
|
|
- setlocale(LC_NUMERIC, "C"); // to set decimal point to "."
|
|
+ //setlocale(LC_NUMERIC, "C"); // to set decimal point to "."
|
|
|
|
if (fname.empty()) {
|
|
return 1;
|
|
causes double free...
|
|
|
|
Index: rtengine/rtthumbnail.cc
|
|
--- rtengine/rtthumbnail.cc.orig
|
|
+++ rtengine/rtthumbnail.cc
|
|
@@ -2057,7 +2057,7 @@ bool Thumbnail::readImage (const Glib::ustring& fname)
|
|
|
|
bool Thumbnail::readData (const Glib::ustring& fname)
|
|
{
|
|
- setlocale (LC_NUMERIC, "C"); // to set decimal point to "."
|
|
+ //setlocale (LC_NUMERIC, "C"); // to set decimal point to "."
|
|
Glib::KeyFile keyFile;
|
|
|
|
try {
|
|
Index: rtexif/rtexif.cc
|
|
--- rtexif/rtexif.cc.orig
|
|
+++ rtexif/rtexif.cc
|
|
@@ -2814,7 +2814,7 @@ void ExifManager::parse (bool isRaw, bool skipIgnored,
|
|
#endif
|
|
return;
|
|
}
|
|
- setlocale (LC_NUMERIC, "C"); // to set decimal point in sscanf
|
|
+ //setlocale (LC_NUMERIC, "C"); // to set decimal point in sscanf
|
|
|
|
if (order == ByteOrder::UNKNOWN) {
|
|
// read tiff header
|
|
Index: rtgui/cacheimagedata.cc
|
|
--- rtgui/cacheimagedata.cc.orig
|
|
+++ rtgui/cacheimagedata.cc
|
|
@@ -65,7 +65,7 @@ CacheImageData::CacheImageData() :
|
|
*/
|
|
int CacheImageData::load (const Glib::ustring& fname)
|
|
{
|
|
- setlocale(LC_NUMERIC, "C"); // to set decimal point to "."
|
|
+ //setlocale(LC_NUMERIC, "C"); // to set decimal point to "."
|
|
|
|
Glib::KeyFile keyFile;
|
|
|
|
Index: rtgui/multilangmgr.cc
|
|
--- rtgui/multilangmgr.cc.orig
|
|
+++ rtgui/multilangmgr.cc
|
|
@@ -134,8 +134,8 @@ void setGtkLanguage(const Glib::ustring &language)
|
|
lang = lang + ".UTF-8"; // According to Apple documentation, UTF-8 is a built-in encoding on all platforms on which macOS runs
|
|
|
|
g_setenv("LANG", lang.c_str(), true);
|
|
- setlocale(LC_ALL, lang.c_str());
|
|
- setlocale (LC_NUMERIC, "C"); // Force decimal point to dot.
|
|
+ //setlocale(LC_ALL, lang.c_str());
|
|
+ //setlocale (LC_NUMERIC, "C"); // Force decimal point to dot.
|
|
|
|
#else
|
|
|
|
@@ -296,9 +296,9 @@ Glib::ustring MultiLangMgr::getOSUserLanguage ()
|
|
|
|
// Set locale environment data
|
|
locale = locale + ".UTF-8"; // According to Apple documentation, UTF-8 is a built-in encoding on all platforms on which macOS runs
|
|
- g_setenv("LANG", locale.c_str(), true);
|
|
- setlocale(LC_ALL, locale.c_str());
|
|
- setlocale (LC_NUMERIC, "C"); // Force decimal point to dot.
|
|
+ //g_setenv("LANG", locale.c_str(), true);
|
|
+ //setlocale(LC_ALL, locale.c_str());
|
|
+ //setlocale (LC_NUMERIC, "C"); // Force decimal point to dot.
|
|
|
|
langName = localeToLang(locale);
|
|
|
|
Index: rtgui/options.cc
|
|
--- rtgui/options.cc.orig
|
|
+++ rtgui/options.cc
|
|
@@ -712,7 +712,7 @@ void Options::filterOutParsedExtensions()
|
|
|
|
void Options::readFromFile(Glib::ustring fname)
|
|
{
|
|
- setlocale(LC_NUMERIC, "C"); // to set decimal point to "."
|
|
+ //setlocale(LC_NUMERIC, "C"); // to set decimal point to "."
|
|
|
|
Glib::KeyFile keyFile;
|
|
|