aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkFontHost_fontconfig.cpp
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-02-26 17:11:07 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-02-26 17:11:07 +0000
commit8d33a24cfe4540126ae00618cc691c610d398d8d (patch)
treef4474473d1eda6c1e11acc5bd1ae051821897ed6 /src/ports/SkFontHost_fontconfig.cpp
parent098b7ff2642471c715e6824a5d79d97f7cd45045 (diff)
implement CreateTypefaceFromFile
git-svn-id: http://skia.googlecode.com/svn/trunk@7869 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/ports/SkFontHost_fontconfig.cpp')
-rw-r--r--src/ports/SkFontHost_fontconfig.cpp10
1 files changed, 8 insertions, 2 deletions
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) {