remove SkFloatToScalar macro
BUG=
R=reed@google.com, djsollen@google.com
Author: caryclark@google.com
Review URL: https://codereview.chromium.org/85463005
git-svn-id: http://skia.googlecode.com/svn/trunk@12385 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
index 1d2f1fa..3c1a274 100755
--- a/src/ports/SkFontHost_mac.cpp
+++ b/src/ports/SkFontHost_mac.cpp
@@ -273,7 +273,7 @@
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 @@
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 @@
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: