michael@0: From cf855f31194ff071f2c787a7413d70a43f15f204 Mon Sep 17 00:00:00 2001 michael@0: From: Ehsan Akhgari michael@0: Date: Tue, 29 May 2012 15:39:55 -0400 michael@0: Subject: [PATCH] Bug 755869 - Re-apply patch from bug 719575 to fix clang michael@0: builds for the new Skia r=gw280 michael@0: michael@0: --- michael@0: gfx/skia/src/ports/SkFontHost_mac_coretext.cpp | 4 ++-- michael@0: 1 files changed, 2 insertions(+), 2 deletions(-) michael@0: michael@0: diff --git a/gfx/skia/src/ports/SkFontHost_mac_coretext.cpp b/gfx/skia/src/ports/SkFontHost_mac_coretext.cpp michael@0: index c43d1a6..ce5f409 100644 michael@0: --- a/gfx/skia/src/ports/SkFontHost_mac_coretext.cpp michael@0: +++ b/gfx/skia/src/ports/SkFontHost_mac_coretext.cpp michael@0: @@ -807,8 +807,8 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph& michael@0: void SkScalerContext_Mac::getVerticalOffset(CGGlyph glyphID, SkIPoint* offset) const { michael@0: CGSize vertOffset; michael@0: CTFontGetVerticalTranslationsForGlyphs(fCTVerticalFont, &glyphID, &vertOffset, 1); michael@0: - const SkPoint trans = {SkFloatToScalar(vertOffset.width), michael@0: - SkFloatToScalar(vertOffset.height)}; michael@0: + const SkPoint trans = {SkScalar(SkFloatToScalar(vertOffset.width)), michael@0: + SkScalar(SkFloatToScalar(vertOffset.height))}; michael@0: SkPoint floatOffset; michael@0: fVerticalMatrix.mapPoints(&floatOffset, &trans, 1); michael@0: if (!isSnowLeopard()) { michael@0: -- michael@0: 1.7.5.4 michael@0: