diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-13 15:37:25 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-13 15:37:25 +0000 |
| commit | d647426714a96d42faff8ea53464343b29b427cd (patch) | |
| tree | 317f31d6221f508d0204bf8a01d44f7932198ef5 /src/opts/SkBitmapFilter_opts_SSE2.cpp | |
| parent | fa1bd5f86ceea6cfa8303594730125ad2853d87b (diff) | |
Reverted 10056-10059
git-svn-id: http://skia.googlecode.com/svn/trunk@10060 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/opts/SkBitmapFilter_opts_SSE2.cpp')
| -rw-r--r-- | src/opts/SkBitmapFilter_opts_SSE2.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/opts/SkBitmapFilter_opts_SSE2.cpp b/src/opts/SkBitmapFilter_opts_SSE2.cpp index f992bcb636..685ec77f49 100644 --- a/src/opts/SkBitmapFilter_opts_SSE2.cpp +++ b/src/opts/SkBitmapFilter_opts_SSE2.cpp @@ -55,7 +55,7 @@ void highQualityFilter_SSE2(const SkBitmapProcState& s, int x, int y, while (count-- > 0) { SkPoint srcPt; - s.fInvProc(s.fInvMatrix, SkIntToScalar(x), + s.fInvProc(*s.fInvMatrix, SkIntToScalar(x), SkIntToScalar(y), &srcPt); srcPt.fX -= SK_ScalarHalf; srcPt.fY -= SK_ScalarHalf; @@ -72,10 +72,10 @@ void highQualityFilter_SSE2(const SkBitmapProcState& s, int x, int y, int x1 = SkTMin(maxX, int(floor(sx+s.getBitmapFilter()->width() + 0.5f))); for (int src_y = y0; src_y <= y1; src_y++) { - float yweight = SkScalarToFloat(s.getBitmapFilter()->lookupScalar(srcPt.fY - src_y)); + float yweight = s.getBitmapFilter()->lookupFloat( (srcPt.fY - src_y) ); for (int src_x = x0; src_x <= x1 ; src_x++) { - float xweight = SkScalarToFloat(s.getBitmapFilter()->lookupScalar(srcPt.fX - src_x)); + float xweight = s.getBitmapFilter()->lookupFloat( (srcPt.fX - src_x) ); float combined_weight = xweight * yweight; @@ -118,7 +118,7 @@ void highQualityFilter_ScaleOnly_SSE2(const SkBitmapProcState &s, int x, int y, const int maxY = s.fBitmap->height() - 1; SkPoint srcPt; - s.fInvProc(s.fInvMatrix, SkIntToScalar(x), + s.fInvProc(*s.fInvMatrix, SkIntToScalar(x), SkIntToScalar(y), &srcPt); srcPt.fY -= SK_ScalarHalf; int sy = SkScalarFloorToInt(srcPt.fY); @@ -139,10 +139,10 @@ void highQualityFilter_ScaleOnly_SSE2(const SkBitmapProcState &s, int x, int y, int x1 = SkTMin(maxX, int(floor(sx+s.getBitmapFilter()->width() + 0.5f))); for (int src_y = y0; src_y <= y1; src_y++) { - float yweight = SkScalarToFloat(s.getBitmapFilter()->lookupScalar(srcPt.fY - src_y)); + float yweight = s.getBitmapFilter()->lookupFloat( (srcPt.fY - src_y) ); for (int src_x = x0; src_x <= x1 ; src_x++) { - float xweight = SkScalarToFloat(s.getBitmapFilter()->lookupScalar(srcPt.fX - src_x)); + float xweight = s.getBitmapFilter()->lookupFloat( (srcPt.fX - src_x) ); float combined_weight = xweight * yweight; @@ -175,7 +175,7 @@ void highQualityFilter_ScaleOnly_SSE2(const SkBitmapProcState &s, int x, int y, x++; - s.fInvProc(s.fInvMatrix, SkIntToScalar(x), + s.fInvProc(*s.fInvMatrix, SkIntToScalar(x), SkIntToScalar(y), &srcPt); } |