[PATCH] v4l-utils/contrib/gconv: fix conversion errors on ARIB-STD-B24 strings

From: tskd08
Date: Sat Apr 13 2024 - 09:39:19 EST


From: Akihiro Tsukada <tskd08@xxxxxxxxx>

Some ARIB strings in operation requires that
codepoints from the 'extra symbols' charset fallback to 'kanji'.
Remove the range check for 'extra symbols' to accept those strings.

Signed-off-by: Akihiro Tsukada <tskd08@xxxxxxxxx>
---
contrib/gconv/arib-std-b24.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contrib/gconv/arib-std-b24.c b/contrib/gconv/arib-std-b24.c
index 6a2e6292..18f06283 100644
--- a/contrib/gconv/arib-std-b24.c
+++ b/contrib/gconv/arib-std-b24.c
@@ -494,8 +494,10 @@ b24_char_conv (int set, unsigned char c1, unsigned char c2, uint32_t *out)

return 1;
}
- if (set == EXTRA_SYMBOLS_set)
- return 0;
+ /* Some ARIB strings somehow require that
+ * EXTRA_SYMBOLS codepoints fallback to KANJI_set.
+ * so just fall through here.
+ */

/* non-JISX0213 modification. (combining chars) */
if (c1 == 0x22 && c2 == 0x7e)
--
2.44.0