gfx/skia/patches/archive/0011-Bug-719575-Fix-clang-build.patch

changeset 0
6474c204b198
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/gfx/skia/patches/archive/0011-Bug-719575-Fix-clang-build.patch	Wed Dec 31 06:09:35 2014 +0100
     1.3 @@ -0,0 +1,28 @@
     1.4 +From cf855f31194ff071f2c787a7413d70a43f15f204 Mon Sep 17 00:00:00 2001
     1.5 +From: Ehsan Akhgari <ehsan@mozilla.com>
     1.6 +Date: Tue, 29 May 2012 15:39:55 -0400
     1.7 +Subject: [PATCH] Bug 755869 - Re-apply patch from bug 719575 to fix clang
     1.8 + builds for the new Skia r=gw280
     1.9 +
    1.10 +---
    1.11 + gfx/skia/src/ports/SkFontHost_mac_coretext.cpp |    4 ++--
    1.12 + 1 files changed, 2 insertions(+), 2 deletions(-)
    1.13 +
    1.14 +diff --git a/gfx/skia/src/ports/SkFontHost_mac_coretext.cpp b/gfx/skia/src/ports/SkFontHost_mac_coretext.cpp
    1.15 +index c43d1a6..ce5f409 100644
    1.16 +--- a/gfx/skia/src/ports/SkFontHost_mac_coretext.cpp
    1.17 ++++ b/gfx/skia/src/ports/SkFontHost_mac_coretext.cpp
    1.18 +@@ -807,8 +807,8 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph&
    1.19 + void SkScalerContext_Mac::getVerticalOffset(CGGlyph glyphID, SkIPoint* offset) const {
    1.20 +     CGSize vertOffset;
    1.21 +     CTFontGetVerticalTranslationsForGlyphs(fCTVerticalFont, &glyphID, &vertOffset, 1);
    1.22 +-    const SkPoint trans = {SkFloatToScalar(vertOffset.width),
    1.23 +-                           SkFloatToScalar(vertOffset.height)};
    1.24 ++    const SkPoint trans = {SkScalar(SkFloatToScalar(vertOffset.width)),
    1.25 ++                           SkScalar(SkFloatToScalar(vertOffset.height))};
    1.26 +     SkPoint floatOffset;
    1.27 +     fVerticalMatrix.mapPoints(&floatOffset, &trans, 1);
    1.28 +     if (!isSnowLeopard()) {
    1.29 +-- 
    1.30 +1.7.5.4
    1.31 +

mercurial