From 8f4d2306fa866a26f9448048ff63f692b2ba43aa Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Tue, 17 Dec 2013 16:44:46 +0000 Subject: remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats To keep the CL (slightly) managable, this does not make any changes to existing macros (e.g. SkScalarMul). Just tackling #ifdef constructs this time around. BUG= R=bsalomon@google.com, caryclark@google.com Review URL: https://codereview.chromium.org/117053002 git-svn-id: http://skia.googlecode.com/svn/trunk@12712 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/ports/SkHarfBuzzFont.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/ports/SkHarfBuzzFont.cpp') diff --git a/src/ports/SkHarfBuzzFont.cpp b/src/ports/SkHarfBuzzFont.cpp index 8f483f5d2f..95b9e445a0 100644 --- a/src/ports/SkHarfBuzzFont.cpp +++ b/src/ports/SkHarfBuzzFont.cpp @@ -14,12 +14,7 @@ // HB_Fixed is a 26.6 fixed point format. static inline HB_Fixed SkScalarToHarfbuzzFixed(SkScalar value) { -#ifdef SK_SCALAR_IS_FLOAT return static_cast(value * 64); -#else - // convert .16 to .6 - return value >> (16 - 6); -#endif } static HB_Bool stringToGlyphs(HB_Font hbFont, const HB_UChar16* characters, -- cgit v1.2.3