fix compile warnings

src/core/SkBitmapProcState.cpp

 
 /*
  * 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 "SkBitmapProcState.h"
 #include "SkColorPriv.h"
 #include "SkFilterProc.h"
@@ skipping 284 matching lines @@
             fShaderProc16 = SK_ARM_NEON_WRAP(Repeat_S16_D16_filter_DX_shaderproc);
         }
     } else if (SK_ARM_NEON_WRAP(SI8_opaque_D32_filter_DX) == fSampleProc32 && clamp_clamp) {
         fShaderProc32 = SK_ARM_NEON_WRAP(Clamp_SI8_opaque_D32_filter_DX_shaderproc);
     }
 
     if (NULL == fShaderProc32) {
         fShaderProc32 = this->chooseShaderProc32();
     }
 
+    if (NULL == fShaderProc32) {
+        fShaderProc32 = this->chooseBitmapFilterProc(paint);
+    }
+
     // see if our platform has any accelerated overrides
     this->platformProcs();
 
-    if (NULL == fShaderProc32) {
-        fShaderProc32 = this->chooseBicubicFilterProc(paint);
-    }
-
     return true;
 }
 
 static void Clamp_S32_D32_nofilter_trans_shaderproc(const SkBitmapProcState& s,
                                                     int x, int y,
                                                     SkPMColor* SK_RESTRICT colors,
                                                     int count) {
     SkASSERT(((s.fInvType & ~SkMatrix::kTranslate_Mask)) == 0);
     SkASSERT(s.fInvKy == 0);
     SkASSERT(count > 0 && colors != NULL);
@@ skipping 398 matching lines @@
     } else {
         size >>= 2;
     }
 
     if (fDoFilter) {
         size >>= 1;
     }
 
     return size;
 }