diff options
Diffstat (limited to 'src/ports/SkFontHost_FreeType_common.cpp')
| -rw-r--r-- | src/ports/SkFontHost_FreeType_common.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/ports/SkFontHost_FreeType_common.cpp b/src/ports/SkFontHost_FreeType_common.cpp index c17db94d6b..2a7a4baaac 100644 --- a/src/ports/SkFontHost_FreeType_common.cpp +++ b/src/ports/SkFontHost_FreeType_common.cpp @@ -637,16 +637,14 @@ int line_proc(const FT_Vector* pt, void* ctx) { return 0; } -int quad_proc(const FT_Vector* pt0, const FT_Vector* pt1, - void* ctx) { +int quad_proc(const FT_Vector* pt0, const FT_Vector* pt1, void* ctx) { SkPath* path = (SkPath*)ctx; path->quadTo(SkFDot6ToScalar(pt0->x), -SkFDot6ToScalar(pt0->y), SkFDot6ToScalar(pt1->x), -SkFDot6ToScalar(pt1->y)); return 0; } -int cubic_proc(const FT_Vector* pt0, const FT_Vector* pt1, - const FT_Vector* pt2, void* ctx) { +int cubic_proc(const FT_Vector* pt0, const FT_Vector* pt1, const FT_Vector* pt2, void* ctx) { SkPath* path = (SkPath*)ctx; path->cubicTo(SkFDot6ToScalar(pt0->x), -SkFDot6ToScalar(pt0->y), SkFDot6ToScalar(pt1->x), -SkFDot6ToScalar(pt1->y), @@ -656,7 +654,7 @@ int cubic_proc(const FT_Vector* pt0, const FT_Vector* pt1, } // namespace -void SkScalerContext_FreeType_Base::generateGlyphPath(FT_Face face, SkPath* path) { +bool SkScalerContext_FreeType_Base::generateGlyphPath(FT_Face face, SkPath* path) { FT_Outline_Funcs funcs; funcs.move_to = move_proc; @@ -670,8 +668,9 @@ void SkScalerContext_FreeType_Base::generateGlyphPath(FT_Face face, SkPath* path if (err != 0) { path->reset(); - return; + return false; } path->close(); + return true; } |