From 52958fdb98e62e3e66c14275761d6ef7efa5902b Mon Sep 17 00:00:00 2001 From: msweet Date: Tue, 9 Dec 2014 20:57:28 +0000 Subject: [PATCH] Relax the conversion of characters for OpenBSD. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12330 a1ca3aef-8c08-0410-bb20-df032aa958be --- cups/transcode.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/cups/transcode.c b/cups/transcode.c index 58fab4ba7..11d4f7f7c 100644 --- a/cups/transcode.c +++ b/cups/transcode.c @@ -154,11 +154,15 @@ cupsCharsetToUTF8( if (map_encoding != encoding) { + char toset[1024]; /* Destination character set */ + _cupsCharmapFlush(); + snprintf(toset, sizeof(toset), "%s//IGNORE", _cupsEncodingName(encoding)); + + map_encoding = encoding; map_from_utf8 = iconv_open(_cupsEncodingName(encoding), "UTF-8"); - map_to_utf8 = iconv_open("UTF-8", _cupsEncodingName(encoding)); - map_encoding = encoding; + map_to_utf8 = iconv_open("UTF-8", toset); } if (map_to_utf8 != (iconv_t)-1) @@ -279,11 +283,15 @@ cupsUTF8ToCharset( if (map_encoding != encoding) { + char toset[1024]; /* Destination character set */ + _cupsCharmapFlush(); - map_from_utf8 = iconv_open(_cupsEncodingName(encoding), "UTF-8"); - map_to_utf8 = iconv_open("UTF-8", _cupsEncodingName(encoding)); + snprintf(toset, sizeof(toset), "%s//IGNORE", _cupsEncodingName(encoding)); + map_encoding = encoding; + map_from_utf8 = iconv_open(_cupsEncodingName(encoding), "UTF-8"); + map_to_utf8 = iconv_open("UTF-8", toset); } if (map_from_utf8 != (iconv_t)-1) -- 2.39.5