diff options
| author |  humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-09 18:02:06 +0000 |
|---|---|---|
| committer | humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-09 18:02:06 +0000 |
| commit | 1a8940e558ecc91502767525f69339fd45b71bd4 (patch) | |
| tree | 49eae5d97f1d8ed4bf2912231b743afce7b85de4 /src/core/SkBitmapProcState.h | |
| parent | 25fc6b9bfb3f9c2839b463b69b86ce9ed206c763 (diff) | |
Revert "More general image filter interface; tested implementation of standalone"
This reverts commit 4df3e8b079e019af5f60c13e7e6ec6589663962a.
git-svn-id: http://skia.googlecode.com/svn/trunk@9937 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkBitmapProcState.h')
| -rw-r--r-- | src/core/SkBitmapProcState.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/core/SkBitmapProcState.h b/src/core/SkBitmapProcState.h index 69de2ca86a..7d754fe509 100644 --- a/src/core/SkBitmapProcState.h +++ b/src/core/SkBitmapProcState.h @@ -11,7 +11,6 @@ #define SkBitmapProcState_DEFINED #include "SkBitmap.h" -#include "SkBitmapFilter.h" #include "SkMatrix.h" #define FractionalInt_IS_64BIT @@ -114,8 +113,6 @@ struct SkBitmapProcState { // are ignored ShaderProc32 getShaderProc32() const { return fShaderProc32; } ShaderProc16 getShaderProc16() const { return fShaderProc16; } - - SkBitmapFilter* getBitmapFilter() const { return fBitmapFilter; } #ifdef SK_DEBUG MatrixProc getMatrixProc() const; @@ -142,11 +139,12 @@ private: MatrixProc chooseMatrixProc(bool trivial_matrix); bool chooseProcs(const SkMatrix& inv, const SkPaint&); ShaderProc32 chooseShaderProc32(); - - void buildFilterCoefficients(SkFixed dst[4], float t) const; - SkBitmapFilter *fBitmapFilter; - ShaderProc32 chooseBitmapFilterProc(const SkPaint &paint); + + /** test method for choosing a bicubic shading filter + */ + + ShaderProc32 chooseBicubicFilterProc(const SkPaint &paint); // Return false if we failed to setup for fast translate (e.g. overflow) bool setupForTranslate(); @@ -202,10 +200,4 @@ void ClampX_ClampY_nofilter_affine(const SkBitmapProcState& s, void S32_D16_filter_DX(const SkBitmapProcState& s, const uint32_t* xy, int count, uint16_t* colors); -void highQualityFilter_ScaleOnly(const SkBitmapProcState &s, int x, int y, - SkPMColor *SK_RESTRICT colors, int count); -void highQualityFilter(const SkBitmapProcState &s, int x, int y, - SkPMColor *SK_RESTRICT colors, int count); - - #endif |