fix trivial matrix computation

src/core/SkBitmapProcState_shaderproc.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkMathPriv.h"
 
 #define SCALE_FILTER_NAME       MAKENAME(_filter_DX_shaderproc)
 
 // Can't be static in the general case because some of these implementations
 // will be defined and referenced in different object files.
 void SCALE_FILTER_NAME(const SkBitmapProcState& s, int x, int y,
                        DSTTYPE* SK_RESTRICT colors, int count);
 
 void SCALE_FILTER_NAME(const SkBitmapProcState& s, int x, int y,
                        DSTTYPE* SK_RESTRICT colors, int count) {
     SkASSERT((s.fInvType & ~(SkMatrix::kTranslate_Mask |
                              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;
     const SkFixed oneX = s.fFilterOneX;
     const SkFixed dx = s.fInvSx;
     SkFixed fx;
     const SRCTYPE* SK_RESTRICT row0;
     const SRCTYPE* SK_RESTRICT row1;
     unsigned subY;
 
     {
         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;
         // compute our two Y values up front
         subY = TILEY_LOW_BITS(fy, maxY);
         int y0 = TILEY_PROCF(fy, maxY);
         int y1 = TILEY_PROCF((fy + s.fFilterOneY), maxY);
 
         const char* SK_RESTRICT srcAddr = (const char*)s.fBitmap->getPixels();
         size_t rb = s.fBitmap->rowBytes();
@@ skipping 37 matching lines @@
 #undef MAKENAME
 #undef SRCTYPE
 #undef DSTTYPE
 #undef CHECKSTATE
 #undef SRC_TO_FILTER
 #undef FILTER_TO_DST
 #undef PREAMBLE
 #undef POSTAMBLE
 
 #undef SCALE_FILTER_NAME