mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-14 13:30:48 +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:
@@ -161,13 +161,13 @@ Standard_Boolean Voxel_Reader::ReadBoolAsciiVoxels(const TCollection_ExtendedStr
|
||||
fclose(f);
|
||||
return Standard_False;
|
||||
}
|
||||
x = atof(sx); y = atof(sy); z = atof(sz);
|
||||
x = Atof(sx); y = Atof(sy); z = Atof(sz);
|
||||
if (fscanf(f, "%s %s %s\n", sx, sy, sz) != 3)
|
||||
{
|
||||
fclose(f);
|
||||
return Standard_False;
|
||||
}
|
||||
xlen = atof(sx); ylen = atof(sy); zlen = atof(sz);
|
||||
xlen = Atof(sx); ylen = Atof(sy); zlen = Atof(sz);
|
||||
if (fscanf(f, "%d %d %d\n", &nbx, &nby, &nbz) != 3)
|
||||
{
|
||||
fclose(f);
|
||||
@@ -238,13 +238,13 @@ Standard_Boolean Voxel_Reader::ReadColorAsciiVoxels(const TCollection_ExtendedSt
|
||||
fclose(f);
|
||||
return Standard_False;
|
||||
}
|
||||
x = atof(sx); y = atof(sy); z = atof(sz);
|
||||
x = Atof(sx); y = Atof(sy); z = Atof(sz);
|
||||
if (fscanf(f, "%s %s %s\n", sx, sy, sz) != 3)
|
||||
{
|
||||
fclose(f);
|
||||
return Standard_False;
|
||||
}
|
||||
xlen = atof(sx); ylen = atof(sy); zlen = atof(sz);
|
||||
xlen = Atof(sx); ylen = Atof(sy); zlen = Atof(sz);
|
||||
if (fscanf(f, "%d %d %d\n", &nbx, &nby, &nbz) != 3)
|
||||
{
|
||||
fclose(f);
|
||||
@@ -315,13 +315,13 @@ Standard_Boolean Voxel_Reader::ReadFloatAsciiVoxels(const TCollection_ExtendedSt
|
||||
fclose(f);
|
||||
return Standard_False;
|
||||
}
|
||||
x = atof(sx); y = atof(sy); z = atof(sz);
|
||||
x = Atof(sx); y = Atof(sy); z = Atof(sz);
|
||||
if (fscanf(f, "%s %s %s\n", sx, sy, sz) != 3)
|
||||
{
|
||||
fclose(f);
|
||||
return Standard_False;
|
||||
}
|
||||
xlen = atof(sx); ylen = atof(sy); zlen = atof(sz);
|
||||
xlen = Atof(sx); ylen = Atof(sy); zlen = Atof(sz);
|
||||
if (fscanf(f, "%d %d %d\n", &nbx, &nby, &nbz) != 3)
|
||||
{
|
||||
fclose(f);
|
||||
@@ -359,7 +359,7 @@ Standard_Boolean Voxel_Reader::ReadFloatAsciiVoxels(const TCollection_ExtendedSt
|
||||
return Standard_False;
|
||||
}
|
||||
}
|
||||
value = atof(line);
|
||||
value = Atof(line);
|
||||
|
||||
// Set value
|
||||
if (!((Standard_ShortReal**)((Voxel_DS*)myFloatVoxels)->myData)[i1])
|
||||
|
Reference in New Issue
Block a user