| rjw | 1f88458 | 2022-01-06 17:20:42 +0800 | [diff] [blame^] | 1 | From fc289ab69c6d7e4ad489172509a85f68afec43ea Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Fri, 29 Jul 2016 03:19:39 -0400 |
| 4 | Subject: [PATCH] fix narrowing conversion error |
| 5 | |
| 6 | While gcc6 used, build old groff (for anti-GPLv3 reasons) failed: |
| 7 | ..... |
| 8 | |groff-1.18.1.4/src/devices/grolbp/charset.h:69:1: error: narrowing |
| 9 | conversion of '130' from 'int' to 'char' inside { } [-Wnarrowing] |
| 10 | ...... |
| 11 | |
| 12 | In upstream git://git.savannah.gnu.org/groff.git, |
| 13 | the following commit fix the issue, but the license is GPLV3, |
| 14 | we could not backport it to the old groff which license is GPLV2. |
| 15 | ... |
| 16 | commit d180038ae0da19655bc2760ae2043efa0550a76c |
| 17 | Author: Werner LEMBERG <wl@gnu.org> |
| 18 | Date: Wed Apr 16 21:11:07 2003 +0000 |
| 19 | * src/devices/grolbp/charset.h (symset): Use `unsigned char'. |
| 20 | ... |
| 21 | |
| 22 | We use another different way to fix the issue. |
| 23 | |
| 24 | Upstream-Status: Pending |
| 25 | |
| 26 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 27 | --- |
| 28 | src/devices/grolbp/charset.h | 2 +- |
| 29 | src/devices/grolbp/lbp.cc | 4 ++-- |
| 30 | 2 files changed, 3 insertions(+), 3 deletions(-) |
| 31 | |
| 32 | diff --git a/src/devices/grolbp/charset.h b/src/devices/grolbp/charset.h |
| 33 | index adc76f4..e9c6c5b 100644 |
| 34 | --- a/src/devices/grolbp/charset.h |
| 35 | +++ b/src/devices/grolbp/charset.h |
| 36 | @@ -1,6 +1,6 @@ |
| 37 | // Definition of the WP54 character set |
| 38 | |
| 39 | -char symset[] = { |
| 40 | +int symset[] = { |
| 41 | 0x57,0x50,0x35,0x34,0x00,0x41,0x76,0x61,0x6e,0x74,0x47,0x61, |
| 42 | 0x72,0x64,0x65,0x2d,0x42,0x6f,0x6f,0x6b,0x00,0x41,0x76, |
| 43 | 0x61,0x6e,0x74,0x47,0x61,0x72,0x64,0x65,0x2d,0x44,0x65, |
| 44 | diff --git a/src/devices/grolbp/lbp.cc b/src/devices/grolbp/lbp.cc |
| 45 | index 76db32a..00d4ca7 100644 |
| 46 | --- a/src/devices/grolbp/lbp.cc |
| 47 | +++ b/src/devices/grolbp/lbp.cc |
| 48 | @@ -152,8 +152,8 @@ static void wp54charset() |
| 49 | { |
| 50 | unsigned int i; |
| 51 | lbpputs("\033[714;100;29;0;32;120.}"); |
| 52 | - for (i = 0; i < sizeof(symset); i++) |
| 53 | - lbpputc(symset[i]); |
| 54 | + for (i = 0; i < sizeof(symset)/sizeof(symset[0]); i++) |
| 55 | + lbpputc((char)symset[i]&0xFF); |
| 56 | lbpputs("\033[100;0 D"); |
| 57 | return; |
| 58 | } |
| 59 | -- |
| 60 | 2.8.1 |
| 61 | |