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
diff --git a/cups/transcode.c b/cups/transcode.c
index 58fab4b..11d4f7f 100644
--- a/cups/transcode.c
+++ b/cups/transcode.c
@@ -154,11 +154,15 @@
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 @@
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)
