diff options
| author |  humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-10 22:34:05 +0000 |
|---|---|---|
| committer | humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-10 22:34:05 +0000 |
| commit | a8fc2680bb07e39f9c569fde485bfe8e75307309 (patch) | |
| tree | 23257de57cfb06074cc4467fdf36f1cce541051d /src/core | |
| parent | 222382b30a176db9d9044d9df1ae14e0fbe27181 (diff) | |
fix 64 bit warnings
git-svn-id: http://skia.googlecode.com/svn/trunk@9984 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkBitmapFilter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/SkBitmapFilter.cpp b/src/core/SkBitmapFilter.cpp index 664d672e54..3cbafd743c 100644 --- a/src/core/SkBitmapFilter.cpp +++ b/src/core/SkBitmapFilter.cpp @@ -22,8 +22,8 @@ void highQualityFilter(const SkBitmapProcState& s, int x, int y, while (count-- > 0) { SkPoint srcPt; - s.fInvProc(*s.fInvMatrix, SkFloatToScalar(x + 0.5), - SkFloatToScalar(y + 0.5), &srcPt); + s.fInvProc(*s.fInvMatrix, SkFloatToScalar(x + 0.5f), + SkFloatToScalar(y + 0.5f), &srcPt); srcPt.fX -= SK_ScalarHalf; srcPt.fY -= SK_ScalarHalf; @@ -75,15 +75,15 @@ void highQualityFilter_ScaleOnly(const SkBitmapProcState &s, int x, int y, SkPoint srcPt; - s.fInvProc(*s.fInvMatrix, SkFloatToScalar(x + 0.5), - SkFloatToScalar(y + 0.5), &srcPt); + s.fInvProc(*s.fInvMatrix, SkFloatToScalar(x + 0.5f), + SkFloatToScalar(y + 0.5f), &srcPt); srcPt.fY -= SK_ScalarHalf; int y0 = SkClampMax(sk_float_ceil2int(SkScalarToFloat(srcPt.fY)-s.getBitmapFilter()->width()), maxY); int y1 = SkClampMax(sk_float_floor2int(SkScalarToFloat(srcPt.fY)+s.getBitmapFilter()->width()), maxY); while (count-- > 0) { - s.fInvProc(*s.fInvMatrix, SkFloatToScalar(x + 0.5), - SkFloatToScalar(y + 0.5), &srcPt); + s.fInvProc(*s.fInvMatrix, SkFloatToScalar(x + 0.5f), + SkFloatToScalar(y + 0.5f), &srcPt); srcPt.fX -= SK_ScalarHalf; srcPt.fY -= SK_ScalarHalf; |