Index: src/core/SkEdge.cpp |
diff --git a/src/core/SkEdge.cpp b/src/core/SkEdge.cpp |
index 216604b551575cfd37ef58028a4576a72f591118..d91c3e6bce8f26dd0b5283b056ac3882c31846d1 100644 |
--- a/src/core/SkEdge.cpp |
+++ b/src/core/SkEdge.cpp |
@@ -172,7 +172,8 @@ |
return (32 - SkCLZ(dist)) >> 1; |
} |
-bool SkQuadraticEdge::setQuadraticWithoutUpdate(const SkPoint pts[3], int shift) { |
+int SkQuadraticEdge::setQuadratic(const SkPoint pts[3], int shift) |
+{ |
SkFDot6 x0, y0, x1, y1, x2, y2; |
{ |
@@ -265,13 +266,6 @@ |
fQLastX = SkFDot6ToFixed(x2); |
fQLastY = SkFDot6ToFixed(y2); |
- return true; |
-} |
- |
-int SkQuadraticEdge::setQuadratic(const SkPoint pts[3], int shift) { |
- if (!setQuadraticWithoutUpdate(pts, shift)) { |
- return 0; |
- } |
return this->updateQuadratic(); |
} |
@@ -338,7 +332,7 @@ |
return SkMax32(SkAbs32(oneThird), SkAbs32(twoThird)); |
} |
-bool SkCubicEdge::setCubicWithoutUpdate(const SkPoint pts[4], int shift) { |
+int SkCubicEdge::setCubic(const SkPoint pts[4], int shift) { |
SkFDot6 x0, y0, x1, y1, x2, y2, x3, y3; |
{ |
@@ -434,13 +428,6 @@ |
fCLastX = SkFDot6ToFixed(x3); |
fCLastY = SkFDot6ToFixed(y3); |
- return true; |
-} |
- |
-int SkCubicEdge::setCubic(const SkPoint pts[4], int shift) { |
- if (!this->setCubicWithoutUpdate(pts, shift)) { |
- return 0; |
- } |
return this->updateCubic(); |
} |