]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Relax the conversion of characters for OpenBSD.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Tue, 9 Dec 2014 20:57:28 +0000 (20:57 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Tue, 9 Dec 2014 20:57:28 +0000 (20:57 +0000)
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12330 a1ca3aef-8c08-0410-bb20-df032aa958be

cups/transcode.c

index 58fab4ba74e56adf748ad74bfdcc3e8040648df5..11d4f7f7c127f5fae753cd242fa0a5fe4c2ad1d7 100644 (file)
@@ -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)