From 4bc72f879f2eb5520f444ac3c0f937c1ebc43a3f Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser <26235500+Albrecht-S@users.noreply.github.com> Date: Sun, 9 Aug 2026 23:14:58 +0200 Subject: [PATCH] Remove redundant condition from src/xutf8/ucs2fontmap.c (#1549) --- src/xutf8/ucs2fontmap.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/xutf8/ucs2fontmap.c b/src/xutf8/ucs2fontmap.c index 50f85e551..1b53bbdda 100644 --- a/src/xutf8/ucs2fontmap.c +++ b/src/xutf8/ucs2fontmap.c @@ -1,6 +1,7 @@ /* * Author: Jean-Marc Lienher ( http://oksid.ch ) * Copyright 2000-2003 by O'ksi'D. + * Copyright 2026 by Bill Spitzak and others. * * This library is free software. Distribution and use rights are outlined in * the file "COPYING" which should have been included with this file. If this @@ -13,6 +14,11 @@ * https://www.fltk.org/bugs.php */ +/* Note: This file - or parts of it - must have been generated by a program + * at some time in the past, see src/xutf8/utils/conv_gen.c . + * However, it has been significantly edited since then. + * Albrecht-S, Aug 9, 2026. See GitHub Issue #1549. +*/ #include #include @@ -335,7 +341,7 @@ static int encoding_number(const char *enc) { } else if (!strcmp(enc, "ksc5601.1987-0")) { return 16; } else if (!strcmp(enc, "gb2312.1980-0") || !strcmp(enc, "gb2312.80-0") || - !strcmp(enc, "gb2312.80&gb8565.88") || !strcmp(enc, "gb2312.80-0")) + !strcmp(enc, "gb2312.80&gb8565.88")) { return 17; } else if (!strcmp(enc, "jisx0201.1976-0")) {