mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-09 13:22:24 +03:00
0022898: IGES import fails in german environment
Added DRAW command dlocale to set and query current locale of the C subsystem Equivalents of C functions working with conversions of strings to/from reals added in Standard_CString, providing locale-independent behavior (using always "C" locale) In DRAW packages, calls to atof() and atoi() are replaced by direct calls to Draw::Atof() and Draw::Atoi(), respectively, instead of substituting by #define Use of atof(), strtod(), and *scanf() involving floating point conversions in OCCT code replaced by locale-independent Atof() and Strtod() Calls to sprintf() involving floating point in OCCT code are replaced by call to locale-independent Sprintf(), except a few places where converted strings are used immediately for display in the 3d viewer Changes of global locale are eliminated throughout OCCT code Proposed correction for GNU libC where v*printf_l functions are absent Added test case (bugs xde bug22898) for data exchange operations with non-standard locale Use xlocale on Mac OS X and within glibc Corrected strtod_l wrapper Generate error rather than warning Introduce Standard_CLocaleSentry replacement for removed OSD_Localizer Standard_CLocaleSentry - copy locale string Standard_CLocaleSentry - use _configthreadlocale on Windows Standard_CLocaleSentry::GetCLocale() - return locale_t rather than void* Corrected misprint in ~Standard_CLocaleSentry() Use French locale in bug22898 test case Mark test case as skipped if locale is unavailable on tested system. Use fr_FR locale for tests on Mac OS X
This commit is contained in:
@@ -153,7 +153,7 @@ void IGESData_GlobalSection::Init(const Handle(Interface_ParamSet)& params,
|
||||
if (fpt == Interface_ParamInteger) {
|
||||
// but a real is expected
|
||||
if ( i == 13 || i == 17 || i == 19 || i == 20)
|
||||
realval = atof(val);
|
||||
realval = Atof(val);
|
||||
intval = atoi(val);
|
||||
}
|
||||
|
||||
@@ -168,7 +168,7 @@ void IGESData_GlobalSection::Init(const Handle(Interface_ParamSet)& params,
|
||||
text[j++] = val[k];
|
||||
if (val[k] == '\0') break;
|
||||
}
|
||||
realval = atof(text);//Interface_FileReaderData::Fastof(val);
|
||||
realval = Atof(text);
|
||||
}
|
||||
|
||||
// if the param is a text
|
||||
|
@@ -1249,9 +1249,9 @@ Standard_Boolean IGESData_ParamReader::ReadingReal (const Standard_Integer num,
|
||||
text[j++] = orig[i];
|
||||
if (orig[i] == '\0') break;
|
||||
}
|
||||
if (FP.ParamType() == Interface_ParamReal) val = atof(text);
|
||||
//Interface_FileReaderData::Fastof(FP.CValue());
|
||||
else if (FP.ParamType() == Interface_ParamEnum) { // convention
|
||||
if (FP.ParamType() == Interface_ParamReal)
|
||||
val = Atof(text);
|
||||
else if (FP.ParamType() == Interface_ParamEnum) { // convention
|
||||
if (!pbrealform) {
|
||||
if (testconv < 0) testconv = 0; //Interface_Static::IVal("iges.convert.read");
|
||||
if (testconv > 0) {
|
||||
@@ -1266,7 +1266,7 @@ Standard_Boolean IGESData_ParamReader::ReadingReal (const Standard_Integer num,
|
||||
// mais avec exposant (sinon ce serait un entier)
|
||||
// -> un message avertissement + on ajoute le point puis on convertit
|
||||
|
||||
val = atof(text);//Interface_FileReaderData::Fastof(text);
|
||||
val = Atof(text);
|
||||
} else if (FP.ParamType() == Interface_ParamVoid) {
|
||||
val = 0.0; // DEFAULT
|
||||
} else {
|
||||
@@ -1317,8 +1317,8 @@ Standard_Boolean IGESData_ParamReader::ReadingReal
|
||||
text[j++] = orig[i];
|
||||
if (orig[i] == '\0') break;
|
||||
}
|
||||
if (FP.ParamType() == Interface_ParamReal) val = atof(text);
|
||||
//Interface_FileReaderData::Fastof(FP.CValue());
|
||||
if (FP.ParamType() == Interface_ParamReal)
|
||||
val = Atof(text);
|
||||
else if (FP.ParamType() == Interface_ParamEnum) { // convention
|
||||
if (!pbrealform) {
|
||||
if (testconv < 0) testconv = 0; //Interface_Static::IVal("iges.convert.read");
|
||||
@@ -1334,7 +1334,7 @@ Standard_Boolean IGESData_ParamReader::ReadingReal
|
||||
// mais avec exposant (sinon ce serait un entier)
|
||||
// -> un message avertissement + on ajoute le point puis on convertit
|
||||
|
||||
val = atof(text);//Interface_FileReaderData::Fastof(text);
|
||||
val = Atof(text);
|
||||
} else if (FP.ParamType() == Interface_ParamVoid) {
|
||||
val = 0.0; // DEFAULT
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user