From b13cb2cdedb224458e8c5932bccc7cf9bac18081 Mon Sep 17 00:00:00 2001
From: Akihiro Tsukada <tskd08@gmail.com>
Date: Sat, 13 Apr 2024 22:36:01 +0900
Subject: [PATCH] v4l-utils/contrib/gconv: fix conversion errors on
 ARIB-STD-B24 strings

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@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
 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 704c2d48c..56e46612a 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)
-- 
GitLab