diff options
| author |  reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2009-08-03 14:45:45 +0000 |
|---|---|---|
| committer | reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2009-08-03 14:45:45 +0000 |
| commit | eef375bcd602adb065c4eccc07bd811b83a71de8 (patch) | |
| tree | f056f16348b30120571e99db76a0e65db819d1e4 /src | |
| parent | ac98154faa0e786444bafcd093fd4842127fbf18 (diff) | |
clean up SkBitmapProcState in preparation for adding porting-layer functions
git-svn-id: http://skia.googlecode.com/svn/trunk@300 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkBitmapProcState.cpp | 1 | ||||
| -rw-r--r-- | src/core/SkBitmapProcState.h | 21 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp index 379a7b30e0..e326165cfb 100644 --- a/src/core/SkBitmapProcState.cpp +++ b/src/core/SkBitmapProcState.cpp @@ -366,7 +366,6 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) { fInvProc = m->getMapXYProc(); fInvType = m->getType(); fInvSx = SkScalarToFixed(m->getScaleX()); - fInvSy = SkScalarToFixed(m->getScaleY()); fInvKy = SkScalarToFixed(m->getSkewY()); fAlphaScale = SkAlpha255To256(paint.getAlpha()); diff --git a/src/core/SkBitmapProcState.h b/src/core/SkBitmapProcState.h index e6f3e1a95d..00772015f8 100644 --- a/src/core/SkBitmapProcState.h +++ b/src/core/SkBitmapProcState.h @@ -56,30 +56,33 @@ struct SkBitmapProcState { SampleProc32 fSampleProc32; // chooseProcs SampleProc16 fSampleProc16; // chooseProcs - SkMatrix fUnitInvMatrix; // chooseProcs + const SkBitmap* fBitmap; // chooseProcs - orig or mip + const SkMatrix* fInvMatrix; // chooseProcs + SkMatrix::MapXYProc fInvProc; // chooseProcs + FixedTileProc fTileProcX; // chooseProcs FixedTileProc fTileProcY; // chooseProcs SkFixed fFilterOneX; SkFixed fFilterOneY; - const SkBitmap* fBitmap; // chooseProcs - orig or mip - SkBitmap fOrigBitmap; // CONSTRUCTOR - SkBitmap fMipBitmap; SkPMColor fPaintPMColor; // chooseProcs - A8 config - const SkMatrix* fInvMatrix; // chooseProcs - SkMatrix::MapXYProc fInvProc; // chooseProcs - SkFixed fInvSx, fInvSy; // chooseProcs + SkFixed fInvSx; // chooseProcs SkFixed fInvKy; // chooseProcs uint16_t fAlphaScale; // chooseProcs uint8_t fInvType; // chooseProcs uint8_t fTileModeX; // CONSTRUCTOR uint8_t fTileModeY; // CONSTRUCTOR SkBool8 fDoFilter; // chooseProcs - - bool chooseProcs(const SkMatrix& inv, const SkPaint&); private: + friend class SkBitmapProcShader; + + SkMatrix fUnitInvMatrix; // chooseProcs + SkBitmap fOrigBitmap; // CONSTRUCTOR + SkBitmap fMipBitmap; + MatrixProc chooseMatrixProc(); + bool chooseProcs(const SkMatrix& inv, const SkPaint&); }; #endif |