From patchwork Tue Jun 30 14:34:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiro TSUKADA X-Patchwork-Id: 6696611 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0E6EA9F3A0 for ; Tue, 30 Jun 2015 14:35:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3520420617 for ; Tue, 30 Jun 2015 14:35:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 49F2F20621 for ; Tue, 30 Jun 2015 14:35:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753480AbbF3OfK (ORCPT ); Tue, 30 Jun 2015 10:35:10 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:32998 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751447AbbF3OfG (ORCPT ); Tue, 30 Jun 2015 10:35:06 -0400 Received: by pdjd13 with SMTP id d13so7313682pdj.0 for ; Tue, 30 Jun 2015 07:35:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=uPH+1TIOEn4eHRj1Jnfyt1wSxnHwpUZimZsC7b5fP7E=; b=x9+EF/peDi8yYNSjC8VSJ6tLoeUsZR4/8c+Hj/U/k4MRQYAJhQDYTrtiZDaspALbti Xdj9BwB9p4qv1mATRdSTLij2VTOPBCvI3QE6BmjDPD8fDQc7HmZaYQF9ok5aK+AF4+XD MtJvlioKRzhwYcQgQ2MktDvcG6Q1Pr6G1JmLy3fUPkYa5s6UBOyCB+qvs1VNXdVakYmS dbHmtZAMcN+9Rz820P7L9ymoTopsoqYyi2l3DQHvxPPk3mVLKH0HaHOGQ/1/MAz307u/ 7j9SeCUsVUqnrT8bAcI19bTY24MP/q5vtHLb7DnXCNZQ2ghjluNF7Ca4hkHz/Jz1O9vX Mf4g== X-Received: by 10.68.250.194 with SMTP id ze2mr44711996pbc.24.1435674904456; Tue, 30 Jun 2015 07:35:04 -0700 (PDT) Received: from seabird.localdomain (softbank219203027033.bbtec.net. [219.203.27.33]) by mx.google.com with ESMTPSA id mb4sm45902031pdb.63.2015.06.30.07.35.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 30 Jun 2015 07:35:03 -0700 (PDT) From: tskd08@gmail.com To: linux-media@vger.kernel.org Cc: m.chehab@samsung.com, Akihiro Tsukada Subject: [PATCH] v4l-utils/contrib/gconv: fix wrong conversion to ARIB-STD-B24 Date: Tue, 30 Jun 2015 23:34:00 +0900 Message-Id: <1435674840-27470-1-git-send-email-tskd08@gmail.com> X-Mailer: git-send-email 2.4.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Akihiro Tsukada 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 --- contrib/gconv/arib-std-b24.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/contrib/gconv/arib-std-b24.c b/contrib/gconv/arib-std-b24.c index fa3ced4..b9d7588 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; \ } \ \