1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correctly flag remaining chars for the ICU codec

Browse Source 
This will help us get rid of an extremely ugly hack in
QTextStream, where we copy the state.

Change-Id: If3e15eeb4e35c8607be54dd11c09ddfed87a4d93
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Lars Knoll 2020-04-28 11:47:21 +02:00
parent 0a02a598a4
commit be04ee67de
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/codecs/qicucodec.cpp
View File

@ -614,6 +614,9 @@ QString QIcuCodec::convertToUnicode(const char *chars, int length, QTextCodec::C
qDebug("convertToUnicode failed: %s", u_errorName(error));
break;
}
// flag the state if we have incomplete input
if (error == U_TRUNCATED_CHAR_FOUND)
state->remainingChars = 1;
convertedChars = uc - (UChar *)string.data();
if (chars >= end)
@ -649,6 +652,10 @@ QByteArray QIcuCodec::convertFromUnicode(const QChar *unicode, int length, QText
nullptr, false, &error);
if (!U_SUCCESS(error))
qDebug("convertFromUnicode failed: %s", u_errorName(error));
// flag the state if we have incomplete input
if (error == U_TRUNCATED_CHAR_FOUND)
state->remainingChars = 1;
convertedChars = ch - string.data();
if (uc >= end)
break;