fix trivial matrix computation

src/core/SkBitmapProcState_matrixProcs.cpp

 /* NEON optimized code (C) COPYRIGHT 2009 Motorola
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapProcState.h"
 #include "SkPerspIter.h"
 #include "SkShader.h"
 #include "SkUtils.h"
@@ skipping 293 matching lines @@
 #else
     for (int i = 0; i < count; i++) {
         *xptr++ = start++;
     }
 #endif
 }
 
 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());
     *xy += 1;   // bump the ptr
     // return our starting X position
     return SkScalarToFixed(pt.fX) >> 16;
 }
 
 static void clampx_nofilter_trans(const SkBitmapProcState& s,
                                   uint32_t xy[], int count, int x, int y) {
@@ skipping 140 matching lines @@
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkBitmapProcState::MatrixProc
 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:
                 return clampx_nofilter_trans;
             case SkShader::kRepeat_TileMode:
                 return repeatx_nofilter_trans;
             case SkShader::kMirror_TileMode:
                 return mirrorx_nofilter_trans;
         }
     }
 
     int index = 0;
-    if (fDoFilter) {
+    if (fFilterQuality != kNone_BitmapFilter) {
         index = 1;
     }
     if (fInvType & SkMatrix::kPerspective_Mask) {
         index += 4;
     } else if (fInvType & SkMatrix::kAffine_Mask) {
         index += 2;
     }
 
     if (SkShader::kClamp_TileMode == fTileModeX &&
         SkShader::kClamp_TileMode == fTileModeY)
@@ skipping 13 matching lines @@
     {
         return SK_ARM_NEON_WRAP(RepeatX_RepeatY_Procs)[index];
     }
 
     fTileProcX = choose_tile_proc(fTileModeX);
     fTileProcY = choose_tile_proc(fTileModeY);
     fTileLowBitsProcX = choose_tile_lowbits_proc(fTileModeX);
     fTileLowBitsProcY = choose_tile_lowbits_proc(fTileModeY);
     return GeneralXY_Procs[index];
 }