diff options
| author | Rui Hirokawa <hirokawa@php.net> | 2002-11-22 23:34:55 +0000 |
|---|---|---|
| committer | Rui Hirokawa <hirokawa@php.net> | 2002-11-22 23:34:55 +0000 |
| commit | c38db57f3c0c0c1835ddaf926459b6281aadc59b (patch) | |
| tree | 972c2ec60bfd4d937dc5df8562e6dcc0dc8595e6 /ext/mbstring | |
| parent | 761bcbd751b930abb4ab6bac55089182cce82051 (diff) | |
| download | php-git-c38db57f3c0c0c1835ddaf926459b6281aadc59b.tar.gz | |
fixed some bugs in korean encoding conversion.
Diffstat (limited to 'ext/mbstring')
| -rw-r--r-- | ext/mbstring/mbfilter_kr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/mbstring/mbfilter_kr.c b/ext/mbstring/mbfilter_kr.c index 076ff4f9c1..425fb0d30e 100644 --- a/ext/mbstring/mbfilter_kr.c +++ b/ext/mbstring/mbfilter_kr.c @@ -132,6 +132,8 @@ mbfl_filt_conv_wchar_euckr(int c, mbfl_convert_filter *filter TSRMLS_DC) s = ucs_a3_uhc_table[c - ucs_a3_uhc_table_min]; } else if (c >= ucs_i_uhc_table_min && c < ucs_i_uhc_table_max) { s = ucs_i_uhc_table[c - ucs_i_uhc_table_min]; + } else if (c >= ucs_s_uhc_table_min && c < ucs_s_uhc_table_max) { + s = ucs_s_uhc_table[c - ucs_s_uhc_table_min]; } else if (c >= ucs_r1_uhc_table_min && c < ucs_r1_uhc_table_max) { s = ucs_r1_uhc_table[c - ucs_r1_uhc_table_min]; } else if (c >= ucs_r2_uhc_table_min && c < ucs_r2_uhc_table_max) { @@ -217,7 +219,7 @@ retry: } if (flag > 0 && c > 0x20 && c < 0x7f) { if (flag == 1){ - w = (c1 - 0x21)*178 + (c - 0x21) + 0x54; + w = (c1 - 0x21)*190 + (c - 0x41) + 0x80; if (w >= 0 && w < uhc2_ucs_table_size) { w = uhc2_ucs_table[w]; } else { @@ -419,7 +421,7 @@ mbfl_filt_conv_uhc_wchar(int c, mbfl_convert_filter *filter TSRMLS_DC) w = 0; } } else if ( c1 >= 0xa1 && c1 <= 0xc6 && flag > 0){ - w = (c1 - 0xa1)*178 + (c - ofst1[flag-1] + ofst2[flag-1]); + w = (c1 - 0xa1)*190 + (c - ofst1[flag-1] + ofst2[flag-1]); if (w >= 0 && w < uhc2_ucs_table_size) { w = uhc2_ucs_table[w]; } else { |