organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-7138 Fix casting and update docs in ucmfiles.mk.

Browse source 
X-SVN-Rev: 27768
This commit is contained in:
Michael Ow 2010-03-03 18:09:22 +00:00
parent 126fb0e574
commit d566c2f498
2 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
icu4c/source/common/ucnvmbcs.c
View file

@ -1794,11 +1794,14 @@ ucnv_MBCSOpen(UConverter *cnv,
/* set a flag for GB 18030 mode, which changes the callback behavior */
cnv->options|=_MBCS_OPTION_GB18030;
}
} else if(uprv_strstr(pArgs->name, "KEIS")!=NULL) {
} else if((uprv_strstr(pArgs->name, "KEIS")!=NULL) || (uprv_strstr(pArgs->name, "keis")!=NULL)) {
/* set a flag for KEIS converter, which changes the SI/SO character sequence */
cnv->options|=_MBCS_OPTION_KEIS;
} else if(uprv_strstr(pArgs->name, "JEF")!=NULL) {
} else if((uprv_strstr(pArgs->name, "JEF")!=NULL) || (uprv_strstr(pArgs->name, "jef")!=NULL)) {
/* set a flag for JEF converter, which changes the SI/SO character sequence */
cnv->options|=_MBCS_OPTION_JEF;
} else if(uprv_strstr(pArgs->name, "JIPS")!=NULL) {
} else if((uprv_strstr(pArgs->name, "JIPS")!=NULL) || (uprv_strstr(pArgs->name, "jips")!=NULL)) {
/* set a flag for JIPS converter, which changes the SI/SO character sequence */
cnv->options|=_MBCS_OPTION_JIPS;
}
@ -4101,11 +4104,11 @@ ucnv_MBCSFromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs,
} else {
/* change from double-byte mode to single-byte */
if (si_value_length == 1) {
value|=si_value[0]<<8;
value|=(uint32_t)si_value[0]<<8;
length = 2;
} else if (si_value_length == 2) {
value|=si_value[1]<<8;
value|=si_value[0]<<16;
value|=(uint32_t)si_value[1]<<8;
value|=(uint32_t)si_value[0]<<16;
length = 3;
}
prevLength=1;
@ -4116,11 +4119,11 @@ ucnv_MBCSFromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs,
} else {
/* change from single-byte mode to double-byte */
if (so_value_length == 1) {
value|=so_value[0]<<16;
value|=(uint32_t)so_value[0]<<16;
length = 3;
} else if (so_value_length == 2) {
value|=so_value[1]<<16;
value|=so_value[0]<<24;
value|=(uint32_t)so_value[1]<<16;
value|=(uint32_t)so_value[0]<<24;
length = 4;
}
prevLength=2;
@ -4333,11 +4336,11 @@ getTrail:
} else {
/* change from double-byte mode to single-byte */
if (si_value_length == 1) {
value|=si_value[0]<<8;
value|=(uint32_t)si_value[0]<<8;
length = 2;
} else if (si_value_length == 2) {
value|=si_value[1]<<8;
value|=si_value[0]<<16;
value|=(uint32_t)si_value[1]<<8;
value|=(uint32_t)si_value[0]<<16;
length = 3;
}
prevLength=1;
@ -4348,11 +4351,11 @@ getTrail:
} else {
/* change from single-byte mode to double-byte */
if (so_value_length == 1) {
value|=so_value[0]<<16;
value|=(uint32_t)so_value[0]<<16;
length = 3;
} else if (so_value_length == 2) {
value|=so_value[1]<<16;
value|=so_value[0]<<24;
value|=(uint32_t)so_value[1]<<16;
value|=(uint32_t)so_value[0]<<24;
length = 4;
}
prevLength=2;

8
icu4c/source/data/mappings/ucmfiles.mk
View file

@ -16,9 +16,13 @@
# _____________________________________________________
# | UCM_SOURCE_LOCAL = myconverter.ucm ...
#
# * To add EBCDIC coverters that use different SI/SO characters:
# * To add EBCDIC converters that uses different SI/SO characters:
# Note: ICU is updated to handle three EBCDIC converters (JIPS, KEIS, and JEF) which uses
# different SI/SO characters than the "standard" ones: 0xf/0xe.
# This behaviour is done in the mbcs converter code and is turned on if for that converter
# if the name contains either JIPS, KEIS, or JEF. (e.g. my_KEIS_converter.ucm)
# _____________________________________________________
# | UCM_SOURCE_EBCDIC_IGNORE_SISO_LOCAL = my_keis_converter.ucm
# | UCM_SOURCE_EBCDIC_IGNORE_SISO_LOCAL = my_KEIS_converter.ucm
#
# * To REPLACE the default list and only build with a few
# converters: