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

Unified Diff: src/pathops/SkOpAngle.cpp

Issue 18058007: path ops work in progress (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: try try again Created 7 years, 5 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/pathops/SkIntersections.cpp ('k') | src/pathops/SkOpEdgeBuilder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/pathops/SkOpAngle.cpp
diff --git a/src/pathops/SkOpAngle.cpp b/src/pathops/SkOpAngle.cpp
index 0ac5a3da78dfc5bb6ac9eb2083d97871a38feaec..0dd0d65f79553506e54edd4c9b98f33a97cc5fe8 100644
--- a/src/pathops/SkOpAngle.cpp
+++ b/src/pathops/SkOpAngle.cpp
@@ -22,7 +22,7 @@ static const int bugChar = strlen(funcName) + 1;
#if DEBUG_ANGLE
static bool CompareResult(SkString* bugOut, const char* append, bool compare) {
- bugOut->appendf(append);
+ bugOut->appendf("%s", append);
bugOut->writable_str()[bugChar] = "><"[compare];
SkDebugf("%s\n", bugOut->c_str());
return compare;
@@ -141,7 +141,7 @@ bool SkOpAngle::operator<(const SkOpAngle& rh) const { // this/lh: left-hand; r
}
}
if (fSide * rh.fSide == 0) {
- SkASSERT(fSide + rh.fSide != 0);
+ SkASSERT(fSide + rh.fSide != 0); // hitting this assert means coincidence was undetected
return COMPARE_RESULT("9 fSide * rh.fSide == 0 ...", fSide < rh.fSide);
}
// at this point, the initial tangent line is nearly coincident
« no previous file with comments | « src/pathops/SkIntersections.cpp ('k') | src/pathops/SkOpEdgeBuilder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698