| Index: src/opts/SkBitmapProcState_matrix_repeat_neon.h
|
| diff --git a/src/opts/SkBitmapProcState_matrix_repeat_neon.h b/src/opts/SkBitmapProcState_matrix_repeat_neon.h
|
| index f57d20d35cdf74f97fa9336e6495152904aa2daf..55e2997a5efbf160b84738aa916146a2a1055f0a 100644
|
| --- a/src/opts/SkBitmapProcState_matrix_repeat_neon.h
|
| +++ b/src/opts/SkBitmapProcState_matrix_repeat_neon.h
|
| @@ -65,8 +65,8 @@ static void SCALE_NOFILTER_NAME(const SkBitmapProcState& s,
|
| SkFixed fx;
|
| {
|
| SkPoint pt;
|
| - s.fInvProc(*s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf,
|
| - SkIntToScalar(y) + SK_ScalarHalf, &pt);
|
| + s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf,
|
| + SkIntToScalar(y) + SK_ScalarHalf, &pt);
|
| fx = SkScalarToFixed(pt.fY);
|
| const unsigned maxY = s.fBitmap->height() - 1;
|
| *xy++ = TILEY_PROCF(fx, maxY);
|
| @@ -167,7 +167,7 @@ static 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);
|
|
|
| @@ -284,7 +284,7 @@ static 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);
|
|
|
| @@ -422,8 +422,8 @@ static void SCALE_FILTER_NAME(const SkBitmapProcState& s,
|
|
|
| {
|
| SkPoint pt;
|
| - s.fInvProc(*s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf,
|
| - SkIntToScalar(y) + SK_ScalarHalf, &pt);
|
| + 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;
|
| // compute our two Y values up front
|
| @@ -457,7 +457,7 @@ static 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);
|
|
|
| @@ -493,7 +493,7 @@ static void PERSP_FILTER_NAME(const SkBitmapProcState& s,
|
|
|
|
|
|
|
| - SkPerspIter iter(*s.fInvMatrix,
|
| + SkPerspIter iter(s.fInvMatrix,
|
| SkIntToScalar(x) + SK_ScalarHalf,
|
| SkIntToScalar(y) + SK_ScalarHalf, count);
|
|
|
|
|