AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix 64 bit warnings

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@9984 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
humper@google.com 2013-07-10 22:34:05 +00:00
parent 222382b30a
commit a8fc2680bb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/SkBitmapFilter.cpp
View File

@ -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;