From 6e570deddc1d90938593ede5de7b28ddd9a6de51 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Sat, 29 Aug 2015 22:00:35 -0700 Subject: [PATCH] Fix font family name --- lime/text/Font.hx | 2 +- project/src/ExternalInterface.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lime/text/Font.hx b/lime/text/Font.hx index 5a102f9fd..acc6071ca 100644 --- a/lime/text/Font.hx +++ b/lime/text/Font.hx @@ -480,7 +480,7 @@ class Font { #if (cpp || neko || nodejs) private static var lime_font_get_ascender = System.loadPrime ("lime", "lime_font_get_ascender", "di"); private static var lime_font_get_descender = System.loadPrime ("lime", "lime_font_get_descender", "di"); - private static var lime_font_get_family_name = System.loadPrime ("lime", "lime_font_get_family_name", "ds"); + private static var lime_font_get_family_name = System.loadPrime ("lime", "lime_font_get_family_name", "do"); private static var lime_font_get_glyph_index = System.loadPrime ("lime", "lime_font_get_glyph_index", "dsi"); private static var lime_font_get_glyph_indices = System.loadPrime ("lime", "lime_font_get_glyph_indices", "dso"); private static var lime_font_get_glyph_metrics = System.loadPrime ("lime", "lime_font_get_glyph_metrics", "dio"); diff --git a/project/src/ExternalInterface.cpp b/project/src/ExternalInterface.cpp index a29d8991d..673199903 100644 --- a/project/src/ExternalInterface.cpp +++ b/project/src/ExternalInterface.cpp @@ -269,11 +269,11 @@ namespace lime { } - HxString lime_font_get_family_name (double fontHandle) { + value lime_font_get_family_name (double fontHandle) { #ifdef LIME_FREETYPE Font *font = (Font*)(intptr_t)fontHandle; - return HxString ((const char*)font->GetFamilyName ()); + return alloc_wstring (font->GetFamilyName ()); #else return 0; #endif