OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0022898: IGES import fails in german environment

Browse Source 
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:
abv
2013-02-01 18:41:16 +04:00
parent 3bea4c165c
commit 91322f44fd
203 changed files with 2707 additions and 2807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/PCDM/PCDM_RetrievalDriver.cxx
View File

@@ -70,15 +70,10 @@ void PCDM_RetrievalDriver::RaiseIfUnknownTypes(const Handle(Storage_Schema)& aSc
//purpose :
//=======================================================================
void PCDM_RetrievalDriver::Read(const TCollection_ExtendedString& theFileName,
void PCDM_RetrievalDriver::Read(const TCollection_ExtendedString& theFileName,
const Handle(CDM_Document)& aNewDocument,
const Handle(CDM_Application)& theApplication) {
char *oldnum,*plocal ;
plocal = setlocale(LC_NUMERIC, NULL) ;
oldnum = new char[strlen(plocal)+1] ;
strcpy(oldnum,plocal);
const Handle(CDM_Application)& theApplication)
{
Standard_SStream aMsg;
Standard_Boolean Failure=Standard_False;
Handle(Storage_Schema) aSchema;
@@ -201,10 +196,6 @@ void PCDM_RetrievalDriver::Read(const TCollection_ExtendedString& theFileName,
// read comments
aNewDocument->SetComments(theData->Comments());
// on remet le LC_NUMERIC a la precedente valeur
setlocale(LC_NUMERIC, oldnum) ;
delete[] oldnum;
PCDM_DriverError_Raise_if(Failure,aMsg);
}

14
src/PCDM/PCDM_StorageDriver.cxx
View File

@@ -39,14 +39,8 @@
void PCDM_StorageDriver::Write(const Handle(CDM_Document)& aDocument, const TCollection_ExtendedString& aFileName) {
// on sauvegarde l'ancien LC_NUMERIC
char *oldnum,*plocal ;
plocal = setlocale(LC_NUMERIC, NULL) ;
oldnum = new char[strlen(plocal)+1] ;
strcpy(oldnum,plocal);
void PCDM_StorageDriver::Write(const Handle(CDM_Document)& aDocument, const TCollection_ExtendedString& aFileName)
{
Handle(Storage_Schema) theSchema=PCDM::Schema(SchemaName(),aDocument->Application());
TColStd_SequenceOfExtendedString theExtensions;
@@ -104,10 +98,6 @@ void PCDM_StorageDriver::Write(const Handle(CDM_Document)& aDocument, const TCol
theSchema->Write(theFile,theData);
theFile.Close();
// on remet le LC_NUMERIC a la precedente valeur
setlocale(LC_NUMERIC, oldnum) ;
delete[] oldnum;
if ( theData->ErrorStatus() != Storage_VSOk )
PCDM_DriverError::Raise(theData->ErrorStatusExtension().ToCString());
}