diff options
| author |  reed <reed@google.com> | 2015-06-04 14:12:25 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-04 14:12:25 -0700 |
| commit | ad7ae6c821c530dd6cb54b0e8931ba8b10e8d87d (patch) | |
| tree | 8ef2a833209c3e2c1c445232869c76a320ec1b4c /src/core/SkBitmapProcState_matrix_template.h | |
| parent | a84f569f0dbf07da55d168bc56538078dd1d2c08 (diff) | |
switch bitmapshader internals over to pixmap
BUG=skia:
NOTRY=True
Review URL: https://codereview.chromium.org/1158273007
Diffstat (limited to 'src/core/SkBitmapProcState_matrix_template.h')
| -rw-r--r-- | src/core/SkBitmapProcState_matrix_template.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/SkBitmapProcState_matrix_template.h b/src/core/SkBitmapProcState_matrix_template.h index 4b0044b46a..468013c30d 100644 --- a/src/core/SkBitmapProcState_matrix_template.h +++ b/src/core/SkBitmapProcState_matrix_template.h @@ -19,14 +19,14 @@ void NoFilterProc_Scale(const SkBitmapProcState& s, uint32_t xy[], // we store y, x, x, x, x, x - const unsigned maxX = s.fBitmap->width() - 1; + const unsigned maxX = s.fPixmap.width() - 1; SkFractionalInt fx; { SkPoint pt; s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf, SkIntToScalar(y) + SK_ScalarHalf, &pt); fx = SkScalarToFractionalInt(pt.fY); - const unsigned maxY = s.fBitmap->height() - 1; + const unsigned maxY = s.fPixmap.height() - 1; *xy++ = TileProc::Y(s, SkFractionalIntToFixed(fx), maxY); fx = SkScalarToFractionalInt(pt.fX); } @@ -89,8 +89,8 @@ void NoFilterProc_Affine(const SkBitmapProcState& s, uint32_t xy[], SkFractionalInt fy = SkScalarToFractionalInt(srcPt.fY); SkFractionalInt dx = s.fInvSxFractionalInt; SkFractionalInt dy = s.fInvKyFractionalInt; - int maxX = s.fBitmap->width() - 1; - int maxY = s.fBitmap->height() - 1; + int maxX = s.fPixmap.width() - 1; + int maxY = s.fPixmap.height() - 1; for (int i = count; i > 0; --i) { *xy++ = (TileProc::Y(s, SkFractionalIntToFixed(fy), maxY) << 16) | @@ -104,8 +104,8 @@ void NoFilterProc_Persp(const SkBitmapProcState& s, uint32_t* SK_RESTRICT xy, int count, int x, int y) { SkASSERT(s.fInvType & SkMatrix::kPerspective_Mask); - int maxX = s.fBitmap->width() - 1; - int maxY = s.fBitmap->height() - 1; + int maxX = s.fPixmap.width() - 1; + int maxY = s.fPixmap.height() - 1; SkPerspIter iter(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf, |