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:
@@ -114,8 +114,8 @@ IFSelect_ReturnStatus StepSelect_Activator::Do
|
||||
}
|
||||
Standard_Real Rmin=0., Rmax=0.;
|
||||
if (argc > 4) {
|
||||
Rmin = atof(pilot->Word(4).ToCString());
|
||||
Rmax = atof(pilot->Word(5).ToCString());
|
||||
Rmin = Atof(pilot->Word(4).ToCString());
|
||||
Rmax = Atof(pilot->Word(5).ToCString());
|
||||
if (Rmin <= 0 || Rmax <= 0) { cout<<"intervalle : donner reels > 0"<<endl; return IFSelect_RetError; }
|
||||
}
|
||||
Handle(StepSelect_FloatFormat) fm = new StepSelect_FloatFormat;
|
||||
|
@@ -36,9 +36,9 @@ StepSelect_FloatFormat::StepSelect_FloatFormat ()
|
||||
} else {
|
||||
char format[20];
|
||||
char pourcent = '%'; char point = '.';
|
||||
sprintf(format, "%c%d%c%dE",pourcent,digits+2,point,digits);
|
||||
Sprintf(format, "%c%d%c%dE",pourcent,digits+2,point,digits);
|
||||
themainform.AssignCat (format);
|
||||
sprintf(format, "%c%d%c%df",pourcent,digits+2,point,digits);
|
||||
Sprintf(format, "%c%d%c%df",pourcent,digits+2,point,digits);
|
||||
theformrange.AssignCat (format);
|
||||
}
|
||||
therangemin = 0.1; therangemax = 1000.;
|
||||
@@ -90,7 +90,7 @@ StepSelect_FloatFormat::StepSelect_FloatFormat ()
|
||||
lab.AssignCat (themainform);
|
||||
if (theformrange.Length() > 0) {
|
||||
char mess[30];
|
||||
sprintf(mess,", in range %f %f %s",
|
||||
Sprintf(mess,", in range %f %f %s",
|
||||
therangemin,therangemax,theformrange.ToCString());
|
||||
lab.AssignCat(mess);
|
||||
}
|
||||
|
Reference in New Issue
Block a user