Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1456)

Unified Diff: lily/open-type-font.cc

Issue 219780044: Replace most uses of scm_{from,to}_locale_* with fixed encodings (Closed)
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lily/main.cc ('k') | lily/open-type-font-scheme.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lily/open-type-font.cc
diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index c6ca27def33d1fcbcae0e9e9204db5379c290ff1..255d5e2b18ca8f36c1e30cc8bf15faf0ea2a6b6f 100644
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -77,7 +77,11 @@ load_scheme_table (char const *tag_str, FT_Face face)
string contents ((char const *)buffer, length);
contents = "(quote (" + contents + "))";
+#if GUILEV2
+ tab = scm_eval_string (scm_from_utf8_string (contents.c_str ()));
+#else
tab = scm_c_eval_string (contents.c_str ());
+#endif
free (buffer);
}
return tab;
@@ -337,7 +341,7 @@ Open_type_font::glyph_list () const
warning (_f ("FT_Get_Glyph_Name () error: %s",
freetype_error_string (code).c_str ()));
- *tail = scm_cons (scm_from_locale_string (name), SCM_EOL);
+ *tail = scm_cons (scm_from_ascii_string (name), SCM_EOL);
tail = SCM_CDRLOC (*tail);
}
« no previous file with comments | « lily/main.cc ('k') | lily/open-type-font-scheme.cc » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b