Index: src/ports/SkFontHost_mac.cpp |
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp |
index 2d985f94638c07a980aeed23e4af552c7bcf00e3..72a32742dc557b12fe583e026fd55512d06f8794 100755 |
--- a/src/ports/SkFontHost_mac.cpp |
+++ b/src/ports/SkFontHost_mac.cpp |
@@ -958,7 +958,7 @@ void SkScalerContext_Mac::generateAdvance(SkGlyph* glyph) { |
} |
void SkScalerContext_Mac::generateMetrics(SkGlyph* glyph) { |
- const CGGlyph cgGlyph = (CGGlyph) glyph->getGlyphID(fBaseGlyphCount); |
+ const CGGlyph cgGlyph = (CGGlyph) glyph->getGlyphID(); |
glyph->zeroMetrics(); |
// The following block produces cgAdvance in CG units (pixels, y up). |
@@ -1203,7 +1203,7 @@ template <typename T> T* SkTAddByteOffset(T* ptr, size_t byteOffset) { |
} |
void SkScalerContext_Mac::generateImage(const SkGlyph& glyph) { |
- CGGlyph cgGlyph = (CGGlyph) glyph.getGlyphID(fBaseGlyphCount); |
+ CGGlyph cgGlyph = (CGGlyph) glyph.getGlyphID(); |
// FIXME: lcd smoothed un-hinted rasterization unsupported. |
bool generateA8FromLCD = fRec.getHinting() != SkPaint::kNo_Hinting; |
@@ -1342,7 +1342,7 @@ void SkScalerContext_Mac::generatePath(const SkGlyph& glyph, SkPath* path) { |
font = CTFontCreateCopyWithAttributes(fCTFont, 1, &xform, NULL); |
} |
- CGGlyph cgGlyph = (CGGlyph)glyph.getGlyphID(fBaseGlyphCount); |
+ CGGlyph cgGlyph = (CGGlyph)glyph.getGlyphID(); |
AutoCFRelease<CGPathRef> cgPath(CTFontCreatePathForGlyph(font, cgGlyph, NULL)); |
path->reset(); |