OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0031940: Foundation Classes - TCollection_ExtendedString::Print() corrupts UNICODE strings and does not compile with C++20

Browse Source 
TCollection_ExtendedString::Print() now converts string into UTF-8
instead of printing character indexes.
This commit is contained in:
kgv 2020-11-18 14:56:59 +03:00 committed by bugmaster
parent b84b672185
commit 90e0d12d8f
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dox/upgrade/upgrade.md
View File

@ -2159,6 +2159,13 @@ Existing message files containing 8-bit characters (previously interpreted as ch
@section upgrade_occt760 Upgrade to OCCT 7.6.0
@subsection upgrade_760_extendedstring_cout Output of TCollection_ExtendedString to stream
Behavior of the method TCollection_ExtendedString::Print(Standard_OStream&) and corresponding operator << has changed.
Previously it printed all Latin-1 symbols (those in range 0x80-0xff) as '\0' (effectively loosing them); symbols above 0xff were converted to hex representation (formatted like XML Numeric Character Reference).
Now all symbols are sent to stream as UTF-8 byte sequences.
Existing code relying on old behavior, if any, shall be rewritten.
@subsection upgrade_760_trimming_surface Trimming surface
Geom_RectangularTrimmedSurface sequentially trimming in U and V directions already no longer loses the first trim.

16
src/TCollection/TCollection_ExtendedString.cxx
View File

@ -611,16 +611,12 @@ Standard_Integer TCollection_ExtendedString::Length() const
// ----------------------------------------------------------------------------
// Print
// ----------------------------------------------------------------------------
void TCollection_ExtendedString::Print(Standard_OStream& astream) const
{
// ASCII symbols (including extended Ascii) are printed as is;
// other Unicode characters are encoded as SGML numeric character references
for (Standard_Integer i = 0 ; i < mylength ; i++) {
Standard_ExtCharacter c = mystring[i];
if ( IsAnAscii(c) )
astream << ToCharacter(c);
else
astream << "&#" << c << ";";
void TCollection_ExtendedString::Print (Standard_OStream& theStream) const
{
if (mylength > 0)
{
const TCollection_AsciiString aUtf8 (mystring);
theStream << aUtf8;
}
}