source file of the GNU LilyPond music typesetter
- (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include <cstdlib>
#include <cstdio>
#include <cstring>
+using namespace std;
#include "program-option.hh"
#include "source-file.hh"
SCM_ASSERT_TYPE (scm_is_string (pfb_file_name), pfb_file_name,
SCM_ARG1, __FUNCTION__, "string");
- String file_name = ly_scm2string (pfb_file_name);
- int len = -1;
+ string file_name = ly_scm2string (pfb_file_name);
if (be_verbose_global)
progress_indication ("[" + file_name);
- char *str = gulp_file (file_name, &len);
- char *pfa = pfb2pfa ((Byte *)str, len);
-
- SCM pfa_scm = scm_makfrom0str (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);
free (pfa);
- delete str;
+
if (be_verbose_global)
progress_indication ("]");
SCM_ASSERT_TYPE (scm_is_string (otf_file_name), otf_file_name,
SCM_ARG1, __FUNCTION__, "string");
- String file_name = ly_scm2string (otf_file_name);
+ string file_name = ly_scm2string (otf_file_name);
if (be_verbose_global)
progress_indication ("[" + file_name);
FT_Face face = open_ft_face (file_name);
- String table = get_otf_table (face, "CFF ");
+ string table = get_otf_table (face, "CFF ");
- SCM asscm = scm_from_locale_stringn ((char *) table.get_bytes (),
+ SCM asscm = scm_from_locale_stringn ((char *) table.data (),
table.length ());
if (be_verbose_global)