Index: src/core/SkBitmapProcState_matrixProcs.cpp |
diff --git a/src/core/SkBitmapProcState_matrixProcs.cpp b/src/core/SkBitmapProcState_matrixProcs.cpp |
index 15c17b67dca3a458787beeff47305c515c847aac..d3cd5504fb2d0ab639fbf3cdd976d0c5b518a871 100644 |
--- a/src/core/SkBitmapProcState_matrixProcs.cpp |
+++ b/src/core/SkBitmapProcState_matrixProcs.cpp |
@@ -311,7 +311,7 @@ static void fill_sequential(uint16_t xptr[], int start, int count) { |
static int nofilter_trans_preamble(const SkBitmapProcState& s, uint32_t** xy, |
int x, int y) { |
SkPoint pt; |
- s.fInvProc(*s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf, |
+ s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf, |
SkIntToScalar(y) + SK_ScalarHalf, &pt); |
**xy = s.fIntTileProcY(SkScalarToFixed(pt.fY) >> 16, |
s.fBitmap->height()); |
@@ -472,7 +472,7 @@ SkBitmapProcState::chooseMatrixProc(bool trivial_matrix) { |
// test_int_tileprocs(); |
// check for our special case when there is no scale/affine/perspective |
if (trivial_matrix) { |
- SkASSERT(!fDoFilter); |
+ SkASSERT(kNone_BitmapFilter == fFilterQuality); |
fIntTileProcY = choose_int_tile_proc(fTileModeY); |
switch (fTileModeX) { |
case SkShader::kClamp_TileMode: |
@@ -485,7 +485,7 @@ SkBitmapProcState::chooseMatrixProc(bool trivial_matrix) { |
} |
int index = 0; |
- if (fDoFilter) { |
+ if (fFilterQuality != kNone_BitmapFilter) { |
index = 1; |
} |
if (fInvType & SkMatrix::kPerspective_Mask) { |