| Index: src/ports/SkFontHost_mac.cpp
|
| diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
|
| index 1d2f1fa78b1ce3694e572d19ae0410ade86ae32a..3c1a274887728feebe9570ce5f4c0ce56eae247f 100755
|
| --- a/src/ports/SkFontHost_mac.cpp
|
| +++ b/src/ports/SkFontHost_mac.cpp
|
| @@ -273,7 +273,7 @@ static CGFloat ScalarToCG(SkScalar scalar) {
|
|
|
| static SkScalar CGToScalar(CGFloat cgFloat) {
|
| if (sizeof(CGFloat) == sizeof(float)) {
|
| - return SkFloatToScalar(cgFloat);
|
| + return cgFloat;
|
| } else {
|
| SkASSERT(sizeof(CGFloat) == sizeof(double));
|
| return SkDoubleToScalar(cgFloat);
|
| @@ -1075,7 +1075,7 @@ static void build_power_table(uint8_t table[], float ee) {
|
| for (int i = 0; i < 256; i++) {
|
| float x = i / 255.f;
|
| x = sk_float_pow(x, ee);
|
| - int xx = SkScalarRoundToInt(SkFloatToScalar(x * 255));
|
| + int xx = SkScalarRoundToInt(x * 255);
|
| table[i] = SkToU8(xx);
|
| }
|
| }
|
| @@ -1325,7 +1325,7 @@ void SkScalerContext_Mac::generatePath(const SkGlyph& glyph, SkPath* path) {
|
| fRec.getSingleMatrix(&m);
|
|
|
| // start out by assuming that we want no hining in X and Y
|
| - scaleX = scaleY = SkFloatToScalar(kScaleForSubPixelPositionHinting);
|
| + scaleX = scaleY = kScaleForSubPixelPositionHinting;
|
| // now see if we need to restore hinting for axis-aligned baselines
|
| switch (SkComputeAxisAlignmentForHText(m)) {
|
| case kX_SkAxisAlignment:
|
|
|