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

Unified Diff: src/core/SkGeometry.h

Issue 2284303004: merge per request (Closed) Base URL: https://skia.googlesource.com/skia@m53
Patch Set: Created 4 years, 4 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 | « no previous file | src/core/SkGeometry.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkGeometry.h
diff --git a/src/core/SkGeometry.h b/src/core/SkGeometry.h
index 15f1e55195a9888285b34dadcc717e1615d54f7a..74c9d89e3f023a225bf253d927dbf69d15080de6 100644
--- a/src/core/SkGeometry.h
+++ b/src/core/SkGeometry.h
@@ -235,7 +235,7 @@ struct SkConic {
* Chop this conic into N quads, stored continguously in pts[], where
* N = 1 << pow2. The amount of storage needed is (1 + 2 * N)
*/
- int chopIntoQuadsPOW2(SkPoint pts[], int pow2) const;
+ int SK_WARN_UNUSED_RESULT chopIntoQuadsPOW2(SkPoint pts[], int pow2) const;
bool findXExtrema(SkScalar* t) const;
bool findYExtrema(SkScalar* t) const;
@@ -384,7 +384,7 @@ public:
int pow2 = conic.computeQuadPOW2(tol);
fQuadCount = 1 << pow2;
SkPoint* pts = fStorage.reset(1 + 2 * fQuadCount);
- conic.chopIntoQuadsPOW2(pts, pow2);
+ fQuadCount = conic.chopIntoQuadsPOW2(pts, pow2);
return pts;
}
« no previous file with comments | « no previous file | src/core/SkGeometry.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698