Issue 4568: Check in Texinfo from upstream svn://svn.savannah.gnu.org/texinfo/trunk...

[lilypond.git] / lily / pfb-scheme.cc

diff --git a/lily/pfb-scheme.cc b/lily/pfb-scheme.cc
index f8a6c1278f38ab7a530ef0d36533c1739401f889..ee26c9ec5a1a3b024e484ab918fb8a461c462908 100644 (file)
--- a/lily/pfb-scheme.cc
+++ b/lily/pfb-scheme.cc
@@ -6,6 +6,9 @@
 #include "main.hh"
 #include "warn.hh"
 
+using std::string;
+using std::vector;
+
 LY_DEFINE (ly_pfb_2_pfa, "ly:pfb->pfa",
            1, 0, 0, (SCM pfb_file_name),
            "Convert the contents of a Type@tie{}1 font in PFB format"
@@ -20,7 +23,7 @@ LY_DEFINE (ly_pfb_2_pfa, "ly:pfb->pfa",
   vector<char> pfb_string = gulp_file (file_name, 0);
   char *pfa = pfb2pfa ((Byte *) &pfb_string[0], pfb_string.size ());
 
-  SCM pfa_scm = scm_from_locale_string (pfa);
+  SCM pfa_scm = scm_from_latin1_string (pfa);
   free (pfa);
 
   debug_output ("]", false);
@@ -41,7 +44,7 @@ LY_DEFINE (ly_otf_2_cff, "ly:otf->cff",
   FT_Face face = open_ft_face (file_name, 0 /* index */);
   string table = get_otf_table (face, "CFF ");
 
-  SCM asscm = scm_from_locale_stringn ((char *) table.data (),
+  SCM asscm = scm_from_latin1_stringn ((char *) table.data (),
                                        table.length ());
 
   debug_output ("]", false);