Index: src/core/SkBitmapProcState_shaderproc.h |
diff --git a/src/core/SkBitmapProcState_shaderproc.h b/src/core/SkBitmapProcState_shaderproc.h |
index 6b8f74aedd166036176fc035564e5ac74cd05c44..d765b8e92d166b8219a2d519ca97b435e5673bc8 100644 |
--- a/src/core/SkBitmapProcState_shaderproc.h |
+++ b/src/core/SkBitmapProcState_shaderproc.h |
@@ -21,7 +21,7 @@ void SCALE_FILTER_NAME(const SkBitmapProcState& s, int x, int y, |
SkMatrix::kScale_Mask)) == 0); |
SkASSERT(s.fInvKy == 0); |
SkASSERT(count > 0 && colors != NULL); |
- SkASSERT(s.fDoFilter); |
+ SkASSERT(s.fFilterQuality != SkBitmapProcState::kNone_BitmapFilter); |
SkDEBUGCODE(CHECKSTATE(s);) |
const unsigned maxX = s.fBitmap->width() - 1; |
@@ -34,7 +34,7 @@ void SCALE_FILTER_NAME(const SkBitmapProcState& s, 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); |
SkFixed fy = SkScalarToFixed(pt.fY) - (s.fFilterOneY >> 1); |
const unsigned maxY = s.fBitmap->height() - 1; |