| Index: src/pathops/SkPathOpsSimplify.cpp
|
| diff --git a/src/pathops/SkPathOpsSimplify.cpp b/src/pathops/SkPathOpsSimplify.cpp
|
| index 9a319e08ba8ba21d0c967919388e2e4df4aa5b77..f89c4afcc7cb33557c203923e4732b0e7c3e6bc6 100644
|
| --- a/src/pathops/SkPathOpsSimplify.cpp
|
| +++ b/src/pathops/SkPathOpsSimplify.cpp
|
| @@ -9,7 +9,7 @@
|
| #include "SkPathOpsCommon.h"
|
| #include "SkPathWriter.h"
|
|
|
| -static bool bridgeWinding(SkTDArray<SkOpContour*>& contourList, SkPathWriter* simple) {
|
| +static bool bridgeWinding(SkTArray<SkOpContour*, true>& contourList, SkPathWriter* simple) {
|
| bool firstContour = true;
|
| bool unsortable = false;
|
| bool topUnsortable = false;
|
| @@ -94,7 +94,7 @@ static bool bridgeWinding(SkTDArray<SkOpContour*>& contourList, SkPathWriter* si
|
| }
|
|
|
| // returns true if all edges were processed
|
| -static bool bridgeXor(SkTDArray<SkOpContour*>& contourList, SkPathWriter* simple) {
|
| +static bool bridgeXor(SkTArray<SkOpContour*, true>& contourList, SkPathWriter* simple) {
|
| SkOpSegment* current;
|
| int start, end;
|
| bool unsortable = false;
|
| @@ -161,7 +161,7 @@ bool Simplify(const SkPath& path, SkPath* result) {
|
| if (!builder.finish()) {
|
| return false;
|
| }
|
| - SkTDArray<SkOpContour*> contourList;
|
| + SkTArray<SkOpContour*, true> contourList;
|
| MakeContourList(contours, contourList, false, false);
|
| SkOpContour** currentPtr = contourList.begin();
|
| result->setFillType(fillType);
|
|
|