AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-11869 Add fix to JIS8 and other ISO2022JP

Browse Source 
X-SVN-Rev: 38002
This commit is contained in:
Michael Ow 2015-09-23 05:22:40 +00:00
parent 90703e3819
commit eef7281848
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
icu4c/source/common/ucnv2022.cpp
View File

@ -1429,8 +1429,8 @@ static const StateEnum jpCharsetPref[]={
HWKANA_7BIT
};
/* preference order of JP charsets for version 4*/
static const StateEnum jpCharsetPref_ver4[]={
/* alternate preference order of JP charsets for version 2,3,4*/
static const StateEnum jpCharsetPref_alt[]={
ASCII,
JISX201,
ISO8859_1,
@ -1771,11 +1771,11 @@ getTrail:
}
/*
* version 4 of JP iso 2022 requires a different preference order for the possible charsets.
* version 2,3,4 of JP iso 2022 requires a different preference order for the possible charsets is there is no previous state set
*/
if (converterData->version == 4) {
for(i = 0; i < UPRV_LENGTHOF(jpCharsetPref_ver4); ++i) {
cs = (int8_t)jpCharsetPref_ver4[i];
if (cs == 0 && converterData->version >= 2) {
for(i = 0; i < UPRV_LENGTHOF(jpCharsetPref_alt); ++i) {
cs = (int8_t)jpCharsetPref_alt[i];
if(CSM(cs) & csm) {
choices[choiceCount++] = cs;
csm &= ~CSM(cs);