aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/gconv
diff options
context:
space:
mode:
authorAkihiro Tsukada <tskd08@gmail.com>2015-06-30 11:34:00 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-08-11 11:14:31 -0300
commitfc093f0f53c20a16e5a0e9d368fe2cde9ecc5c68 (patch)
tree0b62286143bcd45120e5499586c5fee9a95caea1 /contrib/gconv
parente57bf38e3674527cdd906c75699b8fdbde05c442 (diff)
contrib/gconv: fix wrong conversion to ARIB-STD-B24
Some symbol characters were not encoded correctly, though decoding was OK. Since v4l-utils/libdvbv5 does not use encoding into ARIB-STD-B24, the bug should not affect libdvbv5, but this fix supports some other applications. Signed-off-by: Akihiro Tsukada <tskd08@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'contrib/gconv')
-rw-r--r--contrib/gconv/arib-std-b24.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/contrib/gconv/arib-std-b24.c b/contrib/gconv/arib-std-b24.c
index 480e7f67..10b31b1f 100644
--- a/contrib/gconv/arib-std-b24.c
+++ b/contrib/gconv/arib-std-b24.c
@@ -1555,15 +1555,12 @@ find_extsym_idx (uint32_t ch)
goto next; \
} \
\
- /* prefer KANJI(>= 0x7521) or EXTRA_SYMBOLS over JISX0213_{1,2} */ \
+ /* KANJI shares some chars with EXTRA_SYMBOLS, but prefer extra symbols*/ \
r = find_extsym_idx (ch); \
if (r >= 0) \
{ \
ch = ucs4_to_extsym[r][1]; \
- if ((ch & 0xff00) >= 0x7a00) \
- r = out_kanji (&st, ch, &outptr, outend); \
- else \
- r = out_extsym (&st, ch, &outptr, outend); \
+ r = out_extsym (&st, ch, &outptr, outend); \
goto next; \
} \
\

Privacy Policy