diff options
| author |  humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-14 01:44:59 +0000 |
|---|---|---|
| committer | humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-14 01:44:59 +0000 |
| commit | 9c96d4b5ffdbf8c82f55b2058a2fea7225fe11d6 (patch) | |
| tree | cbc2c959e30f627ae77ce70e21acb1674dc72de4 /src/core/SkBitmapProcState_matrix.h | |
| parent | 7e4d99acefe57a599a407e0a5d23452506c68e26 (diff) | |
fix trivial matrix computation
Revert "Reverted 10056-10059"
This reverts commit bab4ebcaa7270c3b866a8e10917c39b055ebd51a.
Fix broken GM test, reintroduce image scaling.
BUG=
Review URL: https://codereview.chromium.org/18721006
git-svn-id: http://skia.googlecode.com/svn/trunk@10066 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkBitmapProcState_matrix.h')
| -rw-r--r-- | src/core/SkBitmapProcState_matrix.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/SkBitmapProcState_matrix.h b/src/core/SkBitmapProcState_matrix.h index cc65c2d801..d796d0b04c 100644 --- a/src/core/SkBitmapProcState_matrix.h +++ b/src/core/SkBitmapProcState_matrix.h @@ -55,7 +55,7 @@ void SCALE_NOFILTER_NAME(const SkBitmapProcState& s, SkFractionalInt fx; { SkPoint pt; - s.fInvProc(*s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf, + s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf, SkIntToScalar(y) + SK_ScalarHalf, &pt); fx = SkScalarToFractionalInt(pt.fY); const unsigned maxY = s.fBitmap->height() - 1; @@ -116,7 +116,7 @@ void AFFINE_NOFILTER_NAME(const SkBitmapProcState& s, PREAMBLE(s); SkPoint srcPt; - s.fInvProc(*s.fInvMatrix, + s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf, SkIntToScalar(y) + SK_ScalarHalf, &srcPt); @@ -143,7 +143,7 @@ void PERSP_NOFILTER_NAME(const SkBitmapProcState& s, int maxX = s.fBitmap->width() - 1; int maxY = s.fBitmap->height() - 1; - SkPerspIter iter(*s.fInvMatrix, + SkPerspIter iter(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf, SkIntToScalar(y) + SK_ScalarHalf, count); @@ -188,7 +188,7 @@ void SCALE_FILTER_NAME(const SkBitmapProcState& s, { SkPoint pt; - s.fInvProc(*s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf, + s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf, SkIntToScalar(y) + SK_ScalarHalf, &pt); const SkFixed fy = SkScalarToFixed(pt.fY) - (s.fFilterOneY >> 1); const unsigned maxY = s.fBitmap->height() - 1; @@ -222,7 +222,7 @@ void AFFINE_FILTER_NAME(const SkBitmapProcState& s, PREAMBLE(s); SkPoint srcPt; - s.fInvProc(*s.fInvMatrix, + s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf, SkIntToScalar(y) + SK_ScalarHalf, &srcPt); @@ -254,7 +254,7 @@ void PERSP_FILTER_NAME(const SkBitmapProcState& s, SkFixed oneX = s.fFilterOneX; SkFixed oneY = s.fFilterOneY; - SkPerspIter iter(*s.fInvMatrix, + SkPerspIter iter(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf, SkIntToScalar(y) + SK_ScalarHalf, count); |