| Index: src/core/SkBitmapProcState_matrix.h
|
| diff --git a/src/core/SkBitmapProcState_matrix.h b/src/core/SkBitmapProcState_matrix.h
|
| index cc65c2d801afba2ab1e03c23da5323d192f85503..d796d0b04c4c7a06df6940a7778e49eb8fe39782 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);
|
|
|
|
|