From b7b3b68d5b171eea6948f376f9400a64da50a9d6 Mon Sep 17 00:00:00 2001 From: konn Date: Sat, 2 Feb 2008 10:38:34 +0000 Subject: [PATCH] * for DoCoMo git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1802 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- src/chxj_emoji.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/chxj_emoji.c b/src/chxj_emoji.c index ba167819..168b6b86 100644 --- a/src/chxj_emoji.c +++ b/src/chxj_emoji.c @@ -2360,6 +2360,7 @@ dbg_r = r; else if ((0xf0 & src[i]) == 0xe0) { DBG(r, "DETECT UTF8 BIN"); if ((0xff & src[i]) == 0xee) { +DBG(r, "Yes EMOJI KAMO"); tmp = is_emoji_as_imode2imode_utf8_bin(r, &src[i]); if (tmp) { char *meta_emoji; @@ -2474,7 +2475,7 @@ chxj_bsearch_imode2imode_emoji( int (*cmp)(const char *, emoji_t *)) { int left = 0; - int right = EMOJI_EZWEB2IMODE_COUNT - 1; + int right = EMOJI_COUNT - 1; int mid; int ret; mod_chxj_config *dconf; @@ -2512,6 +2513,7 @@ cmp_as_imode2imode_utf8_bin( long src_value = 0; long target_value = 0; +#if 1 src_value = (long)(0xff & src[0]); src_value <<= 8; src_value |= (long)(0xff & src[1]); @@ -2523,7 +2525,12 @@ cmp_as_imode2imode_utf8_bin( target_value |= (long)(0xff & target->imode.utf8.hex[1]); target_value <<= 8; target_value |= (long)(0xff & target->imode.utf8.hex[2]); - +#else + src_value = strtol(src, NULL, 16); + target_value = strtol(target->imode.utf8.hex_string, NULL, 16); +#endif +DBG(dbg_r, "src_value =[%d] target_value = [%d]", src_value, target_value); +DBG(dbg_r, "src_value=[%.3s] target_value=[%s]", src, target->imode.utf8.hex_string); return src_value - target_value; } -- 2.11.0