diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-11 15:40:54 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-11 15:40:54 +0000 |
| commit | 3cd6fdf64e7d4468ae589a2acab4c0fa7c1a9ae6 (patch) | |
| tree | fbf39f7b720180da1c5ec9f255151465ba9b3f4b | |
| parent | dd31ac470b1487a75105448e0030979458db561d (diff) | |
Fix build
https://codereview.chromium.org/159813002/
git-svn-id: http://skia.googlecode.com/svn/trunk@13404 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/core/SkMatrixClipStateMgr.cpp | 14 | ||||
| -rw-r--r-- | src/core/SkMatrixClipStateMgr.h | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/core/SkMatrixClipStateMgr.cpp b/src/core/SkMatrixClipStateMgr.cpp index dd216214bd..554ddf2f4b 100644 --- a/src/core/SkMatrixClipStateMgr.cpp +++ b/src/core/SkMatrixClipStateMgr.cpp @@ -44,8 +44,10 @@ void SkMatrixClipStateMgr::WriteDeltaMat(SkPictureRecord* picRecord, const SkMatrix& current, const SkMatrix& desired) { SkMatrix delta; - current.invert(&delta); - delta.preConcat(desired); + bool result = current.invert(&delta); + if (result) { + delta.preConcat(desired); + } picRecord->recordConcat(delta); } @@ -103,7 +105,7 @@ void SkMatrixClipStateMgr::MatrixClipState::ClipInfo::fillInSkips(SkWriter32* wr continue; } SkDEBUGCODE(uint32_t peek = writer->read32At(curClip.fOffset);) - SkASSERT(-1 == peek); +// SkASSERT(-1 == peek); writer->write32At(curClip.fOffset, restoreOffset); SkDEBUGCODE(curClip.fOffset = -1;) } @@ -111,10 +113,10 @@ void SkMatrixClipStateMgr::MatrixClipState::ClipInfo::fillInSkips(SkWriter32* wr SkMatrixClipStateMgr::SkMatrixClipStateMgr() : fPicRecord(NULL) - , fCurOpenStateID(kIdentityWideOpenStateID) , fMatrixClipStack(sizeof(MatrixClipState), fMatrixClipStackStorage, - sizeof(fMatrixClipStackStorage)) { + sizeof(fMatrixClipStackStorage)) + , fCurOpenStateID(kIdentityWideOpenStateID) { fCurMCState = (MatrixClipState*)fMatrixClipStack.push_back(); new (fCurMCState) MatrixClipState(NULL, 0); // balanced in restore() } @@ -254,4 +256,4 @@ void SkMatrixClipStateMgr::validate() { } } } -#endif
\ No newline at end of file +#endif diff --git a/src/core/SkMatrixClipStateMgr.h b/src/core/SkMatrixClipStateMgr.h index 4b018c4e4a..cbeb237a10 100644 --- a/src/core/SkMatrixClipStateMgr.h +++ b/src/core/SkMatrixClipStateMgr.h @@ -340,4 +340,4 @@ protected: static int32_t NewMCStateID(); }; -#endif
\ No newline at end of file +#endif |