Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(910)

Unified Diff: src/core/SkMatrixClipStateMgr.cpp

Issue 159813002: Fix build (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkMatrixClipStateMgr.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkMatrixClipStateMgr.cpp
===================================================================
--- src/core/SkMatrixClipStateMgr.cpp (revision 13403)
+++ src/core/SkMatrixClipStateMgr.cpp (working copy)
@@ -44,8 +44,10 @@
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 @@
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 @@
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 @@
}
}
}
-#endif
+#endif
« no previous file with comments | « src/core/SkMatrixClipStateMgr.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698