From 8d33a24cfe4540126ae00618cc691c610d398d8d Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 26 Feb 2013 17:11:07 +0000 Subject: implement CreateTypefaceFromFile git-svn-id: http://skia.googlecode.com/svn/trunk@7869 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/ports/SkFontHost_fontconfig.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/ports') diff --git a/src/ports/SkFontHost_fontconfig.cpp b/src/ports/SkFontHost_fontconfig.cpp index 60f6060b64..913d6efff6 100644 --- a/src/ports/SkFontHost_fontconfig.cpp +++ b/src/ports/SkFontHost_fontconfig.cpp @@ -187,8 +187,14 @@ SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) { } SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) { - SkASSERT(!"SkFontHost::CreateTypefaceFromFile unimplemented"); - return NULL; + SkTypeface* face = NULL; + SkFILEStream* stream = SkNEW_ARGS(SkFILEStream, (path)); + + if (stream->isValid()) { + face = CreateTypefaceFromStream(stream); + } + stream->unref(); + return face; } uint32_t SkFontHost::NextLogicalFont(SkFontID curr, SkFontID orig) { -- cgit v1.2.3