diff options
| -rw-r--r-- | gm/tilemodes_scaled.cpp | 6 | ||||
| -rw-r--r-- | include/core/SkError.h | 2 | ||||
| -rw-r--r-- | src/gpu/effects/GrBicubicEffect.h | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/gm/tilemodes_scaled.cpp b/gm/tilemodes_scaled.cpp index 63a4ef70a8..87bd1dd57b 100644 --- a/gm/tilemodes_scaled.cpp +++ b/gm/tilemodes_scaled.cpp @@ -90,7 +90,7 @@ protected: } virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { - + float scale = 32.f/kPOTSize; int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize; @@ -99,8 +99,8 @@ protected: static const char* gConfigNames[] = { "8888" , "565", "4444" }; - static const SkPaint::FilterLevel gFilterLevels[] = - { SkPaint::kNone_FilterLevel, + static const SkPaint::FilterLevel gFilterLevels[] = + { SkPaint::kNone_FilterLevel, SkPaint::kLow_FilterLevel, SkPaint::kMedium_FilterLevel, SkPaint::kHigh_FilterLevel }; diff --git a/include/core/SkError.h b/include/core/SkError.h index f3f22e9aa0..678c910253 100644 --- a/include/core/SkError.h +++ b/include/core/SkError.h @@ -48,7 +48,7 @@ enum SkError { /** Skia failed while trying to consume some external resource. */ kParseError_SkError, - + /** Something went wrong internally; could be resource exhaustion but * will often be a bug. */ diff --git a/src/gpu/effects/GrBicubicEffect.h b/src/gpu/effects/GrBicubicEffect.h index 618ef1a779..0a408916f1 100644 --- a/src/gpu/effects/GrBicubicEffect.h +++ b/src/gpu/effects/GrBicubicEffect.h @@ -33,7 +33,7 @@ public: return CreateEffectRef(effect); } - static GrEffectRef* Create(GrTexture* tex, const SkScalar coefficients[16], + static GrEffectRef* Create(GrTexture* tex, const SkScalar coefficients[16], const SkMatrix& matrix, const GrTextureParams& p, CoordsType coordsType = kLocal_CoordsType) { @@ -45,7 +45,7 @@ public: return Create(tex, gMitchellCoefficients); } - static GrEffectRef* Create(GrTexture* tex, + static GrEffectRef* Create(GrTexture* tex, const SkMatrix& matrix, const GrTextureParams& p, CoordsType coordsType = kLocal_CoordsType) { @@ -54,13 +54,13 @@ public: private: GrBicubicEffect(GrTexture*, const SkScalar coefficients[16]); - GrBicubicEffect(GrTexture*, const SkScalar coefficients[16], + GrBicubicEffect(GrTexture*, const SkScalar coefficients[16], const SkMatrix &matrix, const GrTextureParams &p, CoordsType coordsType); virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE; float fCoefficients[16]; GR_DECLARE_EFFECT_TEST; - + static const SkScalar gMitchellCoefficients[16]; typedef GrSingleTextureEffect INHERITED; |