diff options
| author |  george@mozilla.com <george@mozilla.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-25 19:16:49 +0000 |
|---|---|---|
| committer | george@mozilla.com <george@mozilla.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-25 19:16:49 +0000 |
| commit | b1047839e0f1fdd769340f199cedef732d51e1f6 (patch) | |
| tree | 12e986e8243a6cae5ccabf7ee1793653148ee1c2 | |
| parent | ece0100c22e2184245efc380c8dede0fe47517b2 (diff) | |
Use CGToScalar instead of SkFloatToScalar as CGFloat can be either double or float.
Review URL: https://codereview.appspot.com/6451049
git-svn-id: http://skia.googlecode.com/svn/trunk@4766 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/ports/SkFontHost_mac_coretext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ports/SkFontHost_mac_coretext.cpp b/src/ports/SkFontHost_mac_coretext.cpp index ce5d907657..cdd4a74d7e 100644 --- a/src/ports/SkFontHost_mac_coretext.cpp +++ b/src/ports/SkFontHost_mac_coretext.cpp @@ -805,8 +805,8 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph& void SkScalerContext_Mac::getVerticalOffset(CGGlyph glyphID, SkIPoint* offset) const { CGSize vertOffset; CTFontGetVerticalTranslationsForGlyphs(fCTVerticalFont, &glyphID, &vertOffset, 1); - const SkPoint trans = {SkFloatToScalar(vertOffset.width), - SkFloatToScalar(vertOffset.height)}; + const SkPoint trans = {CGToScalar(vertOffset.width), + CGToScalar(vertOffset.height)}; SkPoint floatOffset; fVerticalMatrix.mapPoints(&floatOffset, &trans, 1); if (!isSnowLeopard()) { |