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

0030694: Data Exchange - support non-standard GB2312-encoded STEP files

Browse Source 
STEPCAFControl_Reader::SourceCodePage() - added property defining text encoding
for converting names within STEPCAFControl_Reader::ReadNames() method.
Added associated "read.stepcaf.codepage" parameter,
which default value is Resource_UTF8, preserving current behavior.

Resource_FormatType enumeration has been extended by UTF8 and SystemLocale values.
Resource_Unicode - added conversion methods taking Resource_FormatType as argument.

GetName command has been corrected to NOT replace non-Latin symbols.
This commit is contained in:
kgv
2019-05-06 16:00:16 +03:00
committed by bugmaster
parent 48ba181118
commit e3249d8e5a
11 changed files with 265 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/Resource/Resource_Unicode.hxx
View File

@@ -107,47 +107,44 @@ public:
//! in Resource Manager "CharSet"
Standard_EXPORT static void ReadFormat();
//! Converts the non-ASCII C string fromstr to the
//! Unicode string of extended characters tostr.
//! fromstr is translated according to the format
//! (either ANSI, EUC, GB or SJIS) returned by the function GetFormat.
Standard_EXPORT static void ConvertFormatToUnicode (const Standard_CString fromstr, TCollection_ExtendedString& tostr);
//! Converts the non-ASCII C string (as specified by GetFormat()) to the Unicode string of extended characters.
static void ConvertFormatToUnicode (const Standard_CString theFromStr,
TCollection_ExtendedString& theToStr)
{
return ConvertFormatToUnicode (Resource_Unicode::GetFormat(), theFromStr, theToStr);
}
//! Converts the non-ASCII C string in specified format to the Unicode string of extended characters.
//! @param theFormat [in] source encoding
//! @param theFromStr [in] text to convert
//! @param theToStr [out] destination string
Standard_EXPORT static void ConvertFormatToUnicode (const Resource_FormatType theFormat,
const Standard_CString theFromStr,
TCollection_ExtendedString& theToStr);
//! Converts the Unicode string of extended characters to the non-ASCII string according to specified format.
//! You need more than twice the length of the source string to complete the conversion.
//! The function returns true if conversion is complete, i.e. the maximum number of characters is not reached before the end of conversion.
//! @param theFormat [in] destination encoding
//! @param theFromStr [in] text to convert
//! @param theToStr [out] destination buffer
//! @param theMaxSize [in] destination buffer length
Standard_EXPORT static Standard_Boolean ConvertUnicodeToFormat (const Resource_FormatType theFormat,
const TCollection_ExtendedString& theFromStr,
Standard_PCharacter& theToStr,
const Standard_Integer theMaxSize);
//! Converts the Unicode string of extended characters to the non-ASCII string according to the format returned by the function GetFormat.
//! @param theFromStr [in] text to convert
//! @param theToStr [out] destination buffer
//! @param theMaxSize [in] destination buffer length
static Standard_Boolean ConvertUnicodeToFormat (const TCollection_ExtendedString& theFromStr,
Standard_PCharacter& theToStr,
const Standard_Integer theMaxSize)
{
return ConvertUnicodeToFormat (Resource_Unicode::GetFormat(), theFromStr, theToStr, theMaxSize);
}
//! Converts the Unicode string of extended
//! characters fromstr to the non-ASCII C string
//! tostr according to the format (either ANSI, EUC,
//! GB or SJIS) returned by the function GetFormat.
//! maxsize limits the size of the string tostr to a
//! maximum number of characters. You need more
//! than twice the length of the string fromstr to
//! complete the conversion.
//! The function returns true if conversion is
//! complete, i.e. the maximum number of characters
//! maxsize is not reached by tostr before the end
//! of conversion of fromstr.
Standard_EXPORT static Standard_Boolean ConvertUnicodeToFormat (const TCollection_ExtendedString& fromstr, Standard_PCharacter& tostr, const Standard_Integer maxsize);
protected:
private:
};
#endif // _Resource_Unicode_HeaderFile