Revert "switch to new filltype for SkPath"
This reverts commit 3a50981a834b1502151038e3e511fe78805ab0e3.
Reason for revert: chrome win build found compile-problem in xpsdevice
Original change's description:
> switch to new filltype for SkPath
>
> Change-Id: I7793324a9acf4afb0eb38c1e20fbb38eac25d636
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/256102
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Commit-Queue: Mike Reed <reed@google.com>
TBR=fmalita@chromium.org,reed@google.com
Change-Id: Iacb3566da61c2512b9bd6b7e42b592febc85e031
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/256530
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/bench/AAClipBench.cpp b/bench/AAClipBench.cpp
index 57af3be..abd7ec5 100644
--- a/bench/AAClipBench.cpp
+++ b/bench/AAClipBench.cpp
@@ -219,7 +219,7 @@
path.addCircle(0, 0, SkIntToScalar(200));
path.addCircle(0, 0, SkIntToScalar(180));
// evenodd means we've constructed basically a stroked circle
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
SkIRect bounds;
path.getBounds().roundOut(&bounds);
diff --git a/docs/examples/Canvas_clipPath.cpp b/docs/examples/Canvas_clipPath.cpp
index c87ccc1..3b6d43d8 100644
--- a/docs/examples/Canvas_clipPath.cpp
+++ b/docs/examples/Canvas_clipPath.cpp
@@ -8,13 +8,13 @@
paint.setAntiAlias(true);
SkPath path;
path.addRect({20, 30, 100, 110});
- path.setFillType(SkPathFillType::kInverseWinding);
+ path.setFillType(SkPath::kInverseWinding_FillType);
canvas->save();
canvas->clipPath(path, SkClipOp::kDifference, false);
canvas->drawCircle(70, 100, 60, paint);
canvas->restore();
canvas->translate(100, 100);
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
canvas->clipPath(path, SkClipOp::kIntersect, false);
canvas->drawCircle(70, 100, 60, paint);
}
diff --git a/docs/examples/Canvas_clipPath_2.cpp b/docs/examples/Canvas_clipPath_2.cpp
index 1bea1e0..963c8d7 100644
--- a/docs/examples/Canvas_clipPath_2.cpp
+++ b/docs/examples/Canvas_clipPath_2.cpp
@@ -9,13 +9,13 @@
SkPath path;
path.addRect({20, 15, 100, 95});
path.addRect({50, 65, 130, 135});
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
canvas->save();
canvas->clipPath(path, SkClipOp::kIntersect);
canvas->drawCircle(70, 85, 60, paint);
canvas->restore();
canvas->translate(100, 100);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
canvas->clipPath(path, SkClipOp::kIntersect);
canvas->drawCircle(70, 85, 60, paint);
}
diff --git a/docs/examples/Canvas_clipPath_3.cpp b/docs/examples/Canvas_clipPath_3.cpp
index 3a1c516..9988a80 100644
--- a/docs/examples/Canvas_clipPath_3.cpp
+++ b/docs/examples/Canvas_clipPath_3.cpp
@@ -10,13 +10,13 @@
SkPoint poly[] = {{20, 20}, { 80, 20}, { 80, 80}, {40, 80},
{40, 40}, {100, 40}, {100, 100}, {20, 100}};
path.addPoly(poly, SK_ARRAY_COUNT(poly), true);
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
canvas->save();
canvas->clipPath(path, SkClipOp::kIntersect);
canvas->drawCircle(50, 50, 45, paint);
canvas->restore();
canvas->translate(100, 100);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
canvas->clipPath(path, SkClipOp::kIntersect);
canvas->drawCircle(50, 50, 45, paint);
}
diff --git a/docs/examples/Canvas_drawPath.cpp b/docs/examples/Canvas_drawPath.cpp
index 2a5460b..d62374d 100644
--- a/docs/examples/Canvas_drawPath.cpp
+++ b/docs/examples/Canvas_drawPath.cpp
@@ -24,9 +24,9 @@
canvas->translate(-240, 60);
}
paint.setStyle(SkPaint::kFill_Style);
- for (auto fill : { SkPathFillType::kWinding,
- SkPathFillType::kEvenOdd,
- SkPathFillType::kInverseWinding } ) {
+ for (auto fill : { SkPath::kWinding_FillType,
+ SkPath::kEvenOdd_FillType,
+ SkPath::kInverseWinding_FillType } ) {
path.setFillType(fill);
canvas->save();
canvas->clipRect({0, 10, 80, 70});
diff --git a/docs/examples/Path_ConvertToNonInverseFillType.cpp b/docs/examples/Path_ConvertToNonInverseFillType.cpp
index d60857f..12e2d1f 100644
--- a/docs/examples/Path_ConvertToNonInverseFillType.cpp
+++ b/docs/examples/Path_ConvertToNonInverseFillType.cpp
@@ -3,25 +3,25 @@
#include "tools/fiddle/examples.h"
// HASH=319f6b124458dcc0f9ce4d7bbde65810
REG_FIDDLE(Path_ConvertToNonInverseFillType, 256, 256, true, 0) {
-#define nameValue(fill) { SkPathFillType::fill, #fill }
+#define nameValue(fill) { SkPath::fill, #fill }
void draw(SkCanvas* canvas) {
struct {
- SkPathFillType fill;
+ SkPath::FillType fill;
const char* name;
} fills[] = {
- nameValue(kWinding),
- nameValue(kEvenOdd),
- nameValue(kInverseWinding),
- nameValue(kInverseEvenOdd),
+ nameValue(kWinding_FillType),
+ nameValue(kEvenOdd_FillType),
+ nameValue(kInverseWinding_FillType),
+ nameValue(kInverseEvenOdd_FillType),
};
for (unsigned i = 0; i < SK_ARRAY_COUNT(fills); ++i) {
- if (fills[i].fill != (SkPathFillType) i) {
+ if (fills[i].fill != (SkPath::FillType) i) {
SkDebugf("fills array order does not match FillType enum order");
break;
}
SkDebugf("ConvertToNonInverseFillType(%s) == %s\n", fills[i].name,
- fills[(int) SkPathFillType_ConvertToNonInverse(fills[i].fill)].name);
+ fills[(int) SkPath::ConvertToNonInverseFillType(fills[i].fill)].name);
}
}
} // END FIDDLE
diff --git a/docs/examples/Path_FillType_a.cpp b/docs/examples/Path_FillType_a.cpp
index d19c2c3..caed39a 100644
--- a/docs/examples/Path_FillType_a.cpp
+++ b/docs/examples/Path_FillType_a.cpp
@@ -14,8 +14,8 @@
SkRect clipRect = {0, 0, 51, 100};
canvas->drawPath(path, strokePaint);
SkPaint fillPaint;
- for (auto fillType : { SkPathFillType::kWinding, SkPathFillType::kEvenOdd,
- SkPathFillType::kInverseWinding, SkPathFillType::kInverseEvenOdd } ) {
+ for (auto fillType : { SkPath::kWinding_FillType, SkPath::kEvenOdd_FillType,
+ SkPath::kInverseWinding_FillType, SkPath::kInverseEvenOdd_FillType } ) {
canvas->translate(51, 0);
canvas->save();
canvas->clipRect(clipRect);
diff --git a/docs/examples/Path_FillType_b.cpp b/docs/examples/Path_FillType_b.cpp
index 4c1b83c..110117e 100644
--- a/docs/examples/Path_FillType_b.cpp
+++ b/docs/examples/Path_FillType_b.cpp
@@ -22,8 +22,8 @@
canvas->scale(.5f, .5f);
canvas->drawString("inverse", 384, 150, textPaint);
SkPaint fillPaint;
- for (auto fillType : { SkPathFillType::kWinding, SkPathFillType::kEvenOdd,
- SkPathFillType::kInverseWinding, SkPathFillType::kInverseEvenOdd } ) {
+ for (auto fillType : { SkPath::kWinding_FillType, SkPath::kEvenOdd_FillType,
+ SkPath::kInverseWinding_FillType, SkPath::kInverseEvenOdd_FillType } ) {
canvas->save();
canvas->clipRect(clipRect);
path.setFillType(fillType);
diff --git a/docs/examples/Path_IsInverseFillType.cpp b/docs/examples/Path_IsInverseFillType.cpp
index 3d2e5f0..1b2cb10 100644
--- a/docs/examples/Path_IsInverseFillType.cpp
+++ b/docs/examples/Path_IsInverseFillType.cpp
@@ -3,20 +3,20 @@
#include "tools/fiddle/examples.h"
// HASH=1453856a9d0c73e8192bf298c4143563
REG_FIDDLE(Path_IsInverseFillType, 256, 256, true, 0) {
-#define nameValue(fill) { SkPathFillType::fill, #fill }
+#define nameValue(fill) { SkPath::fill, #fill }
void draw(SkCanvas* canvas) {
struct {
- SkPathFillType fill;
+ SkPath::FillType fill;
const char* name;
} fills[] = {
- nameValue(kWinding),
- nameValue(kEvenOdd),
- nameValue(kInverseWinding),
- nameValue(kInverseEvenOdd),
+ nameValue(kWinding_FillType),
+ nameValue(kEvenOdd_FillType),
+ nameValue(kInverseWinding_FillType),
+ nameValue(kInverseEvenOdd_FillType),
};
for (auto fill: fills ) {
- SkDebugf("IsInverseFillType(%s) == %s\n", fill.name, SkPathFillType_IsInverse(fill.fill) ?
+ SkDebugf("IsInverseFillType(%s) == %s\n", fill.name, SkPath::IsInverseFillType(fill.fill) ?
"true" : "false");
}
}
diff --git a/docs/examples/Path_dumpHex.cpp b/docs/examples/Path_dumpHex.cpp
index 25af4cd..2578ab5 100644
--- a/docs/examples/Path_dumpHex.cpp
+++ b/docs/examples/Path_dumpHex.cpp
@@ -7,7 +7,7 @@
SkPath path, copy;
path.lineTo(6.f / 7, 2.f / 3);
path.dumpHex();
- copy.setFillType(SkPathFillType::kWinding);
+ copy.setFillType(SkPath::kWinding_FillType);
copy.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
copy.lineTo(SkBits2Float(0x3f5b6db7), SkBits2Float(0x3f2aaaab)); // 0.857143f, 0.666667f
SkDebugf("path is " "%s" "equal to copy\n", path == copy ? "" : "not ");
diff --git a/docs/examples/Path_dump_2.cpp b/docs/examples/Path_dump_2.cpp
index 7220d0c..37defe2 100644
--- a/docs/examples/Path_dump_2.cpp
+++ b/docs/examples/Path_dump_2.cpp
@@ -7,7 +7,7 @@
SkPath path, copy;
path.lineTo(6.f / 7, 2.f / 3);
path.dump();
- copy.setFillType(SkPathFillType::kWinding);
+ copy.setFillType(SkPath::kWinding_FillType);
copy.moveTo(0, 0);
copy.lineTo(0.857143f, 0.666667f);
SkDebugf("path is " "%s" "equal to copy\n", path == copy ? "" : "not ");
diff --git a/docs/examples/Path_getFillType.cpp b/docs/examples/Path_getFillType.cpp
index f4e1cc7..6ac58d1 100644
--- a/docs/examples/Path_getFillType.cpp
+++ b/docs/examples/Path_getFillType.cpp
@@ -6,9 +6,9 @@
void draw(SkCanvas* canvas) {
SkPath path;
SkDebugf("default path fill type is %s\n",
- path.getNewFillType() == SkPathFillType::kWinding ? "kWinding" :
- path.getNewFillType() == SkPathFillType::kEvenOdd ? "kEvenOdd" :
- path.getNewFillType() == SkPathFillType::kInverseWinding ? "kInverseWinding" :
- "kInverseEvenOdd");
+ path.getFillType() == SkPath::kWinding_FillType ? "kWinding_FillType" :
+ path.getFillType() == SkPath::kEvenOdd_FillType ? "kEvenOdd_FillType" :
+ path.getFillType() == SkPath::kInverseWinding_FillType ? "kInverseWinding_FillType" :
+ "kInverseEvenOdd_FillType");
}
} // END FIDDLE
diff --git a/docs/examples/Path_reset.cpp b/docs/examples/Path_reset.cpp
index b720d33..8448db1 100644
--- a/docs/examples/Path_reset.cpp
+++ b/docs/examples/Path_reset.cpp
@@ -5,7 +5,7 @@
REG_FIDDLE(Path_reset, 256, 256, true, 0) {
void draw(SkCanvas* canvas) {
SkPath path1, path2;
- path1.setFillType(SkPathFillType::kInverseWinding);
+ path1.setFillType(SkPath::kInverseWinding_FillType);
path1.addRect({10, 20, 30, 40});
SkDebugf("path1 %c= path2\n", path1 == path2 ? '=' : '!');
path1.reset();
diff --git a/docs/examples/Path_rewind.cpp b/docs/examples/Path_rewind.cpp
index 74a2683..6776191 100644
--- a/docs/examples/Path_rewind.cpp
+++ b/docs/examples/Path_rewind.cpp
@@ -5,7 +5,7 @@
REG_FIDDLE(Path_rewind, 256, 256, true, 0) {
void draw(SkCanvas* canvas) {
SkPath path1, path2;
- path1.setFillType(SkPathFillType::kInverseWinding);
+ path1.setFillType(SkPath::kInverseWinding_FillType);
path1.addRect({10, 20, 30, 40});
SkDebugf("path1 %c= path2\n", path1 == path2 ? '=' : '!');
path1.rewind();
diff --git a/docs/examples/Path_setFillType.cpp b/docs/examples/Path_setFillType.cpp
index 937fb69..0bed8a8 100644
--- a/docs/examples/Path_setFillType.cpp
+++ b/docs/examples/Path_setFillType.cpp
@@ -5,7 +5,7 @@
REG_FIDDLE(Path_setFillType, 256, 64, false, 0) {
void draw(SkCanvas* canvas) {
SkPath path;
- path.setFillType(SkPathFillType::kInverseWinding);
+ path.setFillType(SkPath::kInverseWinding_FillType);
SkPaint paint;
paint.setColor(SK_ColorBLUE);
canvas->drawPath(path, paint);
diff --git a/docs/examples/Region_op_6.cpp b/docs/examples/Region_op_6.cpp
index 9fbf850..13c9205 100644
--- a/docs/examples/Region_op_6.cpp
+++ b/docs/examples/Region_op_6.cpp
@@ -9,9 +9,9 @@
paint.setTextSize(128);
SkPath xPath, opPath;
paint.getTextPath("X", 1, 20, 110, &xPath);
- xPath.setFillType(SkPathFillType::kInverseWinding);
+ xPath.setFillType(SkPath::kInverseWinding_FillType);
opPath.addCircle(64, 64, frame * 64);
- opPath.setFillType(SkPathFillType::kInverseWinding);
+ opPath.setFillType(SkPath::kInverseWinding_FillType);
SkRegion xRegion, opRegion, rectRegion;
SkIRect drawBounds = {0, 0, 128, 128};
opRegion.setPath(opPath, SkRegion(drawBounds));
diff --git a/example/SkiaSDLExample.cpp b/example/SkiaSDLExample.cpp
index 6dcee90..7aebbbc 100644
--- a/example/SkiaSDLExample.cpp
+++ b/example/SkiaSDLExample.cpp
@@ -97,7 +97,7 @@
for (int i = 0; i < kNumPoints; ++i) {
concavePath.lineTo(points[(2 * i) % kNumPoints]);
}
- concavePath.setFillType(SkPathFillType::kEvenOdd);
+ concavePath.setFillType(SkPath::kEvenOdd_FillType);
SkASSERT(!concavePath.isConvex());
concavePath.close();
return concavePath;
diff --git a/experimental/svg/model/SkSVGCircle.cpp b/experimental/svg/model/SkSVGCircle.cpp
index 47da074..66e7d28 100644
--- a/experimental/svg/model/SkSVGCircle.cpp
+++ b/experimental/svg/model/SkSVGCircle.cpp
@@ -54,7 +54,7 @@
return std::make_tuple(SkPoint::Make(cx, cy), r);
}
void SkSVGCircle::onDraw(SkCanvas* canvas, const SkSVGLengthContext& lctx,
- const SkPaint& paint, SkPathFillType) const {
+ const SkPaint& paint, SkPath::FillType) const {
SkPoint pos;
SkScalar r;
std::tie(pos, r) = this->resolve(lctx);
diff --git a/experimental/svg/model/SkSVGCircle.h b/experimental/svg/model/SkSVGCircle.h
index fc774a1..c53cf4a 100644
--- a/experimental/svg/model/SkSVGCircle.h
+++ b/experimental/svg/model/SkSVGCircle.h
@@ -26,7 +26,7 @@
void onSetAttribute(SkSVGAttribute, const SkSVGValue&) override;
void onDraw(SkCanvas*, const SkSVGLengthContext&, const SkPaint&,
- SkPathFillType) const override;
+ SkPath::FillType) const override;
SkPath onAsPath(const SkSVGRenderContext&) const override;
diff --git a/experimental/svg/model/SkSVGEllipse.cpp b/experimental/svg/model/SkSVGEllipse.cpp
index 60d3048..b7d4fad 100644
--- a/experimental/svg/model/SkSVGEllipse.cpp
+++ b/experimental/svg/model/SkSVGEllipse.cpp
@@ -67,7 +67,7 @@
}
void SkSVGEllipse::onDraw(SkCanvas* canvas, const SkSVGLengthContext& lctx,
- const SkPaint& paint, SkPathFillType) const {
+ const SkPaint& paint, SkPath::FillType) const {
canvas->drawOval(this->resolve(lctx), paint);
}
diff --git a/experimental/svg/model/SkSVGEllipse.h b/experimental/svg/model/SkSVGEllipse.h
index ec0a753..c6bd2b3 100644
--- a/experimental/svg/model/SkSVGEllipse.h
+++ b/experimental/svg/model/SkSVGEllipse.h
@@ -27,7 +27,7 @@
void onSetAttribute(SkSVGAttribute, const SkSVGValue&) override;
void onDraw(SkCanvas*, const SkSVGLengthContext&, const SkPaint&,
- SkPathFillType) const override;
+ SkPath::FillType) const override;
SkPath onAsPath(const SkSVGRenderContext&) const override;
diff --git a/experimental/svg/model/SkSVGLine.cpp b/experimental/svg/model/SkSVGLine.cpp
index 05fc1f9..3d0efa1 100644
--- a/experimental/svg/model/SkSVGLine.cpp
+++ b/experimental/svg/model/SkSVGLine.cpp
@@ -64,7 +64,7 @@
}
void SkSVGLine::onDraw(SkCanvas* canvas, const SkSVGLengthContext& lctx,
- const SkPaint& paint, SkPathFillType) const {
+ const SkPaint& paint, SkPath::FillType) const {
SkPoint p0, p1;
std::tie(p0, p1) = this->resolve(lctx);
diff --git a/experimental/svg/model/SkSVGLine.h b/experimental/svg/model/SkSVGLine.h
index c4de847..08e0fe6 100644
--- a/experimental/svg/model/SkSVGLine.h
+++ b/experimental/svg/model/SkSVGLine.h
@@ -27,7 +27,7 @@
void onSetAttribute(SkSVGAttribute, const SkSVGValue&) override;
void onDraw(SkCanvas*, const SkSVGLengthContext&, const SkPaint&,
- SkPathFillType) const override;
+ SkPath::FillType) const override;
SkPath onAsPath(const SkSVGRenderContext&) const override;
diff --git a/experimental/svg/model/SkSVGPath.cpp b/experimental/svg/model/SkSVGPath.cpp
index 07fc348..f3f4524 100644
--- a/experimental/svg/model/SkSVGPath.cpp
+++ b/experimental/svg/model/SkSVGPath.cpp
@@ -26,7 +26,7 @@
}
void SkSVGPath::onDraw(SkCanvas* canvas, const SkSVGLengthContext&, const SkPaint& paint,
- SkPathFillType fillType) const {
+ SkPath::FillType fillType) const {
// the passed fillType follows inheritance rules and needs to be applied at draw time.
fPath.setFillType(fillType);
canvas->drawPath(fPath, paint);
diff --git a/experimental/svg/model/SkSVGPath.h b/experimental/svg/model/SkSVGPath.h
index 1b7b17d..5b41637 100644
--- a/experimental/svg/model/SkSVGPath.h
+++ b/experimental/svg/model/SkSVGPath.h
@@ -22,7 +22,7 @@
void onSetAttribute(SkSVGAttribute, const SkSVGValue&) override;
void onDraw(SkCanvas*, const SkSVGLengthContext&, const SkPaint&,
- SkPathFillType) const override;
+ SkPath::FillType) const override;
SkPath onAsPath(const SkSVGRenderContext&) const override;
diff --git a/experimental/svg/model/SkSVGPoly.cpp b/experimental/svg/model/SkSVGPoly.cpp
index 29af890..6bacb1a 100644
--- a/experimental/svg/model/SkSVGPoly.cpp
+++ b/experimental/svg/model/SkSVGPoly.cpp
@@ -33,7 +33,7 @@
}
void SkSVGPoly::onDraw(SkCanvas* canvas, const SkSVGLengthContext&, const SkPaint& paint,
- SkPathFillType fillType) const {
+ SkPath::FillType fillType) const {
// the passed fillType follows inheritance rules and needs to be applied at draw time.
fPath.setFillType(fillType);
canvas->drawPath(fPath, paint);
diff --git a/experimental/svg/model/SkSVGPoly.h b/experimental/svg/model/SkSVGPoly.h
index ef9c3a5..f47b764 100644
--- a/experimental/svg/model/SkSVGPoly.h
+++ b/experimental/svg/model/SkSVGPoly.h
@@ -30,7 +30,7 @@
void onSetAttribute(SkSVGAttribute, const SkSVGValue&) override;
void onDraw(SkCanvas*, const SkSVGLengthContext&, const SkPaint&,
- SkPathFillType) const override;
+ SkPath::FillType) const override;
SkPath onAsPath(const SkSVGRenderContext&) const override;
diff --git a/experimental/svg/model/SkSVGRect.cpp b/experimental/svg/model/SkSVGRect.cpp
index 5c518bd..24267d0 100644
--- a/experimental/svg/model/SkSVGRect.cpp
+++ b/experimental/svg/model/SkSVGRect.cpp
@@ -83,7 +83,7 @@
}
void SkSVGRect::onDraw(SkCanvas* canvas, const SkSVGLengthContext& lctx,
- const SkPaint& paint, SkPathFillType) const {
+ const SkPaint& paint, SkPath::FillType) const {
canvas->drawRRect(this->resolve(lctx), paint);
}
diff --git a/experimental/svg/model/SkSVGRect.h b/experimental/svg/model/SkSVGRect.h
index fca15e0..7d749b0 100644
--- a/experimental/svg/model/SkSVGRect.h
+++ b/experimental/svg/model/SkSVGRect.h
@@ -29,7 +29,7 @@
void onSetAttribute(SkSVGAttribute, const SkSVGValue&) override;
void onDraw(SkCanvas*, const SkSVGLengthContext&, const SkPaint&,
- SkPathFillType) const override;
+ SkPath::FillType) const override;
SkPath onAsPath(const SkSVGRenderContext&) const override;
diff --git a/experimental/svg/model/SkSVGShape.h b/experimental/svg/model/SkSVGShape.h
index ff57d5b..bfbad0e 100644
--- a/experimental/svg/model/SkSVGShape.h
+++ b/experimental/svg/model/SkSVGShape.h
@@ -26,7 +26,7 @@
void onRender(const SkSVGRenderContext&) const final;
virtual void onDraw(SkCanvas*, const SkSVGLengthContext&, const SkPaint&,
- SkPathFillType) const = 0;
+ SkPath::FillType) const = 0;
private:
typedef SkSVGTransformableNode INHERITED;
diff --git a/experimental/svg/model/SkSVGTypes.h b/experimental/svg/model/SkSVGTypes.h
index 00a09bf..9ac7654 100644
--- a/experimental/svg/model/SkSVGTypes.h
+++ b/experimental/svg/model/SkSVGTypes.h
@@ -239,9 +239,9 @@
Type type() const { return fType; }
- SkPathFillType asFillType() const {
+ SkPath::FillType asFillType() const {
SkASSERT(fType != Type::kInherit); // should never be called for unresolved values.
- return fType == Type::kEvenOdd ? SkPathFillType::kEvenOdd : SkPathFillType::kWinding;
+ return fType == Type::kEvenOdd ? SkPath::kEvenOdd_FillType : SkPath::kWinding_FillType;
}
private:
diff --git a/fuzz/FuzzCommon.cpp b/fuzz/FuzzCommon.cpp
index 5478cc0..0de7ce0 100644
--- a/fuzz/FuzzCommon.cpp
+++ b/fuzz/FuzzCommon.cpp
@@ -33,8 +33,8 @@
return;
}
uint8_t fillType;
- fuzz->nextRange(&fillType, 0, (uint8_t)SkPathFillType::kInverseEvenOdd);
- path->setFillType((SkPathFillType)fillType);
+ fuzz->nextRange(&fillType, 0, (uint8_t)SkPath::kInverseEvenOdd_FillType);
+ path->setFillType((SkPath::FillType)fillType);
uint8_t numOps;
fuzz->nextRange(&numOps, 0, maxOps);
for (uint8_t i = 0; i < numOps; ++i) {
diff --git a/fuzz/FuzzPathop.cpp b/fuzz/FuzzPathop.cpp
index 30dc2a9..63862a9 100644
--- a/fuzz/FuzzPathop.cpp
+++ b/fuzz/FuzzPathop.cpp
@@ -25,8 +25,8 @@
for (uint8_t i = 0; i < ops && !fuzz->exhausted(); i++) {
SkPath path;
FuzzEvilPath(fuzz, &path, SkPath::Verb::kDone_Verb);
- SkPathFillType ft;
- fuzz->nextRange(&ft, 0, (int)SkPathFillType::kInverseEvenOdd);
+ SkPath::FillType ft;
+ fuzz->nextRange(&ft, 0, SkPath::kInverseEvenOdd_FillType);
path.setFillType(ft);
SkPathOp op;
@@ -41,8 +41,8 @@
case 1: {
SkPath path;
FuzzEvilPath(fuzz, &path, SkPath::Verb::kDone_Verb);
- SkPathFillType ft;
- fuzz->nextRange(&ft, 0, (int)SkPathFillType::kInverseEvenOdd);
+ SkPath::FillType ft;
+ fuzz->nextRange(&ft, 0, SkPath::kInverseEvenOdd_FillType);
path.setFillType(ft);
SkPath result;
@@ -57,13 +57,13 @@
case 2: {
SkPath path;
FuzzEvilPath(fuzz, &path, SkPath::Verb::kDone_Verb);
- SkPathFillType ft;
- fuzz->nextRange(&ft, 0, SkPathFillType::kInverseEvenOdd);
+ SkPath::FillType ft;
+ fuzz->nextRange(&ft, 0, SkPath::kInverseEvenOdd_FillType);
path.setFillType(ft);
SkPath path2;
FuzzEvilPath(fuzz, &path2, SkPath::Verb::kDone_Verb);
- fuzz->nextRange(&ft, 0, SkPathFillType::kInverseEvenOdd);
+ fuzz->nextRange(&ft, 0, SkPath::kInverseEvenOdd_FillType);
path.setFillType(ft);
SkPathOp op;
@@ -83,8 +83,8 @@
case 3: {
SkPath path;
FuzzEvilPath(fuzz, &path, SkPath::Verb::kDone_Verb);
- SkPathFillType ft;
- fuzz->nextRange(&ft, 0, SkPathFillType::kInverseEvenOdd);
+ SkPath::FillType ft;
+ fuzz->nextRange(&ft, 0, SkPath::kInverseEvenOdd_FillType);
path.setFillType(ft);
SkPath result;
@@ -99,8 +99,8 @@
case 4: {
SkPath path;
FuzzEvilPath(fuzz, &path, SkPath::Verb::kDone_Verb);
- SkPathFillType ft;
- fuzz->nextRange(&ft, 0, SkPathFillType::kInverseEvenOdd);
+ SkPath::FillType ft;
+ fuzz->nextRange(&ft, 0, SkPath::kInverseEvenOdd_FillType);
path.setFillType(ft);
SkRect result;
diff --git a/gm/aaa.cpp b/gm/aaa.cpp
index 00f4474..4ebd25e 100644
--- a/gm/aaa.cpp
+++ b/gm/aaa.cpp
@@ -143,7 +143,7 @@
SkPath path;
path.addCircle(100, 100, 30);
- path.setFillType(SkPathFillType::kInverseWinding);
+ path.setFillType(SkPath::kInverseWinding_FillType);
canvas->drawPath(path, p);
canvas->restore();
}
diff --git a/gm/blurrect.cpp b/gm/blurrect.cpp
index 35bafc7..4d30c98 100644
--- a/gm/blurrect.cpp
+++ b/gm/blurrect.cpp
@@ -53,7 +53,7 @@
rect.inset(STROKE_WIDTH/2, STROKE_WIDTH/2);
path.addRect(rect);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
canvas->drawPath(path, p);
}
@@ -71,7 +71,7 @@
rect.offset(7, -7);
path.addRect(rect);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
canvas->drawPath(path, p);
}
diff --git a/gm/collapsepaths.cpp b/gm/collapsepaths.cpp
index 82233c9..7335171 100644
--- a/gm/collapsepaths.cpp
+++ b/gm/collapsepaths.cpp
@@ -21,7 +21,7 @@
path.moveTo( 370.50653076171875, 73.684051513671875);
path.lineTo( 525.02093505859375, 208.6413726806640625);
path.lineTo( 478.403564453125, 213.5998992919921875);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::FillType::kEvenOdd_FillType);
canvas->drawPath(path, paint);
}
@@ -70,7 +70,7 @@
path.moveTo(154.6182708740234375, 188.230926513671875);
path.lineTo( 430.242095947265625, 546.76605224609375);
path.lineTo( 373.1005859375, 559.0906982421875);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::FillType::kEvenOdd_FillType);
canvas->drawPath(path, paint);
}
@@ -83,7 +83,7 @@
path.moveTo(39.09362030029296875, 47.59223175048828125);
path.lineTo(108.7822418212890625, 138.244110107421875);
path.lineTo(94.33460235595703125, 141.360260009765625);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::FillType::kEvenOdd_FillType);
canvas->drawPath(path, paint);
}
@@ -96,7 +96,7 @@
path.moveTo(40.33458709716796875, 49.10297393798828125);
path.lineTo(112.2353668212890625, 142.6324462890625);
path.lineTo(97.32910919189453125, 145.8475189208984375);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::FillType::kEvenOdd_FillType);
canvas->drawPath(path, paint);
}
@@ -109,7 +109,7 @@
path.moveTo( 34.50, 42.00);
path.lineTo( 96.00, 122.00);
path.lineTo( 83.25, 124.75);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::FillType::kEvenOdd_FillType);
canvas->drawPath(path, paint);
}
@@ -125,7 +125,7 @@
path.lineTo(SkDoubleToScalar(100.167), SkDoubleToScalar(140.096));
path.lineTo(SkDoubleToScalar( 99.0364), SkDoubleToScalar(140.364));
path.lineTo(SkDoubleToScalar( 94.25), SkDoubleToScalar(141.50));
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::FillType::kEvenOdd_FillType);
canvas->drawPath(path, paint);
}
diff --git a/gm/complexclip.cpp b/gm/complexclip.cpp
index 944251a..3e53783 100644
--- a/gm/complexclip.cpp
+++ b/gm/complexclip.cpp
@@ -68,9 +68,9 @@
.lineTo(50, 150)
.close();
if (fInvertDraw) {
- path.setFillType(SkPathFillType::kInverseEvenOdd);
+ path.setFillType(SkPath::kInverseEvenOdd_FillType);
} else {
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
}
SkPaint pathPaint;
pathPaint.setAntiAlias(true);
@@ -126,10 +126,10 @@
bool doInvB = SkToBool(invBits & 2);
canvas->save();
// set clip
- clipA.setFillType(doInvA ? SkPathFillType::kInverseEvenOdd :
- SkPathFillType::kEvenOdd);
- clipB.setFillType(doInvB ? SkPathFillType::kInverseEvenOdd :
- SkPathFillType::kEvenOdd);
+ clipA.setFillType(doInvA ? SkPath::kInverseEvenOdd_FillType :
+ SkPath::kEvenOdd_FillType);
+ clipB.setFillType(doInvB ? SkPath::kInverseEvenOdd_FillType :
+ SkPath::kEvenOdd_FillType);
canvas->clipPath(clipA, fDoAAClip);
canvas->clipPath(clipB, gOps[op].fOp, fDoAAClip);
diff --git a/gm/complexclip3.cpp b/gm/complexclip3.cpp
index b48c35d..f138ee0 100644
--- a/gm/complexclip3.cpp
+++ b/gm/complexclip3.cpp
@@ -96,10 +96,10 @@
bool doInvB = SkToBool(invB);
canvas->save();
// set clip
- firstClip->setFillType(doInvA ? SkPathFillType::kInverseEvenOdd :
- SkPathFillType::kEvenOdd);
- secondClip->setFillType(doInvB ? SkPathFillType::kInverseEvenOdd :
- SkPathFillType::kEvenOdd);
+ firstClip->setFillType(doInvA ? SkPath::kInverseEvenOdd_FillType :
+ SkPath::kEvenOdd_FillType);
+ secondClip->setFillType(doInvB ? SkPath::kInverseEvenOdd_FillType :
+ SkPath::kEvenOdd_FillType);
canvas->clipPath(*firstClip, doAAA);
canvas->clipPath(*secondClip, gOps[op].fOp, doAAB);
diff --git a/gm/convex_all_line_paths.cpp b/gm/convex_all_line_paths.cpp
index 6adb597..1936dfc 100644
--- a/gm/convex_all_line_paths.cpp
+++ b/gm/convex_all_line_paths.cpp
@@ -374,7 +374,7 @@
// inset rings into outsets when adjacent bisector angles converged outside the previous
// ring due to accumulated error.
SkPath p3;
- p3.setFillType(SkPathFillType::kEvenOdd);
+ p3.setFillType(SkPath::kEvenOdd_FillType);
p3.moveTo(1184.96f, 982.557f);
p3.lineTo(1183.71f, 982.865f);
p3.lineTo(1180.99f, 982.734f);
diff --git a/gm/crbug_788500.cpp b/gm/crbug_788500.cpp
index a0a1ad3..9a35bfc 100644
--- a/gm/crbug_788500.cpp
+++ b/gm/crbug_788500.cpp
@@ -12,7 +12,7 @@
DEF_SIMPLE_GM(crbug_788500, canvas, 300, 300) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.moveTo(245.5f, 98.5f);
path.cubicTo(245.5f, 98.5f, 242, 78, 260, 75);
diff --git a/gm/crbug_908646.cpp b/gm/crbug_908646.cpp
index 3d11276..843799e 100644
--- a/gm/crbug_908646.cpp
+++ b/gm/crbug_908646.cpp
@@ -14,7 +14,7 @@
SkPaint paint;
paint.setAntiAlias(true);
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(50, 50);
path.lineTo(50, 300);
path.lineTo(250, 300);
diff --git a/gm/cubicpaths.cpp b/gm/cubicpaths.cpp
index a09d612..b38c0f8 100644
--- a/gm/cubicpaths.cpp
+++ b/gm/cubicpaths.cpp
@@ -125,7 +125,7 @@
void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join,
- SkPaint::Style style, SkPathFillType fill,
+ SkPaint::Style style, SkPath::FillType fill,
SkScalar strokeWidth) {
path.setFillType(fill);
SkPaint paint;
@@ -142,14 +142,14 @@
void onDraw(SkCanvas* canvas) override {
struct FillAndName {
- SkPathFillType fFill;
+ SkPath::FillType fFill;
const char* fName;
};
constexpr FillAndName gFills[] = {
- {SkPathFillType::kWinding, "Winding"},
- {SkPathFillType::kEvenOdd, "Even / Odd"},
- {SkPathFillType::kInverseWinding, "Inverse Winding"},
- {SkPathFillType::kInverseEvenOdd, "Inverse Even / Odd"},
+ {SkPath::kWinding_FillType, "Winding"},
+ {SkPath::kEvenOdd_FillType, "Even / Odd"},
+ {SkPath::kInverseWinding_FillType, "Inverse Winding"},
+ {SkPath::kInverseEvenOdd_FillType, "Inverse Even / Odd"},
};
struct StyleAndName {
SkPaint::Style fStyle;
@@ -244,7 +244,7 @@
void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join,
- SkPaint::Style style, SkPathFillType fill,
+ SkPaint::Style style, SkPath::FillType fill,
SkScalar strokeWidth) {
path.setFillType(fill);
SkPaint paint;
@@ -261,14 +261,14 @@
virtual void onDraw(SkCanvas* canvas) override {
struct FillAndName {
- SkPathFillType fFill;
+ SkPath::FillType fFill;
const char* fName;
};
constexpr FillAndName gFills[] = {
- {SkPathFillType::kWinding, "Winding"},
- {SkPathFillType::kEvenOdd, "Even / Odd"},
- {SkPathFillType::kInverseWinding, "Inverse Winding"},
- {SkPathFillType::kInverseEvenOdd, "Inverse Even / Odd"},
+ {SkPath::kWinding_FillType, "Winding"},
+ {SkPath::kEvenOdd_FillType, "Even / Odd"},
+ {SkPath::kInverseWinding_FillType, "Inverse Winding"},
+ {SkPath::kInverseEvenOdd_FillType, "Inverse Even / Odd"},
};
struct StyleAndName {
SkPaint::Style fStyle;
diff --git a/gm/degeneratesegments.cpp b/gm/degeneratesegments.cpp
index f96d049..e733528 100644
--- a/gm/degeneratesegments.cpp
+++ b/gm/degeneratesegments.cpp
@@ -197,7 +197,7 @@
void drawPath(SkPath& path, SkCanvas* canvas, SkColor color,
const SkRect& clip, SkPaint::Cap cap, SkPaint::Join join,
- SkPaint::Style style, SkPathFillType fill,
+ SkPaint::Style style, SkPath::FillType fill,
SkScalar strokeWidth) {
path.setFillType(fill);
SkPaint paint;
@@ -261,14 +261,14 @@
};
struct FillAndName {
- SkPathFillType fFill;
+ SkPath::FillType fFill;
const char* fName;
};
constexpr FillAndName gFills[] = {
- {SkPathFillType::kWinding, "Winding"},
- {SkPathFillType::kEvenOdd, "Even / Odd"},
- {SkPathFillType::kInverseWinding, "Inverse Winding"},
- {SkPathFillType::kInverseEvenOdd, "Inverse Even / Odd"}
+ {SkPath::kWinding_FillType, "Winding"},
+ {SkPath::kEvenOdd_FillType, "Even / Odd"},
+ {SkPath::kInverseWinding_FillType, "Inverse Winding"},
+ {SkPath::kInverseEvenOdd_FillType, "Inverse Even / Odd"}
};
struct StyleAndName {
SkPaint::Style fStyle;
diff --git a/gm/dstreadshuffle.cpp b/gm/dstreadshuffle.cpp
index 9e6a7ad..d9a2a9f 100644
--- a/gm/dstreadshuffle.cpp
+++ b/gm/dstreadshuffle.cpp
@@ -90,7 +90,7 @@
for (int i = 0; i < 5; ++i) {
fConcavePath.lineTo(points[(2 * i) % 5]);
}
- fConcavePath.setFillType(SkPathFillType::kEvenOdd);
+ fConcavePath.setFillType(SkPath::kEvenOdd_FillType);
SkASSERT(!fConcavePath.isConvex());
}
canvas->drawPath(fConcavePath, *paint);
diff --git a/gm/emptypath.cpp b/gm/emptypath.cpp
index 154ece5..126db9e 100644
--- a/gm/emptypath.cpp
+++ b/gm/emptypath.cpp
@@ -32,7 +32,7 @@
SkColor color,
const SkRect& clip,
SkPaint::Style style,
- SkPathFillType fill) {
+ SkPath::FillType fill) {
SkPath path;
path.setFillType(fill);
SkPaint paint;
@@ -46,14 +46,14 @@
void onDraw(SkCanvas* canvas) override {
struct FillAndName {
- SkPathFillType fFill;
+ SkPath::FillType fFill;
const char* fName;
};
constexpr FillAndName gFills[] = {
- {SkPathFillType::kWinding, "Winding"},
- {SkPathFillType::kEvenOdd, "Even / Odd"},
- {SkPathFillType::kInverseWinding, "Inverse Winding"},
- {SkPathFillType::kInverseEvenOdd, "Inverse Even / Odd"},
+ {SkPath::kWinding_FillType, "Winding"},
+ {SkPath::kEvenOdd_FillType, "Even / Odd"},
+ {SkPath::kInverseWinding_FillType, "Inverse Winding"},
+ {SkPath::kInverseEvenOdd_FillType, "Inverse Even / Odd"},
};
struct StyleAndName {
SkPaint::Style fStyle;
diff --git a/gm/filltypes.cpp b/gm/filltypes.cpp
index f8d74da..0b251eb 100644
--- a/gm/filltypes.cpp
+++ b/gm/filltypes.cpp
@@ -42,7 +42,7 @@
return SkISize::Make(835, 840);
}
- void showPath(SkCanvas* canvas, int x, int y, SkPathFillType ft,
+ void showPath(SkCanvas* canvas, int x, int y, SkPath::FillType ft,
SkScalar scale, const SkPaint& paint) {
const SkRect r = { 0, 0, SkIntToScalar(150), SkIntToScalar(150) };
@@ -59,13 +59,13 @@
}
void showFour(SkCanvas* canvas, SkScalar scale, const SkPaint& paint) {
- showPath(canvas, 0, 0, SkPathFillType::kWinding,
+ showPath(canvas, 0, 0, SkPath::kWinding_FillType,
scale, paint);
- showPath(canvas, 200, 0, SkPathFillType::kEvenOdd,
+ showPath(canvas, 200, 0, SkPath::kEvenOdd_FillType,
scale, paint);
- showPath(canvas, 00, 200, SkPathFillType::kInverseWinding,
+ showPath(canvas, 00, 200, SkPath::kInverseWinding_FillType,
scale, paint);
- showPath(canvas, 200, 200, SkPathFillType::kInverseEvenOdd,
+ showPath(canvas, 200, 200, SkPath::kInverseEvenOdd_FillType,
scale, paint);
}
diff --git a/gm/filltypespersp.cpp b/gm/filltypespersp.cpp
index b3d9caa..4edaa3a 100644
--- a/gm/filltypespersp.cpp
+++ b/gm/filltypespersp.cpp
@@ -46,7 +46,7 @@
return SkISize::Make(835, 840);
}
- void showPath(SkCanvas* canvas, int x, int y, SkPathFillType ft,
+ void showPath(SkCanvas* canvas, int x, int y, SkPath::FillType ft,
SkScalar scale, const SkPaint& paint) {
const SkRect r = { 0, 0, SkIntToScalar(150), SkIntToScalar(150) };
@@ -75,13 +75,13 @@
SkTileMode::kClamp));
paint.setAntiAlias(aa);
- showPath(canvas, 0, 0, SkPathFillType::kWinding,
+ showPath(canvas, 0, 0, SkPath::kWinding_FillType,
scale, paint);
- showPath(canvas, 200, 0, SkPathFillType::kEvenOdd,
+ showPath(canvas, 200, 0, SkPath::kEvenOdd_FillType,
scale, paint);
- showPath(canvas, 00, 200, SkPathFillType::kInverseWinding,
+ showPath(canvas, 00, 200, SkPath::kInverseWinding_FillType,
scale, paint);
- showPath(canvas, 200, 200, SkPathFillType::kInverseEvenOdd,
+ showPath(canvas, 200, 200, SkPath::kInverseEvenOdd_FillType,
scale, paint);
}
diff --git a/gm/hittestpath.cpp b/gm/hittestpath.cpp
index d482e49..27dab17 100644
--- a/gm/hittestpath.cpp
+++ b/gm/hittestpath.cpp
@@ -53,13 +53,13 @@
randoms[10] * scale, randoms[11] * scale);
}
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.offset(SkIntToScalar(20), SkIntToScalar(20));
test_hittest(canvas, path);
canvas->translate(SkIntToScalar(scale), 0);
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
test_hittest(canvas, path);
}
diff --git a/gm/inverseclip.cpp b/gm/inverseclip.cpp
index 9d7b910..f7dfb79 100644
--- a/gm/inverseclip.cpp
+++ b/gm/inverseclip.cpp
@@ -12,7 +12,7 @@
// Repro case for http://skbug.com/9453
DEF_SIMPLE_GM(inverseclip, canvas, 400, 400) {
SkPath clip;
- clip.setFillType(SkPathFillType::kInverseWinding);
+ clip.setFillType(SkPath::kInverseWinding_FillType);
clip.moveTo(195.448f, 31);
clip.cubicTo(97.9925f, 31, 18.99f, 105.23f, 18.99f, 196.797f);
clip.cubicTo(18.99f, 288.365f, 97.9925f, 362.595f, 195.448f, 362.595f);
diff --git a/gm/inversepaths.cpp b/gm/inversepaths.cpp
index a6cd1bd..7ddf088 100644
--- a/gm/inversepaths.cpp
+++ b/gm/inversepaths.cpp
@@ -131,10 +131,10 @@
canvas->clipRect(clipRect);
SkPath path = paths[pathIndex](cx, cy, size);
- path.setFillType(SkPathFillType::kInverseWinding);
+ path.setFillType(SkPath::kInverseWinding_FillType);
canvas->drawPath(path, paint);
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
canvas->drawPath(path, outlinePaint);
canvas->restore();
diff --git a/gm/linepaths.cpp b/gm/linepaths.cpp
index c4e6ffd..25ffde2 100644
--- a/gm/linepaths.cpp
+++ b/gm/linepaths.cpp
@@ -20,7 +20,7 @@
static void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join,
- SkPaint::Style style, SkPathFillType fill,
+ SkPaint::Style style, SkPath::FillType fill,
SkScalar strokeWidth) {
path.setFillType(fill);
SkPaint paint;
@@ -37,14 +37,14 @@
static void draw(SkCanvas* canvas, bool doClose) {
struct FillAndName {
- SkPathFillType fFill;
+ SkPath::FillType fFill;
const char* fName;
};
constexpr FillAndName gFills[] = {
- {SkPathFillType::kWinding, "Winding"},
- {SkPathFillType::kEvenOdd, "Even / Odd"},
- {SkPathFillType::kInverseWinding, "Inverse Winding"},
- {SkPathFillType::kInverseEvenOdd, "Inverse Even / Odd"},
+ {SkPath::kWinding_FillType, "Winding"},
+ {SkPath::kEvenOdd_FillType, "Even / Odd"},
+ {SkPath::kInverseWinding_FillType, "Inverse Winding"},
+ {SkPath::kInverseEvenOdd_FillType, "Inverse Even / Odd"},
};
struct StyleAndName {
SkPaint::Style fStyle;
diff --git a/gm/mandoline.cpp b/gm/mandoline.cpp
index 6f943fc..a675013 100644
--- a/gm/mandoline.cpp
+++ b/gm/mandoline.cpp
@@ -28,7 +28,7 @@
static constexpr int kDefaultSubdivisions = 10;
MandolineSlicer(SkPoint anchorPt) {
- fPath.setFillType(SkPathFillType::kEvenOdd);
+ fPath.setFillType(SkPath::kEvenOdd_FillType);
fPath.setIsVolatile(true);
this->reset(anchorPt);
}
diff --git a/gm/pathinterior.cpp b/gm/pathinterior.cpp
index eb83d93..8480b22 100644
--- a/gm/pathinterior.cpp
+++ b/gm/pathinterior.cpp
@@ -75,7 +75,7 @@
for (int outerCW = 0; outerCW <= 1; ++outerCW) {
for (int innerCW = 0; innerCW <= 1; ++innerCW) {
SkPath path;
- path.setFillType(doEvenOdd ? SkPathFillType::kEvenOdd : SkPathFillType::kWinding);
+ path.setFillType(doEvenOdd ? SkPath::kEvenOdd_FillType : SkPath::kWinding_FillType);
SkPathDirection outerDir = outerCW ? SkPathDirection::kCW : SkPathDirection::kCCW;
SkPathDirection innerDir = innerCW ? SkPathDirection::kCW : SkPathDirection::kCCW;
diff --git a/gm/pathmaskcache.cpp b/gm/pathmaskcache.cpp
index 07642fe..8014275 100644
--- a/gm/pathmaskcache.cpp
+++ b/gm/pathmaskcache.cpp
@@ -86,7 +86,7 @@
paths.push_back();
paths.back().addCircle(30.f, 30.f, 30.f);
paths.back().addRect(SkRect::MakeXYWH(45.f, 45.f, 50.f, 60.f));
- paths.back().setFillType(SkPathFillType::kEvenOdd);
+ paths.back().setFillType(SkPath::kEvenOdd_FillType);
canvas->translate(kPad, kPad);
diff --git a/gm/pathopsinverse.cpp b/gm/pathopsinverse.cpp
index 54c494b..60f80d0 100644
--- a/gm/pathopsinverse.cpp
+++ b/gm/pathopsinverse.cpp
@@ -69,11 +69,11 @@
SkPath one, two;
int yPos = 0;
for (int oneFill = 0; oneFill <= 1; ++oneFill) {
- SkPathFillType oneF = oneFill ? SkPathFillType::kInverseEvenOdd
- : SkPathFillType::kEvenOdd;
+ SkPath::FillType oneF = oneFill ? SkPath::kInverseEvenOdd_FillType
+ : SkPath::kEvenOdd_FillType;
for (int twoFill = 0; twoFill <= 1; ++twoFill) {
- SkPathFillType twoF = twoFill ? SkPathFillType::kInverseEvenOdd
- : SkPathFillType::kEvenOdd;
+ SkPath::FillType twoF = twoFill ? SkPath::kInverseEvenOdd_FillType
+ : SkPath::kEvenOdd_FillType;
one.reset();
one.setFillType(oneF);
one.addRect(10, 10, 70, 70);
diff --git a/gm/preservefillrule.cpp b/gm/preservefillrule.cpp
index 26ff7f6..dfbed2d 100644
--- a/gm/preservefillrule.cpp
+++ b/gm/preservefillrule.cpp
@@ -82,19 +82,19 @@
auto starRect = SkRect::MakeWH(fStarSize, fStarSize);
SkPath star7_winding = ToolUtils::make_star(starRect, 7);
- star7_winding.setFillType(SkPathFillType::kWinding);
+ star7_winding.setFillType(SkPath::kWinding_FillType);
SkPath star7_evenOdd = star7_winding;
star7_evenOdd.transform(SkMatrix::MakeTrans(0, fStarSize));
- star7_evenOdd.setFillType(SkPathFillType::kEvenOdd);
+ star7_evenOdd.setFillType(SkPath::kEvenOdd_FillType);
SkPath star5_winding = ToolUtils::make_star(starRect, 5);
star5_winding.transform(SkMatrix::MakeTrans(fStarSize, 0));
- star5_winding.setFillType(SkPathFillType::kWinding);
+ star5_winding.setFillType(SkPath::kWinding_FillType);
SkPath star5_evenOdd = star5_winding;
star5_evenOdd.transform(SkMatrix::MakeTrans(0, fStarSize));
- star5_evenOdd.setFillType(SkPathFillType::kEvenOdd);
+ star5_evenOdd.setFillType(SkPath::kEvenOdd_FillType);
SkPaint paint;
paint.setColor(SK_ColorGREEN);
diff --git a/gm/quadpaths.cpp b/gm/quadpaths.cpp
index 8570934..359661f 100644
--- a/gm/quadpaths.cpp
+++ b/gm/quadpaths.cpp
@@ -36,7 +36,7 @@
void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join,
- SkPaint::Style style, SkPathFillType fill,
+ SkPaint::Style style, SkPath::FillType fill,
SkScalar strokeWidth) {
path.setFillType(fill);
SkPaint paint;
@@ -53,14 +53,14 @@
void onDraw(SkCanvas* canvas) override {
struct FillAndName {
- SkPathFillType fFill;
+ SkPath::FillType fFill;
const char* fName;
};
constexpr FillAndName gFills[] = {
- {SkPathFillType::kWinding, "Winding"},
- {SkPathFillType::kEvenOdd, "Even / Odd"},
- {SkPathFillType::kInverseWinding, "Inverse Winding"},
- {SkPathFillType::kInverseEvenOdd, "Inverse Even / Odd"},
+ {SkPath::kWinding_FillType, "Winding"},
+ {SkPath::kEvenOdd_FillType, "Even / Odd"},
+ {SkPath::kInverseWinding_FillType, "Inverse Winding"},
+ {SkPath::kInverseEvenOdd_FillType, "Inverse Even / Odd"},
};
struct StyleAndName {
SkPaint::Style fStyle;
@@ -166,7 +166,7 @@
void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join,
- SkPaint::Style style, SkPathFillType fill,
+ SkPaint::Style style, SkPath::FillType fill,
SkScalar strokeWidth) {
path.setFillType(fill);
SkPaint paint;
@@ -183,14 +183,14 @@
void onDraw(SkCanvas* canvas) override {
struct FillAndName {
- SkPathFillType fFill;
+ SkPath::FillType fFill;
const char* fName;
};
constexpr FillAndName gFills[] = {
- {SkPathFillType::kWinding, "Winding"},
- {SkPathFillType::kEvenOdd, "Even / Odd"},
- {SkPathFillType::kInverseWinding, "Inverse Winding"},
- {SkPathFillType::kInverseEvenOdd, "Inverse Even / Odd"},
+ {SkPath::kWinding_FillType, "Winding"},
+ {SkPath::kEvenOdd_FillType, "Even / Odd"},
+ {SkPath::kInverseWinding_FillType, "Inverse Winding"},
+ {SkPath::kInverseEvenOdd_FillType, "Inverse Even / Odd"},
};
struct StyleAndName {
SkPaint::Style fStyle;
diff --git a/gm/sharedcorners.cpp b/gm/sharedcorners.cpp
index 88323b8..7fc8fd1 100644
--- a/gm/sharedcorners.cpp
+++ b/gm/sharedcorners.cpp
@@ -112,7 +112,7 @@
void drawTriangleBoxes(SkCanvas* canvas, const std::vector<SkPoint>& points,
const std::vector<std::array<int, 3>>& triangles) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.setIsVolatile(true);
for (const std::array<int, 3>& triangle : triangles) {
path.moveTo(points[triangle[0]]);
diff --git a/gm/skbug1719.cpp b/gm/skbug1719.cpp
index 1f4ec10..177b903 100644
--- a/gm/skbug1719.cpp
+++ b/gm/skbug1719.cpp
@@ -59,7 +59,7 @@
drawPath.lineTo(824.f, 662.f);
drawPath.cubicTo(824.f, 657.58173f, 827.58173f, 654.f, 832.f, 654.f);
drawPath.close();
- drawPath.setFillType(SkPathFillType::kEvenOdd);
+ drawPath.setFillType(SkPath::kEvenOdd_FillType);
SkPaint paint;
paint.setAntiAlias(true);
diff --git a/gm/strokefill.cpp b/gm/strokefill.cpp
index 095da77..0533024 100644
--- a/gm/strokefill.cpp
+++ b/gm/strokefill.cpp
@@ -282,13 +282,13 @@
paint.setStyle(SkPaint::kStrokeAndFill_Style);
SkPath path;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.addCircle(x, y + SkIntToScalar(200), SkIntToScalar(50), SkPathDirection::kCW);
path.addCircle(x, y + SkIntToScalar(200), SkIntToScalar(40), SkPathDirection::kCCW);
canvas->drawPath(path, paint);
SkPath path2;
- path2.setFillType(SkPathFillType::kWinding);
+ path2.setFillType(SkPath::kWinding_FillType);
path2.addCircle(x + SkIntToScalar(120), y + SkIntToScalar(200), SkIntToScalar(50), SkPathDirection::kCCW);
path2.addCircle(x + SkIntToScalar(120), y + SkIntToScalar(200), SkIntToScalar(40), SkPathDirection::kCW);
canvas->drawPath(path2, paint);
@@ -307,7 +307,7 @@
SkRect r = SkRect::MakeXYWH(x - SkIntToScalar(50), y + SkIntToScalar(280),
SkIntToScalar(100), SkIntToScalar(100));
SkPath path3;
- path3.setFillType(SkPathFillType::kWinding);
+ path3.setFillType(SkPath::kWinding_FillType);
path3.addRect(r, SkPathDirection::kCW);
r.inset(SkIntToScalar(10), SkIntToScalar(10));
path3.addRect(r, SkPathDirection::kCCW);
@@ -316,7 +316,7 @@
r = SkRect::MakeXYWH(x + SkIntToScalar(70), y + SkIntToScalar(280),
SkIntToScalar(100), SkIntToScalar(100));
SkPath path4;
- path4.setFillType(SkPathFillType::kWinding);
+ path4.setFillType(SkPath::kWinding_FillType);
path4.addRect(r, SkPathDirection::kCCW);
r.inset(SkIntToScalar(10), SkIntToScalar(10));
path4.addRect(r, SkPathDirection::kCW);
diff --git a/gn/flutter_defines.gni b/gn/flutter_defines.gni
index 60ee9c9..4ab268c 100644
--- a/gn/flutter_defines.gni
+++ b/gn/flutter_defines.gni
@@ -14,7 +14,6 @@
# API staging
"SK_SUPPORT_LEGACY_PATH_DIRECTION_ENUM",
- "SK_SUPPORT_LEGACY_PATH_FILLTYPE_ENUM",
# Flutter doesn't deserialize anything.
"SK_DISABLE_READBUFFER",
diff --git a/include/core/SkPath.h b/include/core/SkPath.h
index c6adff6..da5bda1 100644
--- a/include/core/SkPath.h
+++ b/include/core/SkPath.h
@@ -165,7 +165,6 @@
*/
bool interpolate(const SkPath& ending, SkScalar weight, SkPath* out) const;
-#ifdef SK_SUPPORT_LEGACY_PATH_FILLTYPE_ENUM
/** \enum SkPath::FillType
FillType selects the rule used to fill SkPath. SkPath set to kWinding_FillType
fills if the sum of contour edges is not zero, where clockwise edges add one, and
@@ -200,62 +199,12 @@
fFillType = SkToU8(ft);
}
- /** Returns true if fill is inverted and SkPath with fill represents area outside
- of its geometric bounds.
-
- @param fill one of: kWinding_FillType, kEvenOdd_FillType,
- kInverseWinding_FillType, kInverseEvenOdd_FillType
- @return true if SkPath fills outside its bounds
- */
- static bool IsInverseFillType(FillType fill) {
- static_assert(0 == kWinding_FillType, "fill_type_mismatch");
- static_assert(1 == kEvenOdd_FillType, "fill_type_mismatch");
- static_assert(2 == kInverseWinding_FillType, "fill_type_mismatch");
- static_assert(3 == kInverseEvenOdd_FillType, "fill_type_mismatch");
- return (fill & 2) != 0;
- }
-
- /** Returns equivalent SkPath::FillType representing SkPath fill inside its bounds.
- .
-
- @param fill one of: kWinding_FillType, kEvenOdd_FillType,
- kInverseWinding_FillType, kInverseEvenOdd_FillType
- @return fill, or kWinding_FillType or kEvenOdd_FillType if fill is inverted
- */
- static FillType ConvertToNonInverseFillType(FillType fill) {
- static_assert(0 == kWinding_FillType, "fill_type_mismatch");
- static_assert(1 == kEvenOdd_FillType, "fill_type_mismatch");
- static_assert(2 == kInverseWinding_FillType, "fill_type_mismatch");
- static_assert(3 == kInverseEvenOdd_FillType, "fill_type_mismatch");
- return (FillType)(fill & 1);
- }
-#else
- /** Returns FillType, the rule used to fill SkPath. FillType of a new SkPath is
- kWinding_FillType.
-
- @return one of: kWinding_FillType, kEvenOdd_FillType, kInverseWinding_FillType,
- kInverseEvenOdd_FillType
- */
- SkPathFillType getFillType() const { return (SkPathFillType)fFillType; }
-#endif
- // Temporary method -- remove when we've switched to the new enum
- SkPathFillType getNewFillType() const { return (SkPathFillType)this->getFillType(); }
-
- /** Sets FillType, the rule used to fill SkPath. While there is no check
- that ft is legal, values outside of FillType are not supported.
-
- @param ft one of: kWinding, kEvenOdd, kInverseWinding, kInverseEvenOdd
- */
- void setFillType(SkPathFillType ft) {
- fFillType = SkToU8(ft);
- }
-
/** Returns if FillType describes area outside SkPath geometry. The inverse fill area
extends indefinitely.
@return true if FillType is kInverseWinding_FillType or kInverseEvenOdd_FillType
*/
- bool isInverseFillType() const { return SkPathFillType_IsInverse(this->getNewFillType()); }
+ bool isInverseFillType() const { return IsInverseFillType((FillType)fFillType); }
/** Replaces FillType with its inverse. The inverse of FillType describes the area
unmodified by the original FillType.
@@ -355,7 +304,7 @@
bool isRRect(SkRRect* rrect) const;
/** Sets SkPath to its initial state.
- Removes verb array, SkPoint array, and weights, and sets FillType to kWinding.
+ Removes verb array, SkPoint array, and weights, and sets FillType to kWinding_FillType.
Internal storage associated with SkPath is released.
@return reference to SkPath
@@ -365,7 +314,7 @@
SkPath& reset();
/** Sets SkPath to its initial state, preserving internal storage.
- Removes verb array, SkPoint array, and weights, and sets FillType to kWinding.
+ Removes verb array, SkPoint array, and weights, and sets FillType to kWinding_FillType.
Internal storage associated with SkPath is retained.
Use rewind() instead of reset() if SkPath storage will be reused and performance
@@ -1091,6 +1040,36 @@
*/
SkPath& close();
+ /** Returns true if fill is inverted and SkPath with fill represents area outside
+ of its geometric bounds.
+
+ @param fill one of: kWinding_FillType, kEvenOdd_FillType,
+ kInverseWinding_FillType, kInverseEvenOdd_FillType
+ @return true if SkPath fills outside its bounds
+ */
+ static bool IsInverseFillType(FillType fill) {
+ static_assert(0 == kWinding_FillType, "fill_type_mismatch");
+ static_assert(1 == kEvenOdd_FillType, "fill_type_mismatch");
+ static_assert(2 == kInverseWinding_FillType, "fill_type_mismatch");
+ static_assert(3 == kInverseEvenOdd_FillType, "fill_type_mismatch");
+ return (fill & 2) != 0;
+ }
+
+ /** Returns equivalent SkPath::FillType representing SkPath fill inside its bounds.
+ .
+
+ @param fill one of: kWinding_FillType, kEvenOdd_FillType,
+ kInverseWinding_FillType, kInverseEvenOdd_FillType
+ @return fill, or kWinding_FillType or kEvenOdd_FillType if fill is inverted
+ */
+ static FillType ConvertToNonInverseFillType(FillType fill) {
+ static_assert(0 == kWinding_FillType, "fill_type_mismatch");
+ static_assert(1 == kEvenOdd_FillType, "fill_type_mismatch");
+ static_assert(2 == kInverseWinding_FillType, "fill_type_mismatch");
+ static_assert(3 == kInverseEvenOdd_FillType, "fill_type_mismatch");
+ return (FillType)(fill & 1);
+ }
+
/** Approximates conic with quad array. Conic is constructed from start SkPoint p0,
control SkPoint p1, end SkPoint p2, and weight w.
Quad array is stored in pts; this storage is supplied by caller.
diff --git a/include/core/SkPathTypes.h b/include/core/SkPathTypes.h
index 305c119..4f5adf4 100644
--- a/include/core/SkPathTypes.h
+++ b/include/core/SkPathTypes.h
@@ -21,18 +21,6 @@
kInverseEvenOdd
};
-static inline bool SkPathFillType_IsEvenOdd(SkPathFillType ft) {
- return (static_cast<int>(ft) & 1) != 0;
-}
-
-static inline bool SkPathFillType_IsInverse(SkPathFillType ft) {
- return (static_cast<int>(ft) & 2) != 0;
-}
-
-static inline SkPathFillType SkPathFillType_ConvertToNonInverse(SkPathFillType ft) {
- return static_cast<SkPathFillType>(static_cast<int>(ft) & 1);
-}
-
enum class SkPathConvexityType {
kUnknown,
kConvex,
diff --git a/include/private/GrTypesPriv.h b/include/private/GrTypesPriv.h
index 255da0b..f8eebb3 100644
--- a/include/private/GrTypesPriv.h
+++ b/include/private/GrTypesPriv.h
@@ -242,12 +242,12 @@
};
inline GrFillRule GrFillRuleForSkPath(const SkPath& path) {
- switch (path.getNewFillType()) {
- case SkPathFillType::kWinding:
- case SkPathFillType::kInverseWinding:
+ switch (path.getFillType()) {
+ case SkPath::kWinding_FillType:
+ case SkPath::kInverseWinding_FillType:
return GrFillRule::kNonzero;
- case SkPathFillType::kEvenOdd:
- case SkPathFillType::kInverseEvenOdd:
+ case SkPath::kEvenOdd_FillType:
+ case SkPath::kInverseEvenOdd_FillType:
return GrFillRule::kEvenOdd;
}
SkUNREACHABLE;
diff --git a/modules/canvaskit/canvaskit_bindings.cpp b/modules/canvaskit/canvaskit_bindings.cpp
index 2f42b6f..c0c9d5d 100644
--- a/modules/canvaskit/canvaskit_bindings.cpp
+++ b/modules/canvaskit/canvaskit_bindings.cpp
@@ -1272,7 +1272,7 @@
.function("toSVGString", &ToSVGString)
.function("toCmds", &ToCmds)
- .function("setFillType", select_overload<void(SkPathFillType)>(&SkPath::setFillType))
+ .function("setFillType", &SkPath::setFillType)
.function("getFillType", &SkPath::getFillType)
.function("getBounds", &SkPath::getBounds)
.function("computeTightBounds", &SkPath::computeTightBounds)
@@ -1486,11 +1486,11 @@
.value("R16G16_float", SkColorType::kR16G16_float_SkColorType)
.value("R16G16B16A16_unorm", SkColorType::kR16G16B16A16_unorm_SkColorType);
- enum_<SkPathFillType>("FillType")
- .value("Winding", SkPathFillType::kWinding)
- .value("EvenOdd", SkPathFillType::kEvenOdd)
- .value("InverseWinding", SkPathFillType::kInverseWinding)
- .value("InverseEvenOdd", SkPathFillType::kInverseEvenOdd);
+ enum_<SkPath::FillType>("FillType")
+ .value("Winding", SkPath::FillType::kWinding_FillType)
+ .value("EvenOdd", SkPath::FillType::kEvenOdd_FillType)
+ .value("InverseWinding", SkPath::FillType::kInverseWinding_FillType)
+ .value("InverseEvenOdd", SkPath::FillType::kInverseEvenOdd_FillType);
enum_<SkFilterQuality>("FilterQuality")
.value("None", SkFilterQuality::kNone_SkFilterQuality)
diff --git a/modules/pathkit/pathkit_wasm_bindings.cpp b/modules/pathkit/pathkit_wasm_bindings.cpp
index 25aeca9..c47af69 100644
--- a/modules/pathkit/pathkit_wasm_bindings.cpp
+++ b/modules/pathkit/pathkit_wasm_bindings.cpp
@@ -356,9 +356,9 @@
}
JSString GetFillTypeString(const SkPath& path) {
- if (path.getNewFillType() == SkPathFillType::kWinding) {
+ if (path.getFillType() == SkPath::FillType::kWinding_FillType) {
return emscripten::val("nonzero");
- } else if (path.getNewFillType() == SkPathFillType::kEvenOdd) {
+ } else if (path.getFillType() == SkPath::FillType::kEvenOdd_FillType) {
return emscripten::val("evenodd");
} else {
SkDebugf("warning: can't translate inverted filltype to HTML Canvas\n");
@@ -503,7 +503,7 @@
.function("_rect", &ApplyAddRect)
// Extra features
- .function("setFillType", select_overload<void(SkPathFillType)>(&SkPath::setFillType))
+ .function("setFillType", &SkPath::setFillType)
.function("getFillType", &SkPath::getFillType)
.function("getFillTypeString", &GetFillTypeString)
.function("getBounds", &SkPath::getBounds)
@@ -564,11 +564,11 @@
.value("XOR", SkPathOp::kXOR_SkPathOp)
.value("REVERSE_DIFFERENCE", SkPathOp::kReverseDifference_SkPathOp);
- enum_<SkPathFillType>("FillType")
- .value("WINDING", SkPathFillType::kWinding)
- .value("EVENODD", SkPathFillType::kEvenOdd)
- .value("INVERSE_WINDING", SkPathFillType::kInverseWinding)
- .value("INVERSE_EVENODD", SkPathFillType::kInverseEvenOdd);
+ enum_<SkPath::FillType>("FillType")
+ .value("WINDING", SkPath::FillType::kWinding_FillType)
+ .value("EVENODD", SkPath::FillType::kEvenOdd_FillType)
+ .value("INVERSE_WINDING", SkPath::FillType::kInverseWinding_FillType)
+ .value("INVERSE_EVENODD", SkPath::FillType::kInverseEvenOdd_FillType);
constant("MOVE_VERB", MOVE);
constant("LINE_VERB", LINE);
diff --git a/modules/skottie/src/Layer.cpp b/modules/skottie/src/Layer.cpp
index e7423cc..3176e65 100644
--- a/modules/skottie/src/Layer.cpp
+++ b/modules/skottie/src/Layer.cpp
@@ -107,8 +107,8 @@
// "inv" is cumulative with mask info fInvertGeometry
const auto inverted =
(mask_info->fInvertGeometry != ParseDefault<bool>((*m)["inv"], false));
- mask_path->setFillType(inverted ? SkPathFillType::kInverseWinding
- : SkPathFillType::kWinding);
+ mask_path->setFillType(inverted ? SkPath::kInverseWinding_FillType
+ : SkPath::kWinding_FillType);
auto mask_paint = sksg::Color::Make(SK_ColorBLACK);
mask_paint->setAntiAlias(true);
diff --git a/modules/sksg/include/SkSGPath.h b/modules/sksg/include/SkSGPath.h
index d8ffcbe..3f4c2fc 100644
--- a/modules/sksg/include/SkSGPath.h
+++ b/modules/sksg/include/SkSGPath.h
@@ -30,12 +30,12 @@
// Temporarily inlined for SkPathFillType staging
// SG_MAPPED_ATTRIBUTE(FillType, SkPathFillType, fPath)
- SkPathFillType getFillType() const {
- return fPath.getNewFillType();
+ SkPath::FillType getFillType() const {
+ return fPath.getFillType();
}
- void setFillType(SkPathFillType fillType) {
- if (fillType != fPath.getNewFillType()) {
+ void setFillType(SkPath::FillType fillType) {
+ if (fillType != fPath.getFillType()) {
fPath.setFillType(fillType);
this->invalidate();
}
diff --git a/modules/sksg/src/SkSGPath.cpp b/modules/sksg/src/SkSGPath.cpp
index 7ca5a04..9895ee6 100644
--- a/modules/sksg/src/SkSGPath.cpp
+++ b/modules/sksg/src/SkSGPath.cpp
@@ -30,8 +30,8 @@
SkRect Path::onRevalidate(InvalidationController*, const SkMatrix&) {
SkASSERT(this->hasInval());
- const auto ft = fPath.getNewFillType();
- return (ft == SkPathFillType::kWinding || ft == SkPathFillType::kEvenOdd)
+ const auto ft = fPath.getFillType();
+ return (ft == SkPath::kWinding_FillType || ft == SkPath::kEvenOdd_FillType)
// "Containing" fills have finite bounds.
? fPath.computeTightBounds()
// Inverse fills are "infinite".
diff --git a/modules/sksg/src/SkSGPlane.cpp b/modules/sksg/src/SkSGPlane.cpp
index c207289..122ee53 100644
--- a/modules/sksg/src/SkSGPlane.cpp
+++ b/modules/sksg/src/SkSGPlane.cpp
@@ -30,7 +30,7 @@
SkPath Plane::onAsPath() const {
SkPath path;
- path.setFillType(SkPathFillType::kInverseWinding);
+ path.setFillType(SkPath::kInverseWinding_FillType);
return path;
}
diff --git a/samplecode/SampleComplexClip.cpp b/samplecode/SampleComplexClip.cpp
index d903148..4e811a0 100644
--- a/samplecode/SampleComplexClip.cpp
+++ b/samplecode/SampleComplexClip.cpp
@@ -34,7 +34,7 @@
path.quadTo(SkIntToScalar(150), SkIntToScalar(150), SkIntToScalar(125), SkIntToScalar(150));
path.lineTo(SkIntToScalar(50), SkIntToScalar(150));
path.close();
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
SkColor pathColor = SK_ColorBLACK;
SkPaint pathPaint;
pathPaint.setAntiAlias(true);
@@ -99,8 +99,8 @@
}
canvas->save();
// set clip
- clipA.setFillType(invA ? SkPathFillType::kInverseEvenOdd :
- SkPathFillType::kEvenOdd);
+ clipA.setFillType(invA ? SkPath::kInverseEvenOdd_FillType :
+ SkPath::kEvenOdd_FillType);
canvas->clipPath(clipA);
canvas->clipPath(clipB, gOps[op].fOp);
diff --git a/samplecode/SampleFillType.cpp b/samplecode/SampleFillType.cpp
index 230f41b..58e954a 100644
--- a/samplecode/SampleFillType.cpp
+++ b/samplecode/SampleFillType.cpp
@@ -27,7 +27,7 @@
protected:
virtual SkString name() { return SkString("FillType"); }
- void showPath(SkCanvas* canvas, int x, int y, SkPathFillType ft,
+ void showPath(SkCanvas* canvas, int x, int y, SkPath::FillType ft,
SkScalar scale, const SkPaint& paint) {
const SkRect r = { 0, 0, SkIntToScalar(150), SkIntToScalar(150) };
@@ -45,13 +45,13 @@
}
void showFour(SkCanvas* canvas, SkScalar scale, const SkPaint& paint) {
- showPath(canvas, 0, 0, SkPathFillType::kWinding,
+ showPath(canvas, 0, 0, SkPath::kWinding_FillType,
scale, paint);
- showPath(canvas, 200, 0, SkPathFillType::kEvenOdd,
+ showPath(canvas, 200, 0, SkPath::kEvenOdd_FillType,
scale, paint);
- showPath(canvas, 00, 200, SkPathFillType::kInverseWinding,
+ showPath(canvas, 00, 200, SkPath::kInverseWinding_FillType,
scale, paint);
- showPath(canvas, 200, 200, SkPathFillType::kInverseEvenOdd,
+ showPath(canvas, 200, 200, SkPath::kInverseEvenOdd_FillType,
scale, paint);
}
diff --git a/samplecode/SampleFilterQuality.cpp b/samplecode/SampleFilterQuality.cpp
index f18a1a6..54fe4af 100644
--- a/samplecode/SampleFilterQuality.cpp
+++ b/samplecode/SampleFilterQuality.cpp
@@ -42,7 +42,7 @@
canvas->drawColor(SK_ColorWHITE);
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(SkRect::MakeWH(N/2, N));
path.addRect(SkRect::MakeWH(N, N/2));
diff --git a/samplecode/SampleLayerMask.cpp b/samplecode/SampleLayerMask.cpp
index 546c6c4..9785e88 100644
--- a/samplecode/SampleLayerMask.cpp
+++ b/samplecode/SampleLayerMask.cpp
@@ -42,7 +42,7 @@
} else {
SkPath p;
p.addOval(r);
- p.setFillType(SkPathFillType::kInverseWinding);
+ p.setFillType(SkPath::kInverseWinding_FillType);
paint.setBlendMode(SkBlendMode::kDstOut);
canvas->drawPath(p, paint);
}
diff --git a/samplecode/SamplePathText.cpp b/samplecode/SamplePathText.cpp
index 0b8ef02..273573a 100644
--- a/samplecode/SamplePathText.cpp
+++ b/samplecode/SamplePathText.cpp
@@ -278,7 +278,7 @@
SkPath* backpath = &fBackPaths[i];
backpath->reset();
- backpath->setFillType(SkPathFillType::kEvenOdd);
+ backpath->setFillType(SkPath::kEvenOdd_FillType);
SkPath::RawIter iter(glyph.fPath);
SkPath::Verb verb;
diff --git a/samplecode/SampleQuadStroker.cpp b/samplecode/SampleQuadStroker.cpp
index 6b679e2..53bf5eb 100644
--- a/samplecode/SampleQuadStroker.cpp
+++ b/samplecode/SampleQuadStroker.cpp
@@ -488,7 +488,7 @@
paint.setColor(0x3f0f1f3f);
canvas->drawPath(path, paint);
path.reset();
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addCircle(center.fX, center.fY, maxSide + width / 2);
SkRect outside = SkRect::MakeXYWH(center.fX - maxSide - width, center.fY - maxSide - width,
(maxSide + width) * 2, (maxSide + width) * 2);
diff --git a/samplecode/SampleStrokePath.cpp b/samplecode/SampleStrokePath.cpp
index b22ba8d..3ab8bf4 100644
--- a/samplecode/SampleStrokePath.cpp
+++ b/samplecode/SampleStrokePath.cpp
@@ -192,11 +192,11 @@
fPath.offset(100, 0);
#endif
- fPath.setFillType(SkPathFillType::kWinding);
+ fPath.setFillType(SkPath::kWinding_FillType);
drawSet(canvas, &paint);
canvas->translate(0, fPath.getBounds().height() * 5 / 4);
- fPath.setFillType(SkPathFillType::kEvenOdd);
+ fPath.setFillType(SkPath::kEvenOdd_FillType);
drawSet(canvas, &paint);
}
diff --git a/samplecode/SampleTextEffects.cpp b/samplecode/SampleTextEffects.cpp
index 8e57750..2303288 100644
--- a/samplecode/SampleTextEffects.cpp
+++ b/samplecode/SampleTextEffects.cpp
@@ -82,7 +82,7 @@
virtual bool onFilterPath(SkPath* dst, const SkPath& src,
SkStrokeRec*, const SkRect*) const override {
*dst = src;
- dst->setFillType(SkPathFillType::kInverseWinding);
+ dst->setFillType(SkPath::kInverseWinding_FillType);
return true;
}
diff --git a/src/core/SkBlurMF.cpp b/src/core/SkBlurMF.cpp
index cb19ea4..9a4b8e2 100644
--- a/src/core/SkBlurMF.cpp
+++ b/src/core/SkBlurMF.cpp
@@ -370,7 +370,7 @@
SkPath path;
path.addRect(rects[0]);
path.addRect(rects[1]);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
canvas.drawPath(path, paint);
}
return true;
diff --git a/src/core/SkClipStack.cpp b/src/core/SkClipStack.cpp
index f8dad04..9219f67 100644
--- a/src/core/SkClipStack.cpp
+++ b/src/core/SkClipStack.cpp
@@ -129,13 +129,13 @@
case DeviceSpaceType::kRect:
fDeviceSpacePath.init();
fDeviceSpacePath.get()->addRect(this->getDeviceSpaceRect());
- fDeviceSpacePath.get()->setFillType(SkPathFillType::kInverseEvenOdd);
+ fDeviceSpacePath.get()->setFillType(SkPath::kInverseEvenOdd_FillType);
fDeviceSpaceType = DeviceSpaceType::kPath;
break;
case DeviceSpaceType::kRRect:
fDeviceSpacePath.init();
fDeviceSpacePath.get()->addRRect(fDeviceSpaceRRect);
- fDeviceSpacePath.get()->setFillType(SkPathFillType::kInverseEvenOdd);
+ fDeviceSpacePath.get()->setFillType(SkPath::kInverseEvenOdd_FillType);
fDeviceSpaceType = DeviceSpaceType::kPath;
break;
case DeviceSpaceType::kPath:
@@ -752,7 +752,7 @@
bool isAA = false;
path->reset();
- path->setFillType(SkPathFillType::kInverseEvenOdd);
+ path->setFillType(SkPath::kInverseEvenOdd_FillType);
SkClipStack::Iter iter(*this, SkClipStack::Iter::kBottom_IterStart);
while (const SkClipStack::Element* element = iter.next()) {
diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp
index 6a31aee..b1d64b7 100644
--- a/src/core/SkDevice.cpp
+++ b/src/core/SkDevice.cpp
@@ -117,7 +117,7 @@
SkPath path;
path.addRRect(outer);
path.addRRect(inner);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.setIsVolatile(true);
this->drawPath(path, paint, true);
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp
index 296329a..e094da6 100644
--- a/src/core/SkDraw.cpp
+++ b/src/core/SkDraw.cpp
@@ -598,7 +598,7 @@
draw.fMatrix = matrix;
SkPath tmp;
tmp.addRect(prePaintRect);
- tmp.setFillType(SkPathFillType::kWinding);
+ tmp.setFillType(SkPath::kWinding_FillType);
draw.drawPath(tmp, paint, nullptr, true);
}
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 5679a9d..2d4d69f 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -151,7 +151,7 @@
void SkPath::resetFields() {
//fPathRef is assumed to have been emptied by the caller.
fLastMoveToIndex = INITIAL_LASTMOVETOINDEX_VALUE;
- fFillType = SkToU8(SkPathFillType::kWinding);
+ fFillType = kWinding_FillType;
this->setConvexityType(SkPathConvexityType::kUnknown);
this->setFirstDirection(SkPathPriv::kUnknown_FirstDirection);
@@ -1871,7 +1871,7 @@
"InverseWinding",
"InverseEvenOdd",
};
- builder.printf("path.setFillType(SkPathFillType::k%s);\n",
+ builder.printf("path.setFillType(SkPath::k%s_FillType);\n",
gFillTypeStrs[(int) this->getFillType()]);
while ((verb = iter.next(pts)) != kDone_Verb) {
switch (verb) {
@@ -2940,8 +2940,8 @@
break;
}
} while (!done);
- bool evenOddFill = SkPathFillType::kEvenOdd == this->getNewFillType()
- || SkPathFillType::kInverseEvenOdd == this->getNewFillType();
+ bool evenOddFill = SkPath::kEvenOdd_FillType == this->getFillType()
+ || SkPath::kInverseEvenOdd_FillType == this->getFillType();
if (evenOddFill) {
w &= 1;
}
@@ -3123,7 +3123,7 @@
path->reset();
path->setIsVolatile(true);
- path->setFillType(SkPathFillType::kWinding);
+ path->setFillType(SkPath::kWinding_FillType);
if (isFillNoPathEffect && SkScalarAbs(sweepAngle) >= 360.f) {
path->addOval(oval);
SkASSERT(path->isConvex() && DrawArcIsConvex(sweepAngle, false, isFillNoPathEffect));
diff --git a/src/core/SkPath_serial.cpp b/src/core/SkPath_serial.cpp
index b1d85f4..5c94c04 100644
--- a/src/core/SkPath_serial.cpp
+++ b/src/core/SkPath_serial.cpp
@@ -44,8 +44,8 @@
return packed & kVersion_SerializationMask;
}
-static SkPathFillType extract_filltype(uint32_t packed) {
- return static_cast<SkPathFillType>((packed >> kFillType_SerializationShift) & 0x3);
+static SkPath::FillType extract_filltype(uint32_t packed) {
+ return static_cast<SkPath::FillType>((packed >> kFillType_SerializationShift) & 0x3);
}
static SerializationType extract_serializationtype(uint32_t packed) {
@@ -167,7 +167,7 @@
SkASSERT(extract_serializationtype(packed) == SerializationType::kRRect);
uint8_t dir = (packed >> kDirection_SerializationShift) & 0x3;
- SkPathFillType fillType = extract_filltype(packed);
+ FillType fillType = extract_filltype(packed);
SkPathDirection rrectDir;
SkRRect rrect;
diff --git a/src/core/SkScan_AAAPath.cpp b/src/core/SkScan_AAAPath.cpp
index 416df89..891018e 100644
--- a/src/core/SkScan_AAAPath.cpp
+++ b/src/core/SkScan_AAAPath.cpp
@@ -1545,7 +1545,7 @@
static void aaa_walk_edges(SkAnalyticEdge* prevHead,
SkAnalyticEdge* nextTail,
- SkPathFillType fillType,
+ SkPath::FillType fillType,
AdditiveBlitter* blitter,
int start_y,
int stop_y,
@@ -1569,8 +1569,10 @@
update_next_next_y(edge->fUpperY, y, &nextNextY);
}
- int windingMask = SkPathFillType_IsEvenOdd(fillType) ? 1 : -1;
- bool isInverse = SkPathFillType_IsInverse(fillType);
+ // returns 1 for evenodd, -1 for winding, regardless of inverse-ness
+ int windingMask = (fillType & 1) ? 1 : -1;
+
+ bool isInverse = SkPath::IsInverseFillType(fillType);
if (isInverse && SkIntToFixed(start_y) != y) {
int width = SkFixedFloorToInt(rightClip - leftClip);
@@ -1934,7 +1936,7 @@
aaa_walk_edges(&headEdge,
&tailEdge,
- path.getNewFillType(),
+ path.getFillType(),
blitter,
start_y,
stop_y,
diff --git a/src/core/SkScan_Path.cpp b/src/core/SkScan_Path.cpp
index cacc228..4271f4e 100644
--- a/src/core/SkScan_Path.cpp
+++ b/src/core/SkScan_Path.cpp
@@ -97,13 +97,14 @@
#define PREPOST_START true
#define PREPOST_END false
-static void walk_edges(SkEdge* prevHead, SkPathFillType fillType,
+static void walk_edges(SkEdge* prevHead, SkPath::FillType fillType,
SkBlitter* blitter, int start_y, int stop_y,
PrePostProc proc, int rightClip) {
validate_sort(prevHead->fNext);
int curr_y = start_y;
- int windingMask = SkPathFillType_IsEvenOdd(fillType) ? 1 : -1;
+ // returns 1 for evenodd, -1 for winding, regardless of inverse-ness
+ int windingMask = (fillType & 1) ? 1 : -1;
for (;;) {
int w = 0;
@@ -470,8 +471,8 @@
if (path.isConvex() && (nullptr == proc) && count >= 2) {
walk_simple_edges(&headEdge, blitter, start_y, stop_y);
} else {
- walk_edges(&headEdge, path.getNewFillType(), blitter, start_y, stop_y, proc,
- shiftedClip.right());
+ walk_edges(&headEdge, path.getFillType(), blitter, start_y, stop_y, proc,
+ shiftedClip.right());
}
}
diff --git a/src/gpu/GrDistanceFieldGenFromVector.cpp b/src/gpu/GrDistanceFieldGenFromVector.cpp
index 11e375c..29aa16d 100644
--- a/src/gpu/GrDistanceFieldGenFromVector.cpp
+++ b/src/gpu/GrDistanceFieldGenFromVector.cpp
@@ -763,7 +763,7 @@
workingPath = path;
}
- if (!IsDistanceFieldSupportedFillType(workingPath.getNewFillType())) {
+ if (!IsDistanceFieldSupportedFillType(workingPath.getFillType())) {
return false;
}
@@ -829,19 +829,15 @@
kOutside = 1
} dfSign;
- switch (workingPath.getNewFillType()) {
- case SkPathFillType::kWinding:
- dfSign = windingNumber ? kInside : kOutside;
- break;
- case SkPathFillType::kInverseWinding:
- dfSign = windingNumber ? kOutside : kInside;
- break;
- case SkPathFillType::kEvenOdd:
- dfSign = (windingNumber % 2) ? kInside : kOutside;
- break;
- case SkPathFillType::kInverseEvenOdd:
- dfSign = (windingNumber % 2) ? kOutside : kInside;
- break;
+ if (workingPath.getFillType() == SkPath::kWinding_FillType) {
+ dfSign = windingNumber ? kInside : kOutside;
+ } else if (workingPath.getFillType() == SkPath::kInverseWinding_FillType) {
+ dfSign = windingNumber ? kOutside : kInside;
+ } else if (workingPath.getFillType() == SkPath::kEvenOdd_FillType) {
+ dfSign = (windingNumber % 2) ? kInside : kOutside;
+ } else {
+ SkASSERT(workingPath.getFillType() == SkPath::kInverseEvenOdd_FillType);
+ dfSign = (windingNumber % 2) ? kOutside : kInside;
}
// The winding number at the end of a scanline should be zero.
diff --git a/src/gpu/GrDistanceFieldGenFromVector.h b/src/gpu/GrDistanceFieldGenFromVector.h
index 0362166..8e8d1b3 100644
--- a/src/gpu/GrDistanceFieldGenFromVector.h
+++ b/src/gpu/GrDistanceFieldGenFromVector.h
@@ -30,10 +30,10 @@
const SkPath& path, const SkMatrix& viewMatrix,
int width, int height, size_t rowBytes);
-inline bool IsDistanceFieldSupportedFillType(SkPathFillType fFillType)
+inline bool IsDistanceFieldSupportedFillType(SkPath::FillType fFillType)
{
- return (SkPathFillType::kEvenOdd == fFillType ||
- SkPathFillType::kInverseEvenOdd == fFillType);
+ return (SkPath::kEvenOdd_FillType == fFillType ||
+ SkPath::kInverseEvenOdd_FillType == fFillType);
}
#endif
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index 8c9dde7..85dbe1a 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -1315,7 +1315,7 @@
path.setIsVolatile(true);
path.addRRect(inner);
path.addRRect(outer);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
this->drawShapeUsingPathRenderer(clip, std::move(paint), aa, viewMatrix, GrShape(path));
}
diff --git a/src/gpu/GrTessellator.cpp b/src/gpu/GrTessellator.cpp
index 863e864..6f4fd44 100644
--- a/src/gpu/GrTessellator.cpp
+++ b/src/gpu/GrTessellator.cpp
@@ -861,15 +861,15 @@
}
}
-inline bool apply_fill_type(SkPathFillType fillType, int winding) {
+inline bool apply_fill_type(SkPath::FillType fillType, int winding) {
switch (fillType) {
- case SkPathFillType::kWinding:
+ case SkPath::kWinding_FillType:
return winding != 0;
- case SkPathFillType::kEvenOdd:
+ case SkPath::kEvenOdd_FillType:
return (winding & 1) != 0;
- case SkPathFillType::kInverseWinding:
+ case SkPath::kInverseWinding_FillType:
return winding == 1;
- case SkPathFillType::kInverseEvenOdd:
+ case SkPath::kInverseEvenOdd_FillType:
return (winding & 1) == 1;
default:
SkASSERT(false);
@@ -877,7 +877,7 @@
}
}
-inline bool apply_fill_type(SkPathFillType fillType, Poly* poly) {
+inline bool apply_fill_type(SkPath::FillType fillType, Poly* poly) {
return poly && apply_fill_type(fillType, poly->fWinding);
}
@@ -1699,7 +1699,7 @@
return polys;
}
-void remove_non_boundary_edges(const VertexList& mesh, SkPathFillType fillType,
+void remove_non_boundary_edges(const VertexList& mesh, SkPath::FillType fillType,
SkArenaAlloc& alloc) {
TESS_LOG("removing non-boundary edges\n");
EdgeList activeEdges;
@@ -2118,7 +2118,7 @@
outerMesh->append(outerVertices);
}
-void extract_boundary(EdgeList* boundary, Edge* e, SkPathFillType fillType, SkArenaAlloc& alloc) {
+void extract_boundary(EdgeList* boundary, Edge* e, SkPath::FillType fillType, SkArenaAlloc& alloc) {
TESS_LOG("\nextracting boundary\n");
bool down = apply_fill_type(fillType, e->fWinding);
Vertex* start = down ? e->fTop : e->fBottom;
@@ -2155,7 +2155,7 @@
// Stage 5b: Extract boundaries from mesh, simplify and stroke them into a new mesh.
void extract_boundaries(const VertexList& inMesh, VertexList* innerVertices,
- VertexList* outerVertices, SkPathFillType fillType,
+ VertexList* outerVertices, SkPath::FillType fillType,
Comparator& c, SkArenaAlloc& alloc) {
remove_non_boundary_edges(inMesh, fillType, alloc);
for (Vertex* v = inMesh.fHead; v; v = v->fNext) {
@@ -2205,7 +2205,7 @@
#endif
}
-Poly* contours_to_polys(VertexList* contours, int contourCnt, SkPathFillType fillType,
+Poly* contours_to_polys(VertexList* contours, int contourCnt, SkPath::FillType fillType,
const SkRect& pathBounds, bool antialias, VertexList* outerMesh,
SkArenaAlloc& alloc) {
Comparator c(pathBounds.width() > pathBounds.height() ? Comparator::Direction::kHorizontal
@@ -2260,7 +2260,7 @@
}
// Stage 6: Triangulate the monotone polygons into a vertex buffer.
-void* polys_to_triangles(Poly* polys, SkPathFillType fillType, bool emitCoverage, void* data) {
+void* polys_to_triangles(Poly* polys, SkPath::FillType fillType, bool emitCoverage, void* data) {
for (Poly* poly = polys; poly; poly = poly->fNext) {
if (apply_fill_type(fillType, poly)) {
data = poly->emit(emitCoverage, data);
@@ -2272,14 +2272,14 @@
Poly* path_to_polys(const SkPath& path, SkScalar tolerance, const SkRect& clipBounds,
int contourCnt, SkArenaAlloc& alloc, bool antialias, bool* isLinear,
VertexList* outerMesh) {
- SkPathFillType fillType = path.getNewFillType();
- if (SkPathFillType_IsInverse(fillType)) {
+ SkPath::FillType fillType = path.getFillType();
+ if (SkPath::IsInverseFillType(fillType)) {
contourCnt++;
}
std::unique_ptr<VertexList[]> contours(new VertexList[contourCnt]);
path_to_contours(path, tolerance, clipBounds, contours.get(), alloc, isLinear);
- return contours_to_polys(contours.get(), contourCnt, path.getNewFillType(), path.getBounds(),
+ return contours_to_polys(contours.get(), contourCnt, path.getFillType(), path.getBounds(),
antialias, outerMesh, alloc);
}
@@ -2292,7 +2292,7 @@
return contourCnt;
}
-int64_t count_points(Poly* polys, SkPathFillType fillType) {
+int64_t count_points(Poly* polys, SkPath::FillType fillType) {
int64_t count = 0;
for (Poly* poly = polys; poly; poly = poly->fNext) {
if (apply_fill_type(fillType, poly) && poly->fCount >= 3) {
@@ -2343,7 +2343,7 @@
VertexList outerMesh;
Poly* polys = path_to_polys(path, tolerance, clipBounds, contourCnt, alloc, antialias,
isLinear, &outerMesh);
- SkPathFillType fillType = antialias ? SkPathFillType::kWinding : path.getNewFillType();
+ SkPath::FillType fillType = antialias ? SkPath::kWinding_FillType : path.getFillType();
int64_t count64 = count_points(polys, fillType);
if (antialias) {
count64 += count_outer_mesh_points(outerMesh);
@@ -2381,7 +2381,7 @@
bool isLinear;
Poly* polys = path_to_polys(path, tolerance, clipBounds, contourCnt, alloc, false, &isLinear,
nullptr);
- SkPathFillType fillType = path.getNewFillType();
+ SkPath::FillType fillType = path.getFillType();
int64_t count64 = count_points(polys, fillType);
if (0 == count64 || count64 > SK_MaxS32) {
*verts = nullptr;
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 9428f18..cd3fbea 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -475,7 +475,7 @@
path.setIsVolatile(true);
path.addRRect(outer);
path.addRRect(inner);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
// TODO: We are losing the possible mutability of the path here but this should probably be
// fixed by upgrading GrShape to handle DRRects.
diff --git a/src/gpu/ccpr/GrCCFiller.cpp b/src/gpu/ccpr/GrCCFiller.cpp
index a4a3cfd..f0a56bb 100644
--- a/src/gpu/ccpr/GrCCFiller.cpp
+++ b/src/gpu/ccpr/GrCCFiller.cpp
@@ -134,12 +134,12 @@
// We use "winding" fill type right now because we are producing a coverage count, and must
// fill in every region that has non-zero wind. The path processor will convert coverage
// count to the appropriate fill type later.
- fan.setFillType(SkPathFillType::kWinding);
+ fan.setFillType(SkPath::kWinding_FillType);
} else {
// When counting winding numbers in the stencil buffer, it works to use even/odd for the fan
// tessellation (where applicable). But we need to strip out inverse fill info because
// inverse-ness gets accounted for later on.
- fan.setFillType(SkPathFillType_ConvertToNonInverse(originalPath.getNewFillType()));
+ fan.setFillType(SkPath::ConvertToNonInverseFillType(originalPath.getFillType()));
}
SkASSERT(Verb::kBeginPath == verbs[verbsIdx]);
for (int i = verbsIdx + 1; i < verbs.count(); ++i) {
@@ -204,7 +204,7 @@
}
int weight = abs(tessWinding);
- if (SkPathFillType::kEvenOdd == fan.getNewFillType()) {
+ if (SkPath::kEvenOdd_FillType == fan.getFillType()) {
SkASSERT(Algorithm::kCoverageCount != algorithm); // Covg. count always uses winding.
if (weight != 1) {
// The tessellator doesn't wrap weights modulo 2 when we request even/odd fill type.
diff --git a/src/gpu/geometry/GrShape.cpp b/src/gpu/geometry/GrShape.cpp
index a510a19..bb4f92b 100644
--- a/src/gpu/geometry/GrShape.cpp
+++ b/src/gpu/geometry/GrShape.cpp
@@ -201,7 +201,7 @@
const int conicWeightCnt = SkPathPriv::ConicWeightCnt(path);
SkASSERT(verbCnt <= GrShape::kMaxKeyFromDataVerbCnt);
SkASSERT(pointCnt && verbCnt);
- *key++ = (uint32_t)path.getFillType();
+ *key++ = path.getFillType();
*key++ = verbCnt;
memcpy(key, SkPathPriv::VerbData(path), verbCnt * sizeof(uint8_t));
int verbKeySize = SkAlign4(verbCnt);
@@ -297,7 +297,7 @@
*key++ = fPathData.fGenID;
// We could canonicalize the fill rule for paths that don't differentiate between
// even/odd or winding fill (e.g. convex).
- *key++ = (uint32_t)this->path().getFillType();
+ *key++ = this->path().getFillType();
break;
}
}
diff --git a/src/gpu/geometry/GrShape.h b/src/gpu/geometry/GrShape.h
index ea87986..08146df 100644
--- a/src/gpu/geometry/GrShape.h
+++ b/src/gpu/geometry/GrShape.h
@@ -260,7 +260,7 @@
return false;
}
- if (SkPathFillType::kWinding == this->path().getNewFillType() && dirs[0] == dirs[1]) {
+ if (SkPath::kWinding_FillType == this->path().getFillType() && dirs[0] == dirs[1]) {
// The two rects need to be wound opposite to each other
return false;
}
@@ -550,8 +550,9 @@
const SkPath* originalPathForListeners() const;
// Defaults to use when there is no distinction between even/odd and winding fills.
- static constexpr SkPathFillType kDefaultPathFillType = SkPathFillType::kEvenOdd;
- static constexpr SkPathFillType kDefaultPathInverseFillType = SkPathFillType::kInverseEvenOdd;
+ static constexpr SkPath::FillType kDefaultPathFillType = SkPath::kEvenOdd_FillType;
+ static constexpr SkPath::FillType kDefaultPathInverseFillType =
+ SkPath::kInverseEvenOdd_FillType;
static constexpr SkPathDirection kDefaultRRectDir = SkPathDirection::kCW;
static constexpr unsigned kDefaultRRectStart = 0;
diff --git a/src/gpu/gl/GrGLPath.cpp b/src/gpu/gl/GrGLPath.cpp
index c588e28..e001bf9 100644
--- a/src/gpu/gl/GrGLPath.cpp
+++ b/src/gpu/gl/GrGLPath.cpp
@@ -193,15 +193,15 @@
/*
* For now paths only natively support winding and even odd fill types
*/
-static GrPathRendering::FillType convert_skpath_filltype(SkPathFillType fill) {
+static GrPathRendering::FillType convert_skpath_filltype(SkPath::FillType fill) {
switch (fill) {
default:
SK_ABORT("Incomplete Switch\n");
- case SkPathFillType::kWinding:
- case SkPathFillType::kInverseWinding:
+ case SkPath::kWinding_FillType:
+ case SkPath::kInverseWinding_FillType:
return GrPathRendering::kWinding_FillType;
- case SkPathFillType::kEvenOdd:
- case SkPathFillType::kInverseEvenOdd:
+ case SkPath::kEvenOdd_FillType:
+ case SkPath::kInverseEvenOdd_FillType:
return GrPathRendering::kEvenOdd_FillType;
}
}
@@ -317,7 +317,7 @@
fShouldFill = stroke.isFillStyle() ||
stroke.getStyle() == SkStrokeRec::kStrokeAndFill_Style;
- fFillType = convert_skpath_filltype(skPath->getNewFillType());
+ fFillType = convert_skpath_filltype(skPath->getFillType());
fBounds = skPath->getBounds();
SkScalar radius = stroke.getInflationRadius();
fBounds.outset(radius, radius);
diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp
index 6b8e502..4f8205f 100644
--- a/src/gpu/ops/GrDefaultPathRenderer.cpp
+++ b/src/gpu/ops/GrDefaultPathRenderer.cpp
@@ -540,11 +540,11 @@
}
lastPassIsBounds = false;
} else {
- switch (path.getNewFillType()) {
- case SkPathFillType::kInverseEvenOdd:
+ switch (path.getFillType()) {
+ case SkPath::kInverseEvenOdd_FillType:
reverse = true;
// fallthrough
- case SkPathFillType::kEvenOdd:
+ case SkPath::kEvenOdd_FillType:
passes[0] = &gEOStencilPass;
if (stencilOnly) {
passCount = 1;
@@ -560,10 +560,10 @@
}
break;
- case SkPathFillType::kInverseWinding:
+ case SkPath::kInverseWinding_FillType:
reverse = true;
// fallthrough
- case SkPathFillType::kWinding:
+ case SkPath::kWinding_FillType:
passes[0] = &gWindStencilPass;
passCount = 2;
if (stencilOnly) {
diff --git a/src/pathops/SkOpBuilder.cpp b/src/pathops/SkOpBuilder.cpp
index 8a9eccd..9dac160 100644
--- a/src/pathops/SkOpBuilder.cpp
+++ b/src/pathops/SkOpBuilder.cpp
@@ -36,11 +36,11 @@
}
bool SkOpBuilder::FixWinding(SkPath* path) {
- SkPathFillType fillType = path->getNewFillType();
- if (fillType == SkPathFillType::kInverseEvenOdd) {
- fillType = SkPathFillType::kInverseWinding;
- } else if (fillType == SkPathFillType::kEvenOdd) {
- fillType = SkPathFillType::kWinding;
+ SkPath::FillType fillType = path->getFillType();
+ if (fillType == SkPath::kInverseEvenOdd_FillType) {
+ fillType = SkPath::kInverseWinding_FillType;
+ } else if (fillType == SkPath::kEvenOdd_FillType) {
+ fillType = SkPath::kWinding_FillType;
}
SkPathPriv::FirstDirection dir;
if (one_contour(*path) && SkPathPriv::CheapComputeFirstDirection(*path, &dir)) {
diff --git a/src/pathops/SkOpEdgeBuilder.cpp b/src/pathops/SkOpEdgeBuilder.cpp
index 7e97c03..3efb0e0 100644
--- a/src/pathops/SkOpEdgeBuilder.cpp
+++ b/src/pathops/SkOpEdgeBuilder.cpp
@@ -10,7 +10,7 @@
void SkOpEdgeBuilder::init() {
fOperand = false;
- fXorMask[0] = fXorMask[1] = ((int)fPath->getFillType() & 1) ? kEvenOdd_PathOpsMask
+ fXorMask[0] = fXorMask[1] = (fPath->getFillType() & 1) ? kEvenOdd_PathOpsMask
: kWinding_PathOpsMask;
fUnparseable = false;
fSecondHalf = preFetch();
@@ -40,7 +40,7 @@
SkASSERT(fPathVerbs.count() > 0 && fPathVerbs.end()[-1] == SkPath::kDone_Verb);
fPathVerbs.pop();
fPath = &path;
- fXorMask[1] = ((int)fPath->getFillType() & 1) ? kEvenOdd_PathOpsMask
+ fXorMask[1] = (fPath->getFillType() & 1) ? kEvenOdd_PathOpsMask
: kWinding_PathOpsMask;
preFetch();
}
diff --git a/src/pathops/SkPathOpsAsWinding.cpp b/src/pathops/SkPathOpsAsWinding.cpp
index 3f7050d..b3d92a9 100644
--- a/src/pathops/SkPathOpsAsWinding.cpp
+++ b/src/pathops/SkPathOpsAsWinding.cpp
@@ -367,7 +367,7 @@
const SkPath& fPath;
};
-static bool set_result_path(SkPath* result, const SkPath& path, SkPathFillType fillType) {
+static bool set_result_path(SkPath* result, const SkPath& path, SkPath::FillType fillType) {
*result = path;
result->setFillType(fillType);
return true;
@@ -377,13 +377,13 @@
if (!path.isFinite()) {
return false;
}
- SkPathFillType fillType = path.getNewFillType();
- if (fillType == SkPathFillType::kWinding
- || fillType == SkPathFillType::kInverseWinding ) {
+ SkPath::FillType fillType = path.getFillType();
+ if (fillType == SkPath::kWinding_FillType
+ || fillType == SkPath::kInverseWinding_FillType ) {
return set_result_path(result, path, fillType);
}
- fillType = path.isInverseFillType() ? SkPathFillType::kInverseWinding :
- SkPathFillType::kWinding;
+ fillType = path.isInverseFillType() ? SkPath::kInverseWinding_FillType :
+ SkPath::kWinding_FillType;
if (path.isEmpty() || path.isConvex()) {
return set_result_path(result, path, fillType);
}
diff --git a/src/pathops/SkPathOpsDebug.cpp b/src/pathops/SkPathOpsDebug.cpp
index b610e9b..da4e76b 100644
--- a/src/pathops/SkPathOpsDebug.cpp
+++ b/src/pathops/SkPathOpsDebug.cpp
@@ -2901,10 +2901,10 @@
}
static const char* gFillTypeStr[] = {
- "kWinding",
- "kEvenOdd",
- "kInverseWinding",
- "kInverseEvenOdd"
+ "kWinding_FillType",
+ "kEvenOdd_FillType",
+ "kInverseWinding_FillType",
+ "kInverseEvenOdd_FillType"
};
void SkPathOpsDebug::ShowOnePath(const SkPath& path, const char* name, bool includeDeclaration) {
@@ -2927,12 +2927,12 @@
return;
}
#endif
- SkPathFillType fillType = path.getNewFillType();
- SkASSERT(fillType >= SkPathFillType::kWinding && fillType <= SkPathFillType::kInverseEvenOdd);
+ SkPath::FillType fillType = path.getFillType();
+ SkASSERT(fillType >= SkPath::kWinding_FillType && fillType <= SkPath::kInverseEvenOdd_FillType);
if (includeDeclaration) {
SkDebugf(" SkPath %s;\n", name);
}
- SkDebugf(" %s.setFillType(SkPath::%s);\n", name, gFillTypeStr[(int)fillType]);
+ SkDebugf(" %s.setFillType(SkPath::%s);\n", name, gFillTypeStr[fillType]);
iter.setPath(path);
showPathContours(iter, name);
}
diff --git a/src/pathops/SkPathOpsOp.cpp b/src/pathops/SkPathOpsOp.cpp
index 2c89f35..825ae7b 100644
--- a/src/pathops/SkPathOpsOp.cpp
+++ b/src/pathops/SkPathOpsOp.cpp
@@ -248,8 +248,8 @@
#endif
op = gOpInverse[op][one.isInverseFillType()][two.isInverseFillType()];
bool inverseFill = gOutInverse[op][one.isInverseFillType()][two.isInverseFillType()];
- SkPathFillType fillType = inverseFill ? SkPathFillType::kInverseEvenOdd :
- SkPathFillType::kEvenOdd;
+ SkPath::FillType fillType = inverseFill ? SkPath::kInverseEvenOdd_FillType :
+ SkPath::kEvenOdd_FillType;
SkRect rect1, rect2;
if (kIntersect_SkPathOp == op && one.isRect(&rect1) && two.isRect(&rect2)) {
result->reset();
diff --git a/src/pathops/SkPathOpsSimplify.cpp b/src/pathops/SkPathOpsSimplify.cpp
index 6c522f4..f079b50 100644
--- a/src/pathops/SkPathOpsSimplify.cpp
+++ b/src/pathops/SkPathOpsSimplify.cpp
@@ -140,8 +140,8 @@
bool SimplifyDebug(const SkPath& path, SkPath* result
SkDEBUGPARAMS(bool skipAssert) SkDEBUGPARAMS(const char* testName)) {
// returns 1 for evenodd, -1 for winding, regardless of inverse-ness
- SkPathFillType fillType = path.isInverseFillType() ? SkPathFillType::kInverseEvenOdd
- : SkPathFillType::kEvenOdd;
+ SkPath::FillType fillType = path.isInverseFillType() ? SkPath::kInverseEvenOdd_FillType
+ : SkPath::kEvenOdd_FillType;
if (path.isConvex()) {
if (result != &path) {
*result = path;
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index 7e88509..e58642f 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -506,7 +506,7 @@
maskDevice->makeFormXObjectFromDevice(dstMaskBounds, true), false,
SkPDFGraphicState::kLuminosity_SMaskMode, fDocument), content.stream());
SkPDFUtils::AppendRectangle(SkRect::Make(dstMaskBounds), content.stream());
- SkPDFUtils::PaintPath(SkPaint::kFill_Style, path.getNewFillType(), content.stream());
+ SkPDFUtils::PaintPath(SkPaint::kFill_Style, path.getFillType(), content.stream());
this->clearMaskOnGraphicState(content.stream());
}
@@ -593,7 +593,7 @@
paint->getStrokeCap() != SkPaint::kSquare_Cap);
SkPDFUtils::EmitPath(*pathPtr, paint->getStyle(), consumeDegeratePathSegments, content.stream(),
tolerance);
- SkPDFUtils::PaintPath(paint->getStyle(), pathPtr->getNewFillType(), content.stream());
+ SkPDFUtils::PaintPath(paint->getStyle(), pathPtr->getFillType(), content.stream());
}
////////////////////////////////////////////////////////////////////////////////
@@ -1561,7 +1561,7 @@
maskDevice->makeFormXObjectFromDevice(maskDeviceBounds, true), false,
SkPDFGraphicState::kLuminosity_SMaskMode, fDocument), content.stream());
SkPDFUtils::AppendRectangle(SkRect::Make(this->size()), content.stream());
- SkPDFUtils::PaintPath(SkPaint::kFill_Style, SkPathFillType::kWinding, content.stream());
+ SkPDFUtils::PaintPath(SkPaint::kFill_Style, SkPath::kWinding_FillType, content.stream());
this->clearMaskOnGraphicState(content.stream());
return;
}
diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp
index f1c0142..426a9f9 100644
--- a/src/pdf/SkPDFFont.cpp
+++ b/src/pdf/SkPDFFont.cpp
@@ -596,7 +596,7 @@
if (path && !path->isEmpty()) {
setGlyphWidthAndBoundingBox(glyph->advanceX(), glyphBBox, &content);
SkPDFUtils::EmitPath(*path, SkPaint::kFill_Style, &content);
- SkPDFUtils::PaintPath(SkPaint::kFill_Style, path->getNewFillType(), &content);
+ SkPDFUtils::PaintPath(SkPaint::kFill_Style, path->getFillType(), &content);
} else {
auto pimg = to_image(gID, &smallGlyphs);
if (!pimg.fImage) {
diff --git a/src/pdf/SkPDFGradientShader.cpp b/src/pdf/SkPDFGradientShader.cpp
index ad2a65d..919c07a 100644
--- a/src/pdf/SkPDFGradientShader.cpp
+++ b/src/pdf/SkPDFGradientShader.cpp
@@ -780,7 +780,7 @@
}
SkPDFUtils::ApplyPattern(patternIndex, &content);
SkPDFUtils::AppendRectangle(bounds, &content);
- SkPDFUtils::PaintPath(SkPaint::kFill_Style, SkPathFillType::kEvenOdd, &content);
+ SkPDFUtils::PaintPath(SkPaint::kFill_Style, SkPath::kEvenOdd_FillType, &content);
return content.detachAsStream();
}
diff --git a/src/pdf/SkPDFGraphicStackState.cpp b/src/pdf/SkPDFGraphicStackState.cpp
index af2fa19..a27170b 100644
--- a/src/pdf/SkPDFGraphicStackState.cpp
+++ b/src/pdf/SkPDFGraphicStackState.cpp
@@ -104,10 +104,10 @@
static void append_clip_path(const SkPath& clipPath, SkWStream* wStream) {
SkPDFUtils::EmitPath(clipPath, SkPaint::kFill_Style, wStream);
- SkPathFillType clipFill = clipPath.getNewFillType();
- NOT_IMPLEMENTED(clipFill == SkPathFillType::kInverseEvenOdd, false);
- NOT_IMPLEMENTED(clipFill == SkPathFillType::kInverseWinding, false);
- if (clipFill == SkPathFillType::kEvenOdd) {
+ SkPath::FillType clipFill = clipPath.getFillType();
+ NOT_IMPLEMENTED(clipFill == SkPath::kInverseEvenOdd_FillType, false);
+ NOT_IMPLEMENTED(clipFill == SkPath::kInverseWinding_FillType, false);
+ if (clipFill == SkPath::kEvenOdd_FillType) {
wStream->writeText("W* n\n");
} else {
wStream->writeText("W n\n");
diff --git a/src/pdf/SkPDFUtils.cpp b/src/pdf/SkPDFUtils.cpp
index f00362e..0564b0f 100644
--- a/src/pdf/SkPDFUtils.cpp
+++ b/src/pdf/SkPDFUtils.cpp
@@ -132,7 +132,7 @@
if (path.isRect(&rect, &isClosed, &direction) &&
isClosed &&
(SkPathDirection::kCW == direction ||
- SkPathFillType::kEvenOdd == path.getNewFillType()))
+ SkPath::kEvenOdd_FillType == path.getFillType()))
{
SkPDFUtils::AppendRectangle(rect, content);
return;
@@ -213,7 +213,8 @@
content->writeText("h\n");
}
-void SkPDFUtils::PaintPath(SkPaint::Style style, SkPathFillType fill, SkWStream* content) {
+void SkPDFUtils::PaintPath(SkPaint::Style style, SkPath::FillType fill,
+ SkWStream* content) {
if (style == SkPaint::kFill_Style) {
content->writeText("f");
} else if (style == SkPaint::kStrokeAndFill_Style) {
@@ -223,9 +224,9 @@
}
if (style != SkPaint::kStroke_Style) {
- NOT_IMPLEMENTED(fill == SkPathFillType::kInverseEvenOdd, false);
- NOT_IMPLEMENTED(fill == SkPathFillType::kInverseWinding, false);
- if (fill == SkPathFillType::kEvenOdd) {
+ NOT_IMPLEMENTED(fill == SkPath::kInverseEvenOdd_FillType, false);
+ NOT_IMPLEMENTED(fill == SkPath::kInverseWinding_FillType, false);
+ if (fill == SkPath::kEvenOdd_FillType) {
content->writeText("*");
}
}
@@ -233,7 +234,8 @@
}
void SkPDFUtils::StrokePath(SkWStream* content) {
- SkPDFUtils::PaintPath(SkPaint::kStroke_Style, SkPathFillType::kWinding, content);
+ SkPDFUtils::PaintPath(
+ SkPaint::kStroke_Style, SkPath::kWinding_FillType, content);
}
void SkPDFUtils::ApplyGraphicState(int objectIndex, SkWStream* content) {
diff --git a/src/pdf/SkPDFUtils.h b/src/pdf/SkPDFUtils.h
index d4c9845..90b1c57 100644
--- a/src/pdf/SkPDFUtils.h
+++ b/src/pdf/SkPDFUtils.h
@@ -58,7 +58,8 @@
SkPDFUtils::EmitPath(path, paintStyle, true, content, tolerance);
}
void ClosePath(SkWStream* content);
-void PaintPath(SkPaint::Style style, SkPathFillType fill, SkWStream* content);
+void PaintPath(SkPaint::Style style, SkPath::FillType fill,
+ SkWStream* content);
void StrokePath(SkWStream* content);
void ApplyGraphicState(int objectIndex, SkWStream* content);
void ApplyPattern(int objectIndex, SkWStream* content);
diff --git a/src/svg/SkSVGDevice.cpp b/src/svg/SkSVGDevice.cpp
index cb84960..7ee26f7 100644
--- a/src/svg/SkSVGDevice.cpp
+++ b/src/svg/SkSVGDevice.cpp
@@ -728,7 +728,7 @@
const auto& p = e->getDeviceSpacePath();
AutoElement path("path", fWriter);
path.addPathAttributes(p);
- if (p.getNewFillType() == SkPathFillType::kEvenOdd) {
+ if (p.getFillType() == SkPath::kEvenOdd_FillType) {
path.addAttribute("clip-rule", "evenodd");
}
} break;
@@ -852,7 +852,7 @@
elem.addPathAttributes(path);
// TODO: inverse fill types?
- if (path.getNewFillType() == SkPathFillType::kEvenOdd) {
+ if (path.getFillType() == SkPath::kEvenOdd_FillType) {
elem.addAttribute("fill-rule", "evenodd");
}
}
diff --git a/src/utils/SkLua.cpp b/src/utils/SkLua.cpp
index c634d5b..2f1482e 100644
--- a/src/utils/SkLua.cpp
+++ b/src/utils/SkLua.cpp
@@ -1248,22 +1248,22 @@
return 1;
}
-static const char* fill_type_to_str(SkPathFillType fill) {
+static const char* fill_type_to_str(SkPath::FillType fill) {
switch (fill) {
- case SkPathFillType::kEvenOdd:
+ case SkPath::kEvenOdd_FillType:
return "even-odd";
- case SkPathFillType::kWinding:
+ case SkPath::kWinding_FillType:
return "winding";
- case SkPathFillType::kInverseEvenOdd:
+ case SkPath::kInverseEvenOdd_FillType:
return "inverse-even-odd";
- case SkPathFillType::kInverseWinding:
+ case SkPath::kInverseWinding_FillType:
return "inverse-winding";
}
return "unknown";
}
static int lpath_getFillType(lua_State* L) {
- SkPathFillType fill = get_obj<SkPath>(L, 1)->getNewFillType();
+ SkPath::FillType fill = get_obj<SkPath>(L, 1)->getFillType();
SkLua(L).pushString(fill_type_to_str(fill));
return 1;
}
diff --git a/src/utils/win/SkDWriteGeometrySink.cpp b/src/utils/win/SkDWriteGeometrySink.cpp
index 3979a13..65da6ae 100644
--- a/src/utils/win/SkDWriteGeometrySink.cpp
+++ b/src/utils/win/SkDWriteGeometrySink.cpp
@@ -49,10 +49,10 @@
SK_STDMETHODIMP_(void) SkDWriteGeometrySink::SetFillMode(D2D1_FILL_MODE fillMode) {
switch (fillMode) {
case D2D1_FILL_MODE_ALTERNATE:
- fPath->setFillType(SkPathFillType::kEvenOdd);
+ fPath->setFillType(SkPath::kEvenOdd_FillType);
break;
case D2D1_FILL_MODE_WINDING:
- fPath->setFillType(SkPathFillType::kWinding);
+ fPath->setFillType(SkPath::kWinding_FillType);
break;
default:
SkDEBUGFAIL("Unknown D2D1_FILL_MODE.");
diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp
index 87b5dfa..7a4ff99 100644
--- a/src/xps/SkXPSDevice.cpp
+++ b/src/xps/SkXPSDevice.cpp
@@ -1182,7 +1182,7 @@
if (rect_must_be_pathed(paint, this->localToDevice())) {
SkPath tmp;
tmp.addRect(r);
- tmp.setFillType(SkPathFillType::kWinding);
+ tmp.setFillType(SkPath::kWinding_FillType);
this->drawPath(tmp, paint, true);
return;
}
@@ -1608,13 +1608,13 @@
SkPath* xpsCompatiblePath = fillablePath;
XPS_FILL_RULE xpsFillRule;
switch (fillablePath->getFillType()) {
- case SkPathFillType::kWinding:
+ case SkPath::kWinding_FillType:
xpsFillRule = XPS_FILL_RULE_NONZERO;
break;
- case SkPathFillType::kEvenOdd:
+ case SkPath::kEvenOdd_FillType:
xpsFillRule = XPS_FILL_RULE_EVENODD;
break;
- case SkPathFillType::kInverseWinding: {
+ case SkPath::kInverseWinding_FillType: {
//[Fillable-path (inverse winding) -> XPS-path (inverse even odd)]
if (!pathIsMutable) {
xpsCompatiblePath = &modifiedPath;
@@ -1626,7 +1626,7 @@
}
}
// The xpsCompatiblePath is now inverse even odd, so fall through.
- case SkPathFillType::kInverseEvenOdd: {
+ case SkPath::kInverseEvenOdd_FillType: {
const SkRect universe = SkRect::MakeLTRB(
0, 0,
this->fCurrentCanvasSize.fWidth,
diff --git a/tests/ClipCubicTest.cpp b/tests/ClipCubicTest.cpp
index 5da7e6a..5b8bb1f 100644
--- a/tests/ClipCubicTest.cpp
+++ b/tests/ClipCubicTest.cpp
@@ -177,6 +177,7 @@
SkPaint paint;
paint.setAntiAlias(true);
SkPath path;
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0,0
path.lineTo(SkBits2Float(0x43434343), SkBits2Float(0x43430143)); //195.263f, 195.005f
path.lineTo(SkBits2Float(0x43434343), SkBits2Float(0x43434343)); //195.263f, 195.263f
diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp
index 21f57fb..435c86e 100644
--- a/tests/ClipStackTest.cpp
+++ b/tests/ClipStackTest.cpp
@@ -288,10 +288,10 @@
bool doInvA = SkToBool(invBits & 1);
bool doInvB = SkToBool(invBits & 2);
- pathA.setFillType(doInvA ? SkPathFillType::kInverseEvenOdd :
- SkPathFillType::kEvenOdd);
- pathB.setFillType(doInvB ? SkPathFillType::kInverseEvenOdd :
- SkPathFillType::kEvenOdd);
+ pathA.setFillType(doInvA ? SkPath::kInverseEvenOdd_FillType :
+ SkPath::kEvenOdd_FillType);
+ pathB.setFillType(doInvB ? SkPath::kInverseEvenOdd_FillType :
+ SkPath::kEvenOdd_FillType);
switch (primType) {
case SkClipStack::Element::DeviceSpaceType::kEmpty:
@@ -362,10 +362,10 @@
SkPath clipA, clipB;
clipA.addRoundRect(rectA, SkIntToScalar(5), SkIntToScalar(5));
- clipA.setFillType(SkPathFillType::kInverseEvenOdd);
+ clipA.setFillType(SkPath::kInverseEvenOdd_FillType);
clipB.addRoundRect(rectB, SkIntToScalar(5), SkIntToScalar(5));
- clipB.setFillType(SkPathFillType::kInverseEvenOdd);
+ clipB.setFillType(SkPath::kInverseEvenOdd_FillType);
stack.clipPath(clipA, SkMatrix::I(), kReplace_SkClipOp, false);
stack.clipPath(clipB, SkMatrix::I(), kUnion_SkClipOp, false);
@@ -856,7 +856,7 @@
SkPath path;
path.addRect({30, 10, 40, 20});
- path.setFillType(SkPathFillType::kInverseWinding);
+ path.setFillType(SkPath::kInverseWinding_FillType);
stack.clipPath(path, SkMatrix::I(), kDifference_SkClipOp, false);
REPORTER_ASSERT(reporter, SkClipStack::kEmptyGenID == stack.getTopmostGenID());
@@ -893,7 +893,7 @@
if (invert) {
SkPath path;
path.addRoundRect(rect, rx, ry);
- path.setFillType(SkPathFillType::kInverseWinding);
+ path.setFillType(SkPath::kInverseWinding_FillType);
stack->clipPath(path, SkMatrix::I(), op, doAA);
} else {
SkRRect rrect;
@@ -907,7 +907,7 @@
if (invert) {
SkPath path;
path.addRect(rect);
- path.setFillType(SkPathFillType::kInverseWinding);
+ path.setFillType(SkPath::kInverseWinding_FillType);
stack->clipPath(path, SkMatrix::I(), op, doAA);
} else {
stack->clipRect(rect, SkMatrix::I(), op, doAA);
@@ -919,7 +919,7 @@
SkPath path;
path.addOval(rect);
if (invert) {
- path.setFillType(SkPathFillType::kInverseWinding);
+ path.setFillType(SkPath::kInverseWinding_FillType);
}
stack->clipPath(path, SkMatrix::I(), op, doAA);
};
@@ -1534,7 +1534,7 @@
SkPath path;
path.addCircle(10, 10, 8);
path.addCircle(15, 15, 8);
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
static const char* kTag = GrClipStackClip::kMaskTestTag;
GrResourceCache* cache = context->priv().getResourceCache();
diff --git a/tests/DefaultPathRendererTest.cpp b/tests/DefaultPathRendererTest.cpp
index 40a8578..c4498a2 100644
--- a/tests/DefaultPathRendererTest.cpp
+++ b/tests/DefaultPathRendererTest.cpp
@@ -52,7 +52,7 @@
return bm;
}
-static SkPath make_path(const SkRect& outer, int inset, SkPathFillType fill) {
+static SkPath make_path(const SkRect& outer, int inset, SkPath::FillType fill) {
SkPath p;
p.addRect(outer, SkPathDirection::kCW);
@@ -77,9 +77,9 @@
static void run_test(GrContext* ctx, skiatest::Reporter* reporter) {
SkPath invPath = make_path(SkRect::MakeXYWH(0, 0, kBigSize, kBigSize),
- kBigSize/2-1, SkPathFillType::kInverseWinding);
+ kBigSize/2-1, SkPath::kInverseWinding_FillType);
SkPath path = make_path(SkRect::MakeXYWH(0, 0, kBigSize, kBigSize),
- kPad, SkPathFillType::kWinding);
+ kPad, SkPath::kWinding_FillType);
GrStyle style(SkStrokeRec::kFill_InitStyle);
diff --git a/tests/EmptyPathTest.cpp b/tests/EmptyPathTest.cpp
index 06c3cea..8212fc4 100644
--- a/tests/EmptyPathTest.cpp
+++ b/tests/EmptyPathTest.cpp
@@ -126,11 +126,11 @@
static void (*gMakeProc[])(SkPath*) = {
make_empty, make_M, make_MM, make_MZM, make_L, make_Q, make_C
};
- static SkPathFillType gFills[] = {
- SkPathFillType::kWinding,
- SkPathFillType::kEvenOdd,
- SkPathFillType::kInverseWinding,
- SkPathFillType::kInverseEvenOdd
+ static SkPath::FillType gFills[] = {
+ SkPath::kWinding_FillType,
+ SkPath::kEvenOdd_FillType,
+ SkPath::kInverseWinding_FillType,
+ SkPath::kInverseEvenOdd_FillType
};
for (int doClose = 0; doClose < 2; ++doClose) {
for (size_t i = 0; i < SK_ARRAY_COUNT(gMakeProc); ++i) {
diff --git a/tests/FillPathTest.cpp b/tests/FillPathTest.cpp
index 04bcb01..f6e1c5e 100644
--- a/tests/FillPathTest.cpp
+++ b/tests/FillPathTest.cpp
@@ -41,7 +41,7 @@
.quadTo(SkIntToScalar(width/2), SkIntToScalar(height),
SkIntToScalar(width), 0.0f)
.close()
- .setFillType(SkPathFillType::kInverseWinding);
+ .setFillType(SkPath::kInverseWinding_FillType);
SkScan::FillPath(path, clip, &blitter);
REPORTER_ASSERT(reporter, blitter.m_blitCount == expected_lines);
diff --git a/tests/GrShapeTest.cpp b/tests/GrShapeTest.cpp
index 01bb540..44d43be 100644
--- a/tests/GrShapeTest.cpp
+++ b/tests/GrShapeTest.cpp
@@ -145,8 +145,8 @@
ignoreInversenessDifference = (canDropInverse1 != canDropInverse2);
}
bool ignoreWindingVsEvenOdd = false;
- if (SkPathFillType_ConvertToNonInverse(pathA.getNewFillType()) !=
- SkPathFillType_ConvertToNonInverse(pathB.getNewFillType())) {
+ if (SkPath::ConvertToNonInverseFillType(pathA.getFillType()) !=
+ SkPath::ConvertToNonInverseFillType(pathB.getFillType())) {
bool aCanChange = can_interchange_winding_and_even_odd_fill(a);
bool bCanChange = can_interchange_winding_and_even_odd_fill(b);
if (aCanChange != bCanChange) {
@@ -163,14 +163,14 @@
REPORTER_ASSERT(r, a.inverseFilled() == pA.isInverseFillType());
REPORTER_ASSERT(r, b.inverseFilled() == pB.isInverseFillType());
if (ignoreInversenessDifference) {
- pA.setFillType(SkPathFillType_ConvertToNonInverse(pathA.getNewFillType()));
- pB.setFillType(SkPathFillType_ConvertToNonInverse(pathB.getNewFillType()));
+ pA.setFillType(SkPath::ConvertToNonInverseFillType(pathA.getFillType()));
+ pB.setFillType(SkPath::ConvertToNonInverseFillType(pathB.getFillType()));
}
if (ignoreWindingVsEvenOdd) {
- pA.setFillType(pA.isInverseFillType() ? SkPathFillType::kInverseEvenOdd
- : SkPathFillType::kEvenOdd);
- pB.setFillType(pB.isInverseFillType() ? SkPathFillType::kInverseEvenOdd
- : SkPathFillType::kEvenOdd);
+ pA.setFillType(pA.isInverseFillType() ? SkPath::kInverseEvenOdd_FillType
+ : SkPath::kEvenOdd_FillType);
+ pB.setFillType(pB.isInverseFillType() ? SkPath::kInverseEvenOdd_FillType
+ : SkPath::kEvenOdd_FillType);
}
if (!ignoreInversenessDifference && !ignoreWindingVsEvenOdd) {
REPORTER_ASSERT(r, keyA == keyB);
@@ -425,11 +425,11 @@
PathGeo(const SkPath& path, Invert invert) : fPath(path) {
SkASSERT(!path.isInverseFillType());
if (Invert::kYes == invert) {
- if (fPath.getNewFillType() == SkPathFillType::kEvenOdd) {
- fPath.setFillType(SkPathFillType::kInverseEvenOdd);
+ if (fPath.getFillType() == SkPath::kEvenOdd_FillType) {
+ fPath.setFillType(SkPath::kInverseEvenOdd_FillType);
} else {
- SkASSERT(fPath.getNewFillType() == SkPathFillType::kWinding);
- fPath.setFillType(SkPathFillType::kInverseWinding);
+ SkASSERT(fPath.getFillType() == SkPath::kWinding_FillType);
+ fPath.setFillType(SkPath::kInverseWinding_FillType);
}
}
}
@@ -572,7 +572,7 @@
}
// The bounds API explicitly calls out that it does not consider inverseness.
SkPath p = path;
- p.setFillType(SkPathFillType_ConvertToNonInverse(path.getNewFillType()));
+ p.setFillType(SkPath::ConvertToNonInverseFillType(path.getFillType()));
REPORTER_ASSERT(r, test_bounds_by_rasterizing(p, bounds));
}
@@ -1885,7 +1885,7 @@
lineAC.lineTo(kC);
SkPath invLineAB = lineAB;
- invLineAB.setFillType(SkPathFillType::kInverseEvenOdd);
+ invLineAB.setFillType(SkPath::kInverseEvenOdd_FillType);
SkPaint fill;
SkPaint stroke;
diff --git a/tests/PathOpsAsWindingTest.cpp b/tests/PathOpsAsWindingTest.cpp
index 327b633..81d3192 100644
--- a/tests/PathOpsAsWindingTest.cpp
+++ b/tests/PathOpsAsWindingTest.cpp
@@ -58,58 +58,58 @@
REPORTER_ASSERT(reporter, test == result);
// if test is empty
test.reset();
- test.setFillType(SkPathFillType::kEvenOdd);
+ test.setFillType(SkPath::kEvenOdd_FillType);
REPORTER_ASSERT(reporter, AsWinding(test, &result));
REPORTER_ASSERT(reporter, result.isEmpty());
- REPORTER_ASSERT(reporter, result.getNewFillType() == SkPathFillType::kWinding);
+ REPORTER_ASSERT(reporter, result.getFillType() == SkPath::kWinding_FillType);
// if test is convex
test.addCircle(5, 5, 10);
REPORTER_ASSERT(reporter, AsWinding(test, &result));
REPORTER_ASSERT(reporter, result.isConvex());
- test.setFillType(SkPathFillType::kWinding);
+ test.setFillType(SkPath::kWinding_FillType);
REPORTER_ASSERT(reporter, test == result);
// if test has infinity
test.reset();
test.addRect({1, 2, 3, SK_ScalarInfinity});
- test.setFillType(SkPathFillType::kEvenOdd);
+ test.setFillType(SkPath::kEvenOdd_FillType);
REPORTER_ASSERT(reporter, !AsWinding(test, &result));
// if test has only one contour
test.reset();
SkPoint ell[] = {{0, 0}, {4, 0}, {4, 1}, {1, 1}, {1, 4}, {0, 4}};
test.addPoly(ell, SK_ARRAY_COUNT(ell), true);
- test.setFillType(SkPathFillType::kEvenOdd);
+ test.setFillType(SkPath::kEvenOdd_FillType);
REPORTER_ASSERT(reporter, AsWinding(test, &result));
REPORTER_ASSERT(reporter, !result.isConvex());
- test.setFillType(SkPathFillType::kWinding);
+ test.setFillType(SkPath::kWinding_FillType);
REPORTER_ASSERT(reporter, test == result);
// test two contours that do not overlap or share bounds
test.addRect({5, 2, 6, 3});
- test.setFillType(SkPathFillType::kEvenOdd);
+ test.setFillType(SkPath::kEvenOdd_FillType);
REPORTER_ASSERT(reporter, AsWinding(test, &result));
REPORTER_ASSERT(reporter, !result.isConvex());
- test.setFillType(SkPathFillType::kWinding);
+ test.setFillType(SkPath::kWinding_FillType);
REPORTER_ASSERT(reporter, test == result);
// test two contours that do not overlap but share bounds
test.reset();
test.addPoly(ell, SK_ARRAY_COUNT(ell), true);
test.addRect({2, 2, 3, 3});
- test.setFillType(SkPathFillType::kEvenOdd);
+ test.setFillType(SkPath::kEvenOdd_FillType);
REPORTER_ASSERT(reporter, AsWinding(test, &result));
REPORTER_ASSERT(reporter, !result.isConvex());
- test.setFillType(SkPathFillType::kWinding);
+ test.setFillType(SkPath::kWinding_FillType);
REPORTER_ASSERT(reporter, test == result);
// test two contours that partially overlap
test.reset();
test.addRect({0, 0, 3, 3});
test.addRect({1, 1, 4, 4});
- test.setFillType(SkPathFillType::kEvenOdd);
+ test.setFillType(SkPath::kEvenOdd_FillType);
REPORTER_ASSERT(reporter, AsWinding(test, &result));
REPORTER_ASSERT(reporter, !result.isConvex());
- test.setFillType(SkPathFillType::kWinding);
+ test.setFillType(SkPath::kWinding_FillType);
REPORTER_ASSERT(reporter, test == result);
// test that result may be input
SkPath copy = test;
- test.setFillType(SkPathFillType::kEvenOdd);
+ test.setFillType(SkPath::kEvenOdd_FillType);
REPORTER_ASSERT(reporter, AsWinding(test, &test));
REPORTER_ASSERT(reporter, !test.isConvex());
REPORTER_ASSERT(reporter, test == copy);
@@ -122,7 +122,7 @@
for (auto dirA : {SkPathDirection::kCW, SkPathDirection::kCCW}) {
for (auto dirB : {SkPathDirection::kCW, SkPathDirection::kCCW}) {
test.reset();
- test.setFillType(SkPathFillType::kEvenOdd);
+ test.setFillType(SkPath::kEvenOdd_FillType);
if (aFirst) {
test.addRect(rectA, dirA);
test.addRect(rectB, dirB);
@@ -132,7 +132,7 @@
}
SkPath original = test;
REPORTER_ASSERT(reporter, AsWinding(test, &result));
- REPORTER_ASSERT(reporter, result.getNewFillType() == SkPathFillType::kWinding);
+ REPORTER_ASSERT(reporter, result.getFillType() == SkPath::kWinding_FillType);
test.reset();
if (aFirst) {
test.addRect(rectA, dirA);
@@ -148,7 +148,7 @@
REPORTER_ASSERT(reporter, test == result);
// test that result may be input
REPORTER_ASSERT(reporter, AsWinding(original, &original));
- REPORTER_ASSERT(reporter, original.getNewFillType() == SkPathFillType::kWinding);
+ REPORTER_ASSERT(reporter, original.getFillType() == SkPath::kWinding_FillType);
REPORTER_ASSERT(reporter, original == result);
}
}
@@ -168,9 +168,9 @@
if (!aFirst) {
test.addPath(pathA);
}
- test.setFillType(SkPathFillType::kEvenOdd);
+ test.setFillType(SkPath::kEvenOdd_FillType);
REPORTER_ASSERT(reporter, AsWinding(test, &result));
- REPORTER_ASSERT(reporter, result.getNewFillType() == SkPathFillType::kWinding);
+ REPORTER_ASSERT(reporter, result.getFillType() == SkPath::kWinding_FillType);
for (SkScalar x = rectA.fLeft - 1; x <= rectA.fRight + 1; ++x) {
for (SkScalar y = rectA.fTop - 1; y <= rectA.fBottom + 1; ++y) {
bool evenOddContains = test.contains(x, y);
diff --git a/tests/PathOpsBattles.cpp b/tests/PathOpsBattles.cpp
index 6f4bc95..f3c5140 100644
--- a/tests/PathOpsBattles.cpp
+++ b/tests/PathOpsBattles.cpp
@@ -42,7 +42,7 @@
static void issue414409b(skiatest::Reporter* reporter, const char* filename) {
SkPath path1, path2;
// one fill=0 op=2
-path1.setFillType((SkPathFillType) 0);
+path1.setFillType((SkPath::FillType) 0);
path1.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path1.cubicTo(SkBits2Float(0x41f12edc), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4267b362), SkBits2Float(0xc2854e1f), SkBits2Float(0x42911faa), SkBits2Float(0xc2212f3b));
path1.cubicTo(SkBits2Float(0x42ae65a2), SkBits2Float(0xc15f08de), SkBits2Float(0x42acc913), SkBits2Float(0x41923f59), SkBits2Float(0x428ce9f0), SkBits2Float(0x422f7dc4));
@@ -52,7 +52,7 @@
path1.lineTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path1.close();
-path2.setFillType((SkPathFillType) 1);
+path2.setFillType((SkPath::FillType) 1);
path2.moveTo(SkBits2Float(0x428ce9ef), SkBits2Float(0x422f7dc6));
path2.cubicTo(SkBits2Float(0x4286af43), SkBits2Float(0x42437fa7), SkBits2Float(0x427ed0d6), SkBits2Float(0x42561f5a), SkBits2Float(0x426e69d2), SkBits2Float(0x42670c39));
path2.lineTo(SkBits2Float(0x422c58d6), SkBits2Float(0x422705c1));
@@ -64,7 +64,7 @@
static void issue414409c(skiatest::Reporter* reporter, const char* filename) {
SkPath path1, path2;
-path1.setFillType((SkPathFillType) 1);
+path1.setFillType((SkPath::FillType) 1);
path1.moveTo(SkBits2Float(0x36961ef0), SkBits2Float(0xc2700000));
path1.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path1.cubicTo(SkBits2Float(0x3df86648), SkBits2Float(0xc2a60000), SkBits2Float(0x3e786777), SkBits2Float(0xc2a5ffdc), SkBits2Float(0x3eba4dc2), SkBits2Float(0xc2a5ff96));
@@ -76,7 +76,7 @@
path1.cubicTo(SkBits2Float(0x3e3391e9), SkBits2Float(0xc26fffce), SkBits2Float(0x3db3931e), SkBits2Float(0xc2700000), SkBits2Float(0x36961ef0), SkBits2Float(0xc2700000));
path1.close();
-path2.setFillType((SkPathFillType) 0);
+path2.setFillType((SkPath::FillType) 0);
path2.moveTo(SkBits2Float(0x3eccef1a), SkBits2Float(0xc2a5ff81));
path2.cubicTo(SkBits2Float(0x3f18c8a9), SkBits2Float(0xc2a5ff04), SkBits2Float(0x3f4b19b0), SkBits2Float(0xc2a5fe2d), SkBits2Float(0x3f7d6a37), SkBits2Float(0xc2a5fcfa));
path2.lineTo(SkBits2Float(0x3f3730f2), SkBits2Float(0xc26ffba1));
@@ -90,7 +90,7 @@
// fails to draw correctly
static void battleOp1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3ea4d9f5), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3f24d9a9), SkBits2Float(0xc2a5ff0a), SkBits2Float(0x3f774519), SkBits2Float(0xc2a5fd1f));
path.lineTo(SkBits2Float(0x3f32bfc3), SkBits2Float(0xc26ffbd7));
@@ -100,7 +100,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f774503), SkBits2Float(0xc2a5fd1f));
path.cubicTo(SkBits2Float(0x3f7f82ff), SkBits2Float(0xc2a5fcee), SkBits2Float(0x3f83e06d), SkBits2Float(0xc2a5fcbb), SkBits2Float(0x3f87ff59), SkBits2Float(0xc2a5fc85));
path.lineTo(SkBits2Float(0x3f449f80), SkBits2Float(0xc26ffaf7));
@@ -115,14 +115,14 @@
static void battleOp2(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3ea4d9e6), SkBits2Float(0xc2a60000), SkBits2Float(0x3f24d99a), SkBits2Float(0xc2a5ff0a), SkBits2Float(0x3f774503), SkBits2Float(0xc2a5fd1f));
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f87ff64), SkBits2Float(0xc2a5fc85));
path.cubicTo(SkBits2Float(0x3fcac720), SkBits2Float(0xc2a5f91a), SkBits2Float(0x4006c62a), SkBits2Float(0xc2a5f329), SkBits2Float(0x40282667), SkBits2Float(0xc2a5eab4));
path.lineTo(SkBits2Float(0x3ff31bb9), SkBits2Float(0xc26fe136));
@@ -137,7 +137,7 @@
static void battleOp3(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f19f03c), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3f99ef95), SkBits2Float(0xc2a5fca7), SkBits2Float(0x3fe6e2fa), SkBits2Float(0xc2a5f5f7));
path.lineTo(SkBits2Float(0x3fa6e80c), SkBits2Float(0xc26ff17d));
@@ -147,7 +147,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3fe6e322), SkBits2Float(0xc2a5f5f7));
path.cubicTo(SkBits2Float(0x3fee94fb), SkBits2Float(0xc2a5f54c), SkBits2Float(0x3ff646db), SkBits2Float(0xc2a5f497), SkBits2Float(0x3ffdf8ad), SkBits2Float(0xc2a5f3db));
path.lineTo(SkBits2Float(0x3fb79813), SkBits2Float(0xc26fee71));
@@ -162,7 +162,7 @@
static void battleOp4(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f19f03c), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3f99ef95), SkBits2Float(0xc2a5fca7), SkBits2Float(0x3fe6e322), SkBits2Float(0xc2a5f5f7));
@@ -175,7 +175,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3ffdf8c6), SkBits2Float(0xc2a5f3db));
path.cubicTo(SkBits2Float(0x403d5556), SkBits2Float(0xc2a5e7ed), SkBits2Float(0x407ba65a), SkBits2Float(0xc2a5d338), SkBits2Float(0x409cf3fe), SkBits2Float(0xc2a5b5bc));
path.lineTo(SkBits2Float(0x4062eb8a), SkBits2Float(0xc26f94a1));
@@ -190,7 +190,7 @@
static void battleOp5(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3fe06a9b), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40606368), SkBits2Float(0xc2a5e38e), SkBits2Float(0x40a82f8a), SkBits2Float(0xc2a5aab6));
path.lineTo(SkBits2Float(0x40732902), SkBits2Float(0xc26f84b2));
@@ -200,7 +200,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x40a82f91), SkBits2Float(0xc2a5aab7));
path.cubicTo(SkBits2Float(0x40adc8dc), SkBits2Float(0xc2a5a508), SkBits2Float(0x40b361d8), SkBits2Float(0xc2a59f10), SkBits2Float(0x40b8fa82), SkBits2Float(0xc2a598d0));
path.lineTo(SkBits2Float(0x4085b825), SkBits2Float(0xc26f6ad0));
@@ -215,7 +215,7 @@
static void battleOp6(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3fe06a9b), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40606368), SkBits2Float(0xc2a5e38e), SkBits2Float(0x40a82f91), SkBits2Float(0xc2a5aab7));
@@ -232,7 +232,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x40b8fa77), SkBits2Float(0xc2a598d0));
path.cubicTo(SkBits2Float(0x4109d7e9), SkBits2Float(0xc2a5337c), SkBits2Float(0x4137014a), SkBits2Float(0xc2a483b2), SkBits2Float(0x4163cbb6), SkBits2Float(0xc2a38a24));
path.lineTo(SkBits2Float(0x4124abf0), SkBits2Float(0xc26c715c));
@@ -246,7 +246,7 @@
static void battleOp7(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3de5c884), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3e65c882), SkBits2Float(0xc2a5ffe2), SkBits2Float(0x3eac5645), SkBits2Float(0xc2a5ffa7));
path.lineTo(SkBits2Float(0x3e79297e), SkBits2Float(0xc26fff7f));
@@ -256,7 +256,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3eac564d), SkBits2Float(0xc2a5ffa7));
path.cubicTo(SkBits2Float(0x3eb21458), SkBits2Float(0xc2a5ffa1), SkBits2Float(0x3eb7d2fc), SkBits2Float(0xc2a5ff9b), SkBits2Float(0x3ebd91a0), SkBits2Float(0xc2a5ff94));
path.lineTo(SkBits2Float(0x3e8909ff), SkBits2Float(0xc26fff64));
@@ -271,7 +271,7 @@
static void battleOp8(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3de5c884), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3e65c882), SkBits2Float(0xc2a5ffe2), SkBits2Float(0x3eac564d), SkBits2Float(0xc2a5ffa7));
@@ -283,7 +283,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3ebd921a), SkBits2Float(0xc2a5ff94));
path.cubicTo(SkBits2Float(0x3f0d545f), SkBits2Float(0xc2a5ff29), SkBits2Float(0x3f3bdfbd), SkBits2Float(0xc2a5fe71), SkBits2Float(0x3f6a6ab6), SkBits2Float(0xc2a5fd69));
path.lineTo(SkBits2Float(0x3f297558), SkBits2Float(0xc26ffc43));
@@ -298,7 +298,7 @@
static void battleOp9(skiatest::Reporter* reporter, const char* filename) { // crashes
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3ecc43bf), SkBits2Float(0xc2a60000), SkBits2Float(0x3f4c4385), SkBits2Float(0xc2a5fe87), SkBits2Float(0x3f993163), SkBits2Float(0xc2a5fb95));
path.lineTo(SkBits2Float(0x3f5d7bc4), SkBits2Float(0xc26ff99d));
@@ -308,7 +308,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f993156), SkBits2Float(0xc2a5fb95));
path.cubicTo(SkBits2Float(0x3f9e4c7a), SkBits2Float(0xc2a5fb49), SkBits2Float(0x3fa36794), SkBits2Float(0xc2a5fafa), SkBits2Float(0x3fa882aa), SkBits2Float(0xc2a5faa7));
path.lineTo(SkBits2Float(0x3f73a149), SkBits2Float(0xc26ff845));
@@ -322,7 +322,7 @@
static void battleOp10(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3ddcd524), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3e5cd462), SkBits2Float(0xc2a5ffe3), SkBits2Float(0x3ea59eff), SkBits2Float(0xc2a5ffac));
path.lineTo(SkBits2Float(0x3e6f74a3), SkBits2Float(0xc26fff89));
@@ -332,7 +332,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3ea59f9c), SkBits2Float(0xc2a5ffad));
path.cubicTo(SkBits2Float(0x3eab24c0), SkBits2Float(0xc2a5ffa7), SkBits2Float(0x3eb0aa54), SkBits2Float(0xc2a5ffa1), SkBits2Float(0x3eb62fe9), SkBits2Float(0xc2a5ff9b));
path.lineTo(SkBits2Float(0x3e83b355), SkBits2Float(0xc26fff6f));
@@ -347,7 +347,7 @@
static void battleOp11(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3ddcd524), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3e5cd462), SkBits2Float(0xc2a5ffe3), SkBits2Float(0x3ea59f9c), SkBits2Float(0xc2a5ffad));
@@ -364,7 +364,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3eb62f8c), SkBits2Float(0xc2a5ff9c));
path.cubicTo(SkBits2Float(0x3f07d31d), SkBits2Float(0xc2a5ff3a), SkBits2Float(0x3f348e3e), SkBits2Float(0xc2a5fe8f), SkBits2Float(0x3f614904), SkBits2Float(0xc2a5fd9c));
path.lineTo(SkBits2Float(0x3f22db6c), SkBits2Float(0xc26ffc8c));
@@ -379,7 +379,7 @@
static void battleOp12(skiatest::Reporter* reporter, const char* filename) { // crashed
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3ecc43bf), SkBits2Float(0xc2a60000), SkBits2Float(0x3f4c4385), SkBits2Float(0xc2a5fe87), SkBits2Float(0x3f993163), SkBits2Float(0xc2a5fb95));
path.lineTo(SkBits2Float(0x3f5d7bc4), SkBits2Float(0xc26ff99d));
@@ -389,7 +389,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f993156), SkBits2Float(0xc2a5fb95));
path.cubicTo(SkBits2Float(0x3f9e4c7a), SkBits2Float(0xc2a5fb49), SkBits2Float(0x3fa36794), SkBits2Float(0xc2a5fafa), SkBits2Float(0x3fa882aa), SkBits2Float(0xc2a5faa7));
path.lineTo(SkBits2Float(0x3f73a149), SkBits2Float(0xc26ff845));
@@ -404,7 +404,7 @@
static void battleOp13(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3ddcd524), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3e5cd462), SkBits2Float(0xc2a5ffe3), SkBits2Float(0x3ea59eff), SkBits2Float(0xc2a5ffac));
path.lineTo(SkBits2Float(0x3e6f74a3), SkBits2Float(0xc26fff89));
@@ -414,7 +414,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3ea59f9c), SkBits2Float(0xc2a5ffad));
path.cubicTo(SkBits2Float(0x3eab24c0), SkBits2Float(0xc2a5ffa7), SkBits2Float(0x3eb0aa54), SkBits2Float(0xc2a5ffa1), SkBits2Float(0x3eb62fe9), SkBits2Float(0xc2a5ff9b));
path.lineTo(SkBits2Float(0x3e83b355), SkBits2Float(0xc26fff6f));
@@ -429,7 +429,7 @@
static void battleOp14(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3ddcd524), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3e5cd462), SkBits2Float(0xc2a5ffe3), SkBits2Float(0x3ea59f9c), SkBits2Float(0xc2a5ffad));
@@ -446,7 +446,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3eb62f8c), SkBits2Float(0xc2a5ff9c));
path.cubicTo(SkBits2Float(0x3f07d31d), SkBits2Float(0xc2a5ff3a), SkBits2Float(0x3f348e3e), SkBits2Float(0xc2a5fe8f), SkBits2Float(0x3f614904), SkBits2Float(0xc2a5fd9c));
path.lineTo(SkBits2Float(0x3f22db6c), SkBits2Float(0xc26ffc8c));
@@ -461,7 +461,7 @@
static void battleOp15(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f19f03c), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3f99ef95), SkBits2Float(0xc2a5fca7), SkBits2Float(0x3fe6e2fa), SkBits2Float(0xc2a5f5f7));
path.lineTo(SkBits2Float(0x3fa6e80c), SkBits2Float(0xc26ff17d));
@@ -471,7 +471,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3fe6e322), SkBits2Float(0xc2a5f5f7));
path.cubicTo(SkBits2Float(0x3fee94fb), SkBits2Float(0xc2a5f54c), SkBits2Float(0x3ff646db), SkBits2Float(0xc2a5f497), SkBits2Float(0x3ffdf8ad), SkBits2Float(0xc2a5f3db));
path.lineTo(SkBits2Float(0x3fb79813), SkBits2Float(0xc26fee71));
@@ -486,7 +486,7 @@
static void battleOp16(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f19f03c), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3f99ef95), SkBits2Float(0xc2a5fca7), SkBits2Float(0x3fe6e322), SkBits2Float(0xc2a5f5f7));
@@ -499,7 +499,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3ffdf8c6), SkBits2Float(0xc2a5f3db));
path.cubicTo(SkBits2Float(0x403d5556), SkBits2Float(0xc2a5e7ed), SkBits2Float(0x407ba65a), SkBits2Float(0xc2a5d338), SkBits2Float(0x409cf3fe), SkBits2Float(0xc2a5b5bc));
path.lineTo(SkBits2Float(0x4062eb8a), SkBits2Float(0xc26f94a1));
@@ -514,7 +514,7 @@
static void battleOp17(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f9860dc), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40185ea2), SkBits2Float(0xc2a5f2e2), SkBits2Float(0x40647d09), SkBits2Float(0xc2a5d8aa));
path.lineTo(SkBits2Float(0x40252c2a), SkBits2Float(0xc26fc723));
@@ -524,7 +524,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x40647d17), SkBits2Float(0xc2a5d8ab));
path.cubicTo(SkBits2Float(0x406c19ae), SkBits2Float(0xc2a5d60b), SkBits2Float(0x4073b608), SkBits2Float(0xc2a5d34a), SkBits2Float(0x407b5230), SkBits2Float(0xc2a5d069));
path.lineTo(SkBits2Float(0x4035ad90), SkBits2Float(0xc26fbb32));
@@ -539,7 +539,7 @@
static void battleOp18(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3664fea3), SkBits2Float(0xc26ffffe));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f9860dc), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40185ea2), SkBits2Float(0xc2a5f2e2), SkBits2Float(0x40647d17), SkBits2Float(0xc2a5d8ab));
@@ -551,7 +551,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x407b523a), SkBits2Float(0xc2a5d069));
path.cubicTo(SkBits2Float(0x40bb53e8), SkBits2Float(0xc2a5a1ad), SkBits2Float(0x40f8dfd1), SkBits2Float(0xc2a5508e), SkBits2Float(0x411b1813), SkBits2Float(0xc2a4dd32));
path.lineTo(SkBits2Float(0x40e03b7c), SkBits2Float(0xc26e5b8f));
@@ -566,7 +566,7 @@
static void battleOp19(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40272e66), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40a7227d), SkBits2Float(0xc2a5c0db), SkBits2Float(0x40fa5a70), SkBits2Float(0xc2a542ca));
path.lineTo(SkBits2Float(0x40b4fa6e), SkBits2Float(0xc26eee73));
@@ -576,7 +576,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x40fa5a6d), SkBits2Float(0xc2a542cb));
path.cubicTo(SkBits2Float(0x4101563b), SkBits2Float(0xc2a5362f), SkBits2Float(0x41057ec0), SkBits2Float(0xc2a528f4), SkBits2Float(0x4109a6c0), SkBits2Float(0xc2a51b18));
path.lineTo(SkBits2Float(0x40c70391), SkBits2Float(0xc26eb50e));
@@ -591,7 +591,7 @@
static void battleOp20(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40272e63), SkBits2Float(0xc2a60000), SkBits2Float(0x40a7227a), SkBits2Float(0xc2a5c0db), SkBits2Float(0x40fa5a6c), SkBits2Float(0xc2a542ca));
@@ -604,7 +604,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4109a6bc), SkBits2Float(0xc2a51b19));
path.cubicTo(SkBits2Float(0x414d093d), SkBits2Float(0xc2a43a61), SkBits2Float(0x4187e474), SkBits2Float(0xc2a2b4fa), SkBits2Float(0x41a8a805), SkBits2Float(0xc2a08e4d));
path.lineTo(SkBits2Float(0x4173d72c), SkBits2Float(0xc2682105));
@@ -619,7 +619,7 @@
static void battleOp21(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x404ef9c5), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40cee321), SkBits2Float(0xc2a59f3a), SkBits2Float(0x411ad5ab), SkBits2Float(0xc2a4de2c));
path.lineTo(SkBits2Float(0x40dfdb77), SkBits2Float(0xc26e5cf8));
@@ -629,7 +629,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x411ad5aa), SkBits2Float(0xc2a4de2c));
path.cubicTo(SkBits2Float(0x411ff8ea), SkBits2Float(0xc2a4cadf), SkBits2Float(0x41251b3e), SkBits2Float(0xc2a4b69c), SkBits2Float(0x412a3c98), SkBits2Float(0xc2a4a163));
path.lineTo(SkBits2Float(0x40f6200f), SkBits2Float(0xc26e0518));
@@ -644,7 +644,7 @@
static void battleOp22(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x407fb41a), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40ff895b), SkBits2Float(0xc2a56c4b), SkBits2Float(0x413f077c), SkBits2Float(0xc2a44609));
path.lineTo(SkBits2Float(0x410a17ee), SkBits2Float(0xc26d8104));
@@ -654,7 +654,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x413f0780), SkBits2Float(0xc2a44609));
path.cubicTo(SkBits2Float(0x41455a4a), SkBits2Float(0xc2a4289f), SkBits2Float(0x414bab5a), SkBits2Float(0xc2a409bf), SkBits2Float(0x4151fa92), SkBits2Float(0xc2a3e96b));
path.lineTo(SkBits2Float(0x4117cabb), SkBits2Float(0xc26cfb1d));
@@ -669,7 +669,7 @@
static void battleOp23(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x407fb41a), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40ff895b), SkBits2Float(0xc2a56c4b), SkBits2Float(0x413f0780), SkBits2Float(0xc2a44609));
@@ -681,7 +681,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4151fa93), SkBits2Float(0xc2a3e96b));
path.cubicTo(SkBits2Float(0x419c2b7d), SkBits2Float(0xc2a1dce5), SkBits2Float(0x41ce36f8), SkBits2Float(0xc29e52a6), SkBits2Float(0x41fe1a0a), SkBits2Float(0xc2995d2e));
path.lineTo(SkBits2Float(0x41b7b024), SkBits2Float(0xc25dbb29));
@@ -696,7 +696,7 @@
static void battleOp24(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x409bc7b0), SkBits2Float(0xc2a5ffff), SkBits2Float(0x411ba103), SkBits2Float(0xc2a524b6), SkBits2Float(0x4168515c), SkBits2Float(0xc2a370af));
path.lineTo(SkBits2Float(0x4127f0cc), SkBits2Float(0xc26c4c8f));
@@ -706,7 +706,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4168515e), SkBits2Float(0xc2a370b0));
path.cubicTo(SkBits2Float(0x416ffb5b), SkBits2Float(0xc2a3451c), SkBits2Float(0x4177a23d), SkBits2Float(0xc2a31761), SkBits2Float(0x417f45ca), SkBits2Float(0xc2a2e77f));
path.lineTo(SkBits2Float(0x413888ce), SkBits2Float(0xc26b8638));
@@ -721,7 +721,7 @@
static void battleOp25(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3655fea5), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x409bc7b0), SkBits2Float(0xc2a5ffff), SkBits2Float(0x411ba103), SkBits2Float(0xc2a524b6), SkBits2Float(0x4168515e), SkBits2Float(0xc2a370b0));
@@ -733,7 +733,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x417f45c8), SkBits2Float(0xc2a2e780));
path.cubicTo(SkBits2Float(0x41bda27d), SkBits2Float(0xc29fde49), SkBits2Float(0x41f99531), SkBits2Float(0xc29aa2c4), SkBits2Float(0x4218d569), SkBits2Float(0xc2935d77));
path.lineTo(SkBits2Float(0x41dcf6db), SkBits2Float(0xc2550ed7));
@@ -748,7 +748,7 @@
static void battleOp26(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40b98c15), SkBits2Float(0xc2a5ffff), SkBits2Float(0x41394aaf), SkBits2Float(0xc2a4c8e8), SkBits2Float(0x418a04fa), SkBits2Float(0xc2a25fd2));
path.lineTo(SkBits2Float(0x41478bd6), SkBits2Float(0xc26ac20e));
@@ -758,7 +758,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x418a04fd), SkBits2Float(0xc2a25fd2));
path.cubicTo(SkBits2Float(0x418e8d81), SkBits2Float(0xc2a2222a), SkBits2Float(0x41931368), SkBits2Float(0xc2a1e17a), SkBits2Float(0x41979681), SkBits2Float(0xc2a19dc3));
path.lineTo(SkBits2Float(0x415b29c8), SkBits2Float(0xc269a97e));
@@ -773,7 +773,7 @@
static void battleOp27(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40b98c15), SkBits2Float(0xc2a5ffff), SkBits2Float(0x41394aaf), SkBits2Float(0xc2a4c8e8), SkBits2Float(0x418a04fd), SkBits2Float(0xc2a25fd2));
@@ -785,7 +785,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41979680), SkBits2Float(0xc2a19dc4));
path.cubicTo(SkBits2Float(0x41e0e1b2), SkBits2Float(0xc29d51d4), SkBits2Float(0x42135c08), SkBits2Float(0xc295f036), SkBits2Float(0x42330e86), SkBits2Float(0xc28bc9b7));
path.lineTo(SkBits2Float(0x42017048), SkBits2Float(0xc24a1a63));
@@ -800,7 +800,7 @@
static void battleOp28(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40dd1e63), SkBits2Float(0xc2a5ffff), SkBits2Float(0x415caf98), SkBits2Float(0xc2a44632), SkBits2Float(0x41a3e96c), SkBits2Float(0xc2a0dcda));
path.lineTo(SkBits2Float(0x416cfb1c), SkBits2Float(0xc2689294));
@@ -810,7 +810,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41a3e96b), SkBits2Float(0xc2a0dcda));
path.cubicTo(SkBits2Float(0x41a94306), SkBits2Float(0xc2a085a1), SkBits2Float(0x41ae9839), SkBits2Float(0xc2a02a23), SkBits2Float(0x41b3e8b2), SkBits2Float(0xc29fca67));
path.lineTo(SkBits2Float(0x41820dff), SkBits2Float(0xc26705ca));
@@ -825,7 +825,7 @@
static void battleOp29(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x36b5ff52), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40dd1e62), SkBits2Float(0xc2a60000), SkBits2Float(0x415caf97), SkBits2Float(0xc2a44632), SkBits2Float(0x41a3e96b), SkBits2Float(0xc2a0dcda));
@@ -839,7 +839,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41b3e8b1), SkBits2Float(0xc29fca67));
path.cubicTo(SkBits2Float(0x4205291f), SkBits2Float(0xc299b5bb), SkBits2Float(0x422d73c0), SkBits2Float(0xc28f4fcf), SkBits2Float(0x425064bf), SkBits2Float(0xc2813989));
path.lineTo(SkBits2Float(0x4216a55b), SkBits2Float(0xc23ad4b9));
@@ -854,7 +854,7 @@
static void battleOp30(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41028186), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4182264a), SkBits2Float(0xc2a39869), SkBits2Float(0x41c098e8), SkBits2Float(0xc29edd15));
path.lineTo(SkBits2Float(0x418b3a1a), SkBits2Float(0xc265aeac));
@@ -864,7 +864,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41c098e9), SkBits2Float(0xc29edd15));
path.cubicTo(SkBits2Float(0x41c6d4b6), SkBits2Float(0xc29e642a), SkBits2Float(0x41cd0950), SkBits2Float(0xc29de562), SkBits2Float(0x41d33633), SkBits2Float(0xc29d60c8));
path.lineTo(SkBits2Float(0x4198aee4), SkBits2Float(0xc26388d7));
@@ -879,7 +879,7 @@
static void battleOp31(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41028186), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4182264a), SkBits2Float(0xc2a39869), SkBits2Float(0x41c098e9), SkBits2Float(0xc29edd15));
@@ -891,7 +891,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41d33633), SkBits2Float(0xc29d60c8));
path.cubicTo(SkBits2Float(0x421be102), SkBits2Float(0xc294f1be), SkBits2Float(0x4249615f), SkBits2Float(0xc2869cbc), SkBits2Float(0x426e4d45), SkBits2Float(0xc26729aa));
path.lineTo(SkBits2Float(0x422c4432), SkBits2Float(0xc2271b0a));
@@ -906,7 +906,7 @@
static void battleOp32(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4118c001), SkBits2Float(0xc2a5ffff), SkBits2Float(0x41982d6e), SkBits2Float(0xc2a2b4b2), SkBits2Float(0x41e01284), SkBits2Float(0xc29c4333));
path.lineTo(SkBits2Float(0x41a1fae3), SkBits2Float(0xc261ebf5));
@@ -916,7 +916,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41e01286), SkBits2Float(0xc29c4334));
path.cubicTo(SkBits2Float(0x41e73e86), SkBits2Float(0xc29b9ea8), SkBits2Float(0x41ee5f11), SkBits2Float(0xc29af239), SkBits2Float(0x41f57356), SkBits2Float(0xc29a3dfa));
path.lineTo(SkBits2Float(0x41b16f25), SkBits2Float(0xc25f0029));
@@ -931,7 +931,7 @@
static void battleOp33(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4118c001), SkBits2Float(0xc2a5ffff), SkBits2Float(0x41982d6e), SkBits2Float(0xc2a2b4b2), SkBits2Float(0x41e01286), SkBits2Float(0xc29c4334));
@@ -944,7 +944,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41f57359), SkBits2Float(0xc29a3dfa));
path.cubicTo(SkBits2Float(0x42347528), SkBits2Float(0xc28ec218), SkBits2Float(0x42669614), SkBits2Float(0xc276cf04), SkBits2Float(0x4285b481), SkBits2Float(0xc244c364));
path.lineTo(SkBits2Float(0x42414f00), SkBits2Float(0xc20e3d0e));
@@ -959,7 +959,7 @@
static void battleOp34(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41360dec), SkBits2Float(0xc2a60000), SkBits2Float(0x41b5150e), SkBits2Float(0xc2a1522b), SkBits2Float(0x42044925), SkBits2Float(0xc29840e5));
path.lineTo(SkBits2Float(0x41bf41a8), SkBits2Float(0xc25c2022));
@@ -969,7 +969,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42044925), SkBits2Float(0xc29840e4));
path.cubicTo(SkBits2Float(0x4208721a), SkBits2Float(0xc2975992), SkBits2Float(0x420c9178), SkBits2Float(0xc296675c), SkBits2Float(0x4210a695), SkBits2Float(0xc2956a6a));
path.lineTo(SkBits2Float(0x41d1222e), SkBits2Float(0xc25805ce));
@@ -984,7 +984,7 @@
static void battleOp35(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3673fea3), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41360dec), SkBits2Float(0xc2a60000), SkBits2Float(0x41b5150e), SkBits2Float(0xc2a1522b), SkBits2Float(0x42044925), SkBits2Float(0xc29840e5));
@@ -997,7 +997,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4210a693), SkBits2Float(0xc2956a6a));
path.cubicTo(SkBits2Float(0x42536b4d), SkBits2Float(0xc2854182), SkBits2Float(0x4284b863), SkBits2Float(0xc254c33a), SkBits2Float(0x42950c68), SkBits2Float(0xc2122882));
path.lineTo(SkBits2Float(0x42577de3), SkBits2Float(0xc1d35027));
@@ -1012,7 +1012,7 @@
static void battleOp36(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x414e6589), SkBits2Float(0xc2a5ffff), SkBits2Float(0x41ccf9e5), SkBits2Float(0xc29ffc89), SkBits2Float(0x4214a0bb), SkBits2Float(0xc2946fc8));
path.lineTo(SkBits2Float(0x41d6e236), SkBits2Float(0xc2569b72));
@@ -1022,7 +1022,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4214a0bb), SkBits2Float(0xc2946fc9));
path.cubicTo(SkBits2Float(0x421938a6), SkBits2Float(0xc293496b), SkBits2Float(0x421dc2c1), SkBits2Float(0xc2921574), SkBits2Float(0x42223e19), SkBits2Float(0xc290d421));
path.lineTo(SkBits2Float(0x41ea914d), SkBits2Float(0xc251640c));
@@ -1037,7 +1037,7 @@
static void battleOp37(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3637fea5), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x414e6589), SkBits2Float(0xc2a5ffff), SkBits2Float(0x41ccf9e5), SkBits2Float(0xc29ffc89), SkBits2Float(0x4214a0bb), SkBits2Float(0xc2946fc9));
@@ -1050,7 +1050,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42223e19), SkBits2Float(0xc290d422));
path.cubicTo(SkBits2Float(0x426bbc38), SkBits2Float(0xc2787e1d), SkBits2Float(0x42916a94), SkBits2Float(0xc234ee59), SkBits2Float(0x429e2fac), SkBits2Float(0xc1c951fc));
path.lineTo(SkBits2Float(0x4264b3f7), SkBits2Float(0xc191885f));
@@ -1065,7 +1065,7 @@
static void battleOp38(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x416c96cf), SkBits2Float(0xc2a5ffff), SkBits2Float(0x41ea70fe), SkBits2Float(0xc29e1973), SkBits2Float(0x422836c6), SkBits2Float(0xc28f1d8a));
path.lineTo(SkBits2Float(0x41f3336d), SkBits2Float(0xc24ee9f1));
@@ -1075,7 +1075,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x422836c5), SkBits2Float(0xc28f1d8b));
path.cubicTo(SkBits2Float(0x422d4896), SkBits2Float(0xc28da02f), SkBits2Float(0x423245ea), SkBits2Float(0xc28c11a8), SkBits2Float(0x42372d65), SkBits2Float(0xc28a7261));
path.lineTo(SkBits2Float(0x42046ad7), SkBits2Float(0xc24829ff));
@@ -1090,7 +1090,7 @@
static void battleOp39(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3637fea5), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x416c96cf), SkBits2Float(0xc2a5ffff), SkBits2Float(0x41ea70fe), SkBits2Float(0xc29e1973), SkBits2Float(0x422836c5), SkBits2Float(0xc28f1d8b));
@@ -1102,7 +1102,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42372d65), SkBits2Float(0xc28a7262));
path.cubicTo(SkBits2Float(0x4283f2b3), SkBits2Float(0xc25f7e9c), SkBits2Float(0x429ea5c2), SkBits2Float(0xc2098801), SkBits2Float(0x42a4b292), SkBits2Float(0xc12607b1));
path.lineTo(SkBits2Float(0x426e1def), SkBits2Float(0xc0f00b21));
@@ -1117,7 +1117,7 @@
static void battleOp40(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4184d4a8), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42034ddf), SkBits2Float(0xc29c0a4c), SkBits2Float(0x423a47b2), SkBits2Float(0xc289686d));
path.lineTo(SkBits2Float(0x4206a908), SkBits2Float(0xc246a97c));
@@ -1127,7 +1127,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423a47b2), SkBits2Float(0xc289686d));
path.cubicTo(SkBits2Float(0x423fbcc3), SkBits2Float(0xc2878eef), SkBits2Float(0x4245154e), SkBits2Float(0xc285a0be), SkBits2Float(0x424a4f85), SkBits2Float(0xc2839e81));
path.lineTo(SkBits2Float(0x42123fa7), SkBits2Float(0xc23e4af2));
@@ -1142,7 +1142,7 @@
static void battleOp41(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4196c4f9), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42148669), SkBits2Float(0xc2992c23), SkBits2Float(0x424f6452), SkBits2Float(0xc281a081));
path.lineTo(SkBits2Float(0x4215ebfd), SkBits2Float(0xc23b6999));
@@ -1152,7 +1152,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x424f6452), SkBits2Float(0xc281a081));
path.cubicTo(SkBits2Float(0x42553921), SkBits2Float(0xc27e96d1), SkBits2Float(0x425ae53b), SkBits2Float(0xc279ba9d), SkBits2Float(0x42606622), SkBits2Float(0xc274ae80));
path.lineTo(SkBits2Float(0x42223753), SkBits2Float(0xc230e0d8));
@@ -1167,7 +1167,7 @@
static void battleOp42(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4196c4f9), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42148669), SkBits2Float(0xc2992c23), SkBits2Float(0x424f6452), SkBits2Float(0xc281a081));
@@ -1179,7 +1179,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42606622), SkBits2Float(0xc274ae80));
path.cubicTo(SkBits2Float(0x429deeac), SkBits2Float(0xc220cc44), SkBits2Float(0x42b0742c), SkBits2Float(0xc1039d5c), SkBits2Float(0x42a03731), SkBits2Float(0x41adc1b3));
path.lineTo(SkBits2Float(0x4267a314), SkBits2Float(0x417b36e3));
@@ -1194,7 +1194,7 @@
static void battleOp43(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41aa5d9e), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42271b56), SkBits2Float(0xc295a109), SkBits2Float(0x4264d340), SkBits2Float(0xc2708c1d));
path.lineTo(SkBits2Float(0x42256a74), SkBits2Float(0xc22de3bf));
@@ -1204,7 +1204,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4264d342), SkBits2Float(0xc2708c1d));
path.cubicTo(SkBits2Float(0x426aec59), SkBits2Float(0xc26abf16), SkBits2Float(0x4270cc6c), SkBits2Float(0xc264b73d), SkBits2Float(0x42767031), SkBits2Float(0xc25e77e8));
path.lineTo(SkBits2Float(0x423225ec), SkBits2Float(0xc220d20e));
@@ -1219,7 +1219,7 @@
static void battleOp44(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3637fea5), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41aa5d9e), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42271b56), SkBits2Float(0xc295a109), SkBits2Float(0x4264d340), SkBits2Float(0xc2708c1d));
@@ -1233,7 +1233,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42767032), SkBits2Float(0xc25e77e8));
path.cubicTo(SkBits2Float(0x42aa697a), SkBits2Float(0xc1ebd370), SkBits2Float(0x42b37ad4), SkBits2Float(0x410b48c2), SkBits2Float(0x4291d766), SkBits2Float(0x421e927b));
path.lineTo(SkBits2Float(0x4252dae4), SkBits2Float(0x41e542d2));
@@ -1248,7 +1248,7 @@
static void battleOp45(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41bfbd07), SkBits2Float(0xc2a5ffff), SkBits2Float(0x423b0ef1), SkBits2Float(0xc2914772), SkBits2Float(0x427a1b1d), SkBits2Float(0xc25a5641));
path.lineTo(SkBits2Float(0x4234ccaa), SkBits2Float(0xc21dd57d));
@@ -1258,7 +1258,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x427a1b1e), SkBits2Float(0xc25a5642));
path.cubicTo(SkBits2Float(0x4280286a), SkBits2Float(0xc253393c), SkBits2Float(0x42831c11), SkBits2Float(0xc24bd939), SkBits2Float(0x4285e673), SkBits2Float(0xc2443b5f));
path.lineTo(SkBits2Float(0x42419733), SkBits2Float(0xc20ddaba));
@@ -1273,7 +1273,7 @@
static void battleOp46(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3697ff52), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41bfbd07), SkBits2Float(0xc2a5ffff), SkBits2Float(0x423b0ef1), SkBits2Float(0xc2914772), SkBits2Float(0x427a1b1e), SkBits2Float(0xc25a5642));
@@ -1286,7 +1286,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4285e672), SkBits2Float(0xc2443b5f));
path.cubicTo(SkBits2Float(0x42b50145), SkBits2Float(0xc1875361), SkBits2Float(0x42afc74e), SkBits2Float(0x41db6d5e), SkBits2Float(0x4272e616), SkBits2Float(0x426253de));
path.lineTo(SkBits2Float(0x422f96e8), SkBits2Float(0x42239c3e));
@@ -1301,7 +1301,7 @@
static void battleOp47(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41d59904), SkBits2Float(0xc2a5ffff), SkBits2Float(0x424f13ae), SkBits2Float(0xc28c4fb7), SkBits2Float(0x4286bb70), SkBits2Float(0xc241f0ca));
path.lineTo(SkBits2Float(0x4242cb24), SkBits2Float(0xc20c32b1));
@@ -1311,7 +1311,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4286bb71), SkBits2Float(0xc241f0ca));
path.cubicTo(SkBits2Float(0x4289cb2b), SkBits2Float(0xc2396eee), SkBits2Float(0x428ca6e5), SkBits2Float(0xc230a410), SkBits2Float(0x428f4c27), SkBits2Float(0xc22797c0));
path.lineTo(SkBits2Float(0x424f2d54), SkBits2Float(0xc1f24d85));
@@ -1326,7 +1326,7 @@
static void battleOp48(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41d59904), SkBits2Float(0xc2a5ffff), SkBits2Float(0x424f13ae), SkBits2Float(0xc28c4fb7), SkBits2Float(0x4286bb71), SkBits2Float(0xc241f0ca));
@@ -1338,7 +1338,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x428f4c27), SkBits2Float(0xc22797c0));
path.cubicTo(SkBits2Float(0x42bc6513), SkBits2Float(0xc055a915), SkBits2Float(0x42a45eb2), SkBits2Float(0x42389acf), SkBits2Float(0x4231df29), SkBits2Float(0x428c2a69));
path.lineTo(SkBits2Float(0x420094fc), SkBits2Float(0x424aa62f));
@@ -1353,7 +1353,7 @@
static void battleOp49(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41eed329), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4265a038), SkBits2Float(0xc285ef96), SkBits2Float(0x42905111), SkBits2Float(0xc2240eac));
path.lineTo(SkBits2Float(0x4250a68d), SkBits2Float(0xc1ed30fa));
@@ -1363,7 +1363,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42905111), SkBits2Float(0xc2240ead));
path.cubicTo(SkBits2Float(0x429332f8), SkBits2Float(0xc219ea36), SkBits2Float(0x4295cfef), SkBits2Float(0xc20f79c4), SkBits2Float(0x4298252c), SkBits2Float(0xc204c875));
path.lineTo(SkBits2Float(0x425bf80f), SkBits2Float(0xc1bff9b9));
@@ -1378,7 +1378,7 @@
static void battleOp50(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41eed328), SkBits2Float(0xc2a60000), SkBits2Float(0x4265a038), SkBits2Float(0xc285ef96), SkBits2Float(0x42905111), SkBits2Float(0xc2240ead));
@@ -1391,7 +1391,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4298252d), SkBits2Float(0xc204c875));
path.cubicTo(SkBits2Float(0x42ab560c), SkBits2Float(0xc1334da0), SkBits2Float(0x42aa8ee6), SkBits2Float(0x415dbf57), SkBits2Float(0x4296030d), SkBits2Float(0x420e292a));
path.cubicTo(SkBits2Float(0x42817734), SkBits2Float(0x4264e27f), SkBits2Float(0x42365290), SkBits2Float(0x4292cae0), SkBits2Float(0x41b3e39e), SkBits2Float(0x429fcac3));
@@ -1408,7 +1408,7 @@
static void battleOp51(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42044d64), SkBits2Float(0xc2a5ffff), SkBits2Float(0x427bf9ef), SkBits2Float(0xc27d72ab), SkBits2Float(0x42984d42), SkBits2Float(0xc2041029));
path.lineTo(SkBits2Float(0x425c3202), SkBits2Float(0xc1beef44));
@@ -1418,7 +1418,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42984d42), SkBits2Float(0xc2041029));
path.cubicTo(SkBits2Float(0x429adc06), SkBits2Float(0xc1f08771), SkBits2Float(0x429d127e), SkBits2Float(0xc1d85b80), SkBits2Float(0x429eedcc), SkBits2Float(0xc1bfbbc5));
path.lineTo(SkBits2Float(0x4265c6d6), SkBits2Float(0xc18a9a3f));
@@ -1433,7 +1433,7 @@
static void battleOp52(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42044d64), SkBits2Float(0xc2a5ffff), SkBits2Float(0x427bf9ef), SkBits2Float(0xc27d72ab), SkBits2Float(0x42984d42), SkBits2Float(0xc2041029));
@@ -1445,7 +1445,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x429eedcc), SkBits2Float(0xc1bfbbc6));
path.cubicTo(SkBits2Float(0x42ae408c), SkBits2Float(0x3fb7daeb), SkBits2Float(0x42a45c89), SkBits2Float(0x41e7c57e), SkBits2Float(0x42845101), SkBits2Float(0x42487bac));
path.cubicTo(SkBits2Float(0x42488af1), SkBits2Float(0x428e8a4c), SkBits2Float(0x41c7bd0e), SkBits2Float(0x42a6f806), SkBits2Float(0xbfc7d871), SkBits2Float(0x42a5f87b));
@@ -1462,7 +1462,7 @@
static void battleOp53(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x421216db), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4289817d), SkBits2Float(0xc26c814f), SkBits2Float(0x429ecb3a), SkBits2Float(0xc1c183ed));
path.lineTo(SkBits2Float(0x426594dc), SkBits2Float(0xc18be3fc));
@@ -1472,7 +1472,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x429ecb3a), SkBits2Float(0xc1c183e9));
path.cubicTo(SkBits2Float(0x42a0d9cb), SkBits2Float(0xc1a68281), SkBits2Float(0x42a27999), SkBits2Float(0xc18b01ce), SkBits2Float(0x42a3a81d), SkBits2Float(0xc15e595d));
path.lineTo(SkBits2Float(0x426c9cb2), SkBits2Float(0xc120bbfa));
@@ -1487,7 +1487,7 @@
static void battleOp54(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x421216db), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4289817d), SkBits2Float(0xc26c814f), SkBits2Float(0x429ecb3a), SkBits2Float(0xc1c183ed));
@@ -1500,7 +1500,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a3a81d), SkBits2Float(0xc15e595e));
path.cubicTo(SkBits2Float(0x42ad725e), SkBits2Float(0x416ed313), SkBits2Float(0x42982fa2), SkBits2Float(0x4230cc44), SkBits2Float(0x42575fca), SkBits2Float(0x427ca963));
path.cubicTo(SkBits2Float(0x41fcc0a1), SkBits2Float(0x42a44341), SkBits2Float(0x3f80ed4e), SkBits2Float(0x42affc4e), SkBits2Float(0xc1d56b7f), SkBits2Float(0x429d3115));
@@ -1517,7 +1517,7 @@
static void battleOp55(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4220aa02), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42952310), SkBits2Float(0xc258f48d), SkBits2Float(0x42a35f68), SkBits2Float(0xc16b5614));
path.lineTo(SkBits2Float(0x426c3395), SkBits2Float(0xc12a1f61));
@@ -1527,7 +1527,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a35f69), SkBits2Float(0xc16b5613));
path.cubicTo(SkBits2Float(0x42a4bd24), SkBits2Float(0xc12ea3c2), SkBits2Float(0x42a59325), SkBits2Float(0xc0e282d6), SkBits2Float(0x42a5dfdf), SkBits2Float(0xc04e84a0));
path.lineTo(SkBits2Float(0x426fd18d), SkBits2Float(0xc0154a48));
@@ -1542,7 +1542,7 @@
static void battleOp56(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3697ff52), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4220aa02), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42952310), SkBits2Float(0xc258f48d), SkBits2Float(0x42a35f69), SkBits2Float(0xc16b5613));
@@ -1555,7 +1555,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a5dfdf), SkBits2Float(0xc04e84a0));
path.cubicTo(SkBits2Float(0x42a85e4f), SkBits2Float(0x41e6959e), SkBits2Float(0x4285b4e3), SkBits2Float(0x426ae44f), SkBits2Float(0x4219b105), SkBits2Float(0x42932450));
path.cubicTo(SkBits2Float(0x411fe111), SkBits2Float(0x42b0d679), SkBits2Float(0xc1c3966b), SkBits2Float(0x42ab1d42), SkBits2Float(0xc2482755), SkBits2Float(0x428470e8));
@@ -1572,7 +1572,7 @@
static void battleOp57(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x422b8e0b), SkBits2Float(0xc2a5ffff), SkBits2Float(0x429d6dbc), SkBits2Float(0xc2494bad), SkBits2Float(0x42a54cb6), SkBits2Float(0xc0f3b760));
path.lineTo(SkBits2Float(0x426efcca), SkBits2Float(0xc0b02e2c));
@@ -1582,7 +1582,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a54cb7), SkBits2Float(0xc0f3b757));
path.cubicTo(SkBits2Float(0x42a60d08), SkBits2Float(0xc0628d9e), SkBits2Float(0x42a632b1), SkBits2Float(0x3f0efcd8), SkBits2Float(0x42a5bd61), SkBits2Float(0x4094a90a));
path.lineTo(SkBits2Float(0x426f9faf), SkBits2Float(0x4056ee3d));
@@ -1597,7 +1597,7 @@
static void battleOp58(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb630015b), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x422b8e0b), SkBits2Float(0xc2a5ffff), SkBits2Float(0x429d6dbc), SkBits2Float(0xc2494bad), SkBits2Float(0x42a54cb7), SkBits2Float(0xc0f3b757));
@@ -1609,7 +1609,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a5bd62), SkBits2Float(0x4094a90c));
path.cubicTo(SkBits2Float(0x42a1e9d4), SkBits2Float(0x421b17cd), SkBits2Float(0x426944f3), SkBits2Float(0x428879ea), SkBits2Float(0x41ceac14), SkBits2Float(0x429dc116));
path.cubicTo(SkBits2Float(0xc0d4c6f5), SkBits2Float(0x42b30843), SkBits2Float(0xc2295516), SkBits2Float(0x429e4e8b), SkBits2Float(0xc2802142), SkBits2Float(0x4253148e));
@@ -1626,7 +1626,7 @@
static void battleOp59(skiatest::Reporter* reporter, const char* filename) { // hung
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x423693bc), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42a57249), SkBits2Float(0xc2389374), SkBits2Float(0x42a5ff3a), SkBits2Float(0xbf002494));
path.lineTo(SkBits2Float(0x426ffee2), SkBits2Float(0xbeb944c3));
@@ -1636,7 +1636,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a5ff3a), SkBits2Float(0xbf0024e6));
path.cubicTo(SkBits2Float(0x42a60c9b), SkBits2Float(0x40752b0d), SkBits2Float(0x42a56c5d), SkBits2Float(0x410284fd), SkBits2Float(0x42a41ffb), SkBits2Float(0x414709fb));
path.lineTo(SkBits2Float(0x426d49ff), SkBits2Float(0x410fe233));
@@ -1650,7 +1650,7 @@
static void battleOp60(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e9334c2), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3f13342a), SkBits2Float(0xc2a5ff3c), SkBits2Float(0x3f5ccd0d), SkBits2Float(0xc2a5fdb4));
path.lineTo(SkBits2Float(0x3f1f9d85), SkBits2Float(0xc26ffcaf));
@@ -1660,7 +1660,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f5ccd1a), SkBits2Float(0xc2a5fdb5));
path.cubicTo(SkBits2Float(0x3f642956), SkBits2Float(0xc2a5fd8c), SkBits2Float(0x3f6b855d), SkBits2Float(0xc2a5fd63), SkBits2Float(0x3f72e163), SkBits2Float(0xc2a5fd38));
path.lineTo(SkBits2Float(0x3f2f9381), SkBits2Float(0xc26ffbfc));
@@ -1675,7 +1675,7 @@
static void battleOp61(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x36b23f68), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e9334c2), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3f13342a), SkBits2Float(0xc2a5ff3c), SkBits2Float(0x3f5ccd1a), SkBits2Float(0xc2a5fdb5));
@@ -1687,7 +1687,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f72e162), SkBits2Float(0xc2a5fd39));
path.cubicTo(SkBits2Float(0x3fb51288), SkBits2Float(0xc2a5fa80), SkBits2Float(0x3ff0b297), SkBits2Float(0xc2a5f5c4), SkBits2Float(0x401627a5), SkBits2Float(0xc2a5ef06));
path.lineTo(SkBits2Float(0x3fd9177b), SkBits2Float(0xc26fe773));
@@ -1702,7 +1702,7 @@
static void battleOp62(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f614848), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3fe14683), SkBits2Float(0xc2a5f8d5), SkBits2Float(0x4028ee0f), SkBits2Float(0xc2a5ea81));
path.lineTo(SkBits2Float(0x3ff43c76), SkBits2Float(0xc26fe0ec));
@@ -1712,7 +1712,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4028ee15), SkBits2Float(0xc2a5ea81));
path.cubicTo(SkBits2Float(0x402e8f25), SkBits2Float(0xc2a5e912), SkBits2Float(0x40343026), SkBits2Float(0xc2a5e791), SkBits2Float(0x4039d111), SkBits2Float(0xc2a5e5fd));
path.lineTo(SkBits2Float(0x4006533c), SkBits2Float(0xc26fda66));
@@ -1727,7 +1727,7 @@
static void battleOp63(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f614848), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3fe14683), SkBits2Float(0xc2a5f8d5), SkBits2Float(0x4028ee15), SkBits2Float(0xc2a5ea81));
@@ -1744,7 +1744,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4039d102), SkBits2Float(0xc2a5e5fe));
path.cubicTo(SkBits2Float(0x408a83ff), SkBits2Float(0xc2a5cc72), SkBits2Float(0x40b8130f), SkBits2Float(0xc2a5a01a), SkBits2Float(0x40e58a06), SkBits2Float(0xc2a56100));
path.lineTo(SkBits2Float(0x40a5ee90), SkBits2Float(0xc26f1a20));
@@ -1759,7 +1759,7 @@
static void battleOp64(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3faf587e), SkBits2Float(0xc2a5ffff), SkBits2Float(0x402f5505), SkBits2Float(0xc2a5eea1), SkBits2Float(0x408372de), SkBits2Float(0xc2a5cbeb));
path.lineTo(SkBits2Float(0x403e0bd0), SkBits2Float(0xc26fb4b6));
@@ -1769,7 +1769,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x408372d6), SkBits2Float(0xc2a5cbec));
path.cubicTo(SkBits2Float(0x4087d39d), SkBits2Float(0xc2a5c874), SkBits2Float(0x408c3440), SkBits2Float(0xc2a5c4cf), SkBits2Float(0x409094bd), SkBits2Float(0xc2a5c0fe));
path.lineTo(SkBits2Float(0x40510866), SkBits2Float(0xc26fa4e7));
@@ -1784,7 +1784,7 @@
static void battleOp65(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x363f7eb2), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3faf5872), SkBits2Float(0xc2a60000), SkBits2Float(0x402f54f9), SkBits2Float(0xc2a5eea1), SkBits2Float(0x408372d5), SkBits2Float(0xc2a5cbeb));
@@ -1797,7 +1797,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x409094be), SkBits2Float(0xc2a5c0fe));
path.cubicTo(SkBits2Float(0x40d784bb), SkBits2Float(0xc2a5831d), SkBits2Float(0x410f22d3), SkBits2Float(0xc2a517ba), SkBits2Float(0x413255ec), SkBits2Float(0xc2a47f15));
path.lineTo(SkBits2Float(0x4100ead4), SkBits2Float(0xc26dd37e));
@@ -1812,7 +1812,7 @@
static void battleOp66(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4037e518), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40b7d534), SkBits2Float(0xc2a5b39a), SkBits2Float(0x4109a47d), SkBits2Float(0xc2a51b1f));
path.lineTo(SkBits2Float(0x40c70051), SkBits2Float(0xc26eb519));
@@ -1822,7 +1822,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4109a47c), SkBits2Float(0xc2a51b20));
path.cubicTo(SkBits2Float(0x410e36d1), SkBits2Float(0xc2a50be2), SkBits2Float(0x4112c883), SkBits2Float(0xc2a4fbe1), SkBits2Float(0x41175985), SkBits2Float(0xc2a4eb1d));
path.lineTo(SkBits2Float(0x40dad196), SkBits2Float(0xc26e6faf));
@@ -1837,7 +1837,7 @@
static void battleOp67(skiatest::Reporter* reporter, const char* filename) { // crashed
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4037e518), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40b7d534), SkBits2Float(0xc2a5b39a), SkBits2Float(0x4109a47c), SkBits2Float(0xc2a51b20));
@@ -1850,7 +1850,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4117597f), SkBits2Float(0xc2a4eb1d));
path.cubicTo(SkBits2Float(0x41616445), SkBits2Float(0xc2a3db51), SkBits2Float(0x41954b2d), SkBits2Float(0xc2a2048b), SkBits2Float(0x41b914a4), SkBits2Float(0xc29f6bcb));
path.lineTo(SkBits2Float(0x4185cb10), SkBits2Float(0xc2667d00));
@@ -1864,7 +1864,7 @@
static void battleOp68(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e1b2207), SkBits2Float(0xc2a60000), SkBits2Float(0x3e9b2105), SkBits2Float(0xc2a5ffca), SkBits2Float(0x3ee8b0c0), SkBits2Float(0xc2a5ff5d));
path.lineTo(SkBits2Float(0x3ea83563), SkBits2Float(0xc26fff14));
@@ -1874,7 +1874,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3ee8b040), SkBits2Float(0xc2a5ff5d));
path.cubicTo(SkBits2Float(0x3ef0720a), SkBits2Float(0xc2a5ff52), SkBits2Float(0x3ef83386), SkBits2Float(0xc2a5ff47), SkBits2Float(0x3efff501), SkBits2Float(0xc2a5ff3b));
path.lineTo(SkBits2Float(0x3eb90778), SkBits2Float(0xc26ffee3));
@@ -1889,7 +1889,7 @@
static void battleOp69(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x36b67768), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e1b21b2), SkBits2Float(0xc2a60000), SkBits2Float(0x3e9b20b0), SkBits2Float(0xc2a5ffca), SkBits2Float(0x3ee8b040), SkBits2Float(0xc2a5ff5d));
@@ -1902,7 +1902,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3efff501), SkBits2Float(0xc2a5ff3b));
path.cubicTo(SkBits2Float(0x3f3ed289), SkBits2Float(0xc2a5fe79), SkBits2Float(0x3f7daa5c), SkBits2Float(0xc2a5fd28), SkBits2Float(0x3f9e4099), SkBits2Float(0xc2a5fb49));
path.lineTo(SkBits2Float(0x3f64cc5f), SkBits2Float(0xc26ff92f));
@@ -1917,7 +1917,7 @@
static void battleOp70(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f0938d2), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3f893841), SkBits2Float(0xc2a5fd56), SkBits2Float(0x3fcdd137), SkBits2Float(0xc2a5f805));
path.lineTo(SkBits2Float(0x3f94c89b), SkBits2Float(0xc26ff478));
@@ -1927,7 +1927,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3fcdd13c), SkBits2Float(0xc2a5f806));
path.cubicTo(SkBits2Float(0x3fd4ad55), SkBits2Float(0xc2a5f77d), SkBits2Float(0x3fdb895f), SkBits2Float(0xc2a5f6ef), SkBits2Float(0x3fe26560), SkBits2Float(0xc2a5f659));
path.lineTo(SkBits2Float(0x3fa3a8ea), SkBits2Float(0xc26ff20c));
@@ -1942,7 +1942,7 @@
static void battleOp71(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x360ebeb2), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f0938d2), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3f893841), SkBits2Float(0xc2a5fd56), SkBits2Float(0x3fcdd13c), SkBits2Float(0xc2a5f806));
@@ -1954,7 +1954,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3fe26566), SkBits2Float(0xc2a5f65a));
path.cubicTo(SkBits2Float(0x4028c729), SkBits2Float(0xc2a5ecdf), SkBits2Float(0x406055f2), SkBits2Float(0xc2a5dc6a), SkBits2Float(0x408beceb), SkBits2Float(0xc2a5c4fb));
path.lineTo(SkBits2Float(0x404a4d47), SkBits2Float(0xc26faaae));
@@ -1969,7 +1969,7 @@
static void battleOp72(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f73aa4a), SkBits2Float(0xc2a60000), SkBits2Float(0x3ff3a7f0), SkBits2Float(0xc2a5f79e), SkBits2Float(0x4036b54b), SkBits2Float(0xc2a5e6db));
path.lineTo(SkBits2Float(0x40041412), SkBits2Float(0xc26fdba5));
@@ -1979,7 +1979,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4036b55d), SkBits2Float(0xc2a5e6db));
path.cubicTo(SkBits2Float(0x403ccbdf), SkBits2Float(0xc2a5e52d), SkBits2Float(0x4042e24c), SkBits2Float(0xc2a5e36a), SkBits2Float(0x4048f89e), SkBits2Float(0xc2a5e192));
path.lineTo(SkBits2Float(0x401147bc), SkBits2Float(0xc26fd403));
@@ -1994,7 +1994,7 @@
static void battleOp73(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40447e19), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40c46ab2), SkBits2Float(0xc2a5a8c7), SkBits2Float(0x4113078c), SkBits2Float(0xc2a4fabe));
path.lineTo(SkBits2Float(0x40d4929e), SkBits2Float(0xc26e8647));
@@ -2004,7 +2004,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4113078b), SkBits2Float(0xc2a4fabe));
path.cubicTo(SkBits2Float(0x4117e908), SkBits2Float(0xc2a4e957), SkBits2Float(0x411cc9c0), SkBits2Float(0xc2a4d714), SkBits2Float(0x4121a9a1), SkBits2Float(0xc2a4c3f3));
path.lineTo(SkBits2Float(0x40e9baad), SkBits2Float(0xc26e370e));
@@ -2019,7 +2019,7 @@
static void battleOp74(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x406db78d), SkBits2Float(0xc2a60000), SkBits2Float(0x40ed953d), SkBits2Float(0xc2a58058), SkBits2Float(0x4131afb7), SkBits2Float(0xc2a481e4));
path.lineTo(SkBits2Float(0x410072b2), SkBits2Float(0xc26dd78e));
@@ -2029,7 +2029,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4131afba), SkBits2Float(0xc2a481e4));
path.cubicTo(SkBits2Float(0x413792dd), SkBits2Float(0xc2a46874), SkBits2Float(0x413d74a2), SkBits2Float(0xc2a44dc1), SkBits2Float(0x414354e9), SkBits2Float(0xc2a431ca));
path.lineTo(SkBits2Float(0x410d3424), SkBits2Float(0xc26d63c0));
@@ -2044,7 +2044,7 @@
static void battleOp75(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x36b5ff52), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x406db78d), SkBits2Float(0xc2a60000), SkBits2Float(0x40ed953d), SkBits2Float(0xc2a58058), SkBits2Float(0x4131afba), SkBits2Float(0xc2a481e4));
@@ -2056,7 +2056,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x414354ed), SkBits2Float(0xc2a431cb));
path.cubicTo(SkBits2Float(0x419152e5), SkBits2Float(0xc2a26c3a), SkBits2Float(0x41c0119b), SkBits2Float(0xc29f5c06), SkBits2Float(0x41ed1335), SkBits2Float(0xc29b0f0a));
path.lineTo(SkBits2Float(0x41ab612b), SkBits2Float(0xc2602e6b));
@@ -2071,7 +2071,7 @@
static void battleOp76(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40932e58), SkBits2Float(0xc2a5ffff), SkBits2Float(0x41130dbc), SkBits2Float(0xc2a53c41), SkBits2Float(0x415ba178), SkBits2Float(0xc2a3b6ca));
path.lineTo(SkBits2Float(0x411ec4eb), SkBits2Float(0xc26cb1eb));
@@ -2081,7 +2081,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x415ba178), SkBits2Float(0xc2a3b6cb));
path.cubicTo(SkBits2Float(0x4162e261), SkBits2Float(0xc2a38fde), SkBits2Float(0x416a20aa), SkBits2Float(0xc2a36704), SkBits2Float(0x41715c23), SkBits2Float(0xc2a33c3e));
path.lineTo(SkBits2Float(0x412e7a25), SkBits2Float(0xc26c00bd));
@@ -2096,7 +2096,7 @@
static void battleOp77(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40d0158a), SkBits2Float(0xc2a60000), SkBits2Float(0x414fb944), SkBits2Float(0xc2a478c0), SkBits2Float(0x419a74b5), SkBits2Float(0xc2a1724b));
path.lineTo(SkBits2Float(0x415f4f4c), SkBits2Float(0xc2696aa5));
@@ -2106,7 +2106,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x419a74b6), SkBits2Float(0xc2a1724b));
path.cubicTo(SkBits2Float(0x419f8274), SkBits2Float(0xc2a124ef), SkBits2Float(0x41a48c82), SkBits2Float(0xc2a0d3c9), SkBits2Float(0x41a9929f), SkBits2Float(0xc2a07edb));
path.lineTo(SkBits2Float(0x41752a58), SkBits2Float(0xc2680ab0));
@@ -2121,7 +2121,7 @@
static void battleOp78(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3655fea3), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40d0158a), SkBits2Float(0xc2a60000), SkBits2Float(0x414fb944), SkBits2Float(0xc2a478c0), SkBits2Float(0x419a74b6), SkBits2Float(0xc2a1724b));
@@ -2133,7 +2133,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41a9929f), SkBits2Float(0xc2a07edc));
path.cubicTo(SkBits2Float(0x41fb3aee), SkBits2Float(0xc29b1a71), SkBits2Float(0x422402f4), SkBits2Float(0xc291ddaf), SkBits2Float(0x4245eaa6), SkBits2Float(0xc2854763));
path.lineTo(SkBits2Float(0x420f1280), SkBits2Float(0xc240b13c));
@@ -2148,7 +2148,7 @@
static void battleOp79(skiatest::Reporter* reporter, const char* filename) { //crashed
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4110a0cc), SkBits2Float(0xc2a60000), SkBits2Float(0x4190247a), SkBits2Float(0xc2a30bfe), SkBits2Float(0x41d4a5dc), SkBits2Float(0xc29d41d4));
path.lineTo(SkBits2Float(0x4199b8a9), SkBits2Float(0xc2635c16));
@@ -2158,7 +2158,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41d4a5d9), SkBits2Float(0xc29d41d4));
path.cubicTo(SkBits2Float(0x41db7bbd), SkBits2Float(0xc29cadef), SkBits2Float(0x41e247df), SkBits2Float(0xc29c12ec), SkBits2Float(0x41e9098d), SkBits2Float(0xc29b70d9));
path.lineTo(SkBits2Float(0x41a875f1), SkBits2Float(0xc260bbd5));
@@ -2172,7 +2172,7 @@
static void battleOp80(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e15a675), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3e95a67a), SkBits2Float(0xc2a5ffcd), SkBits2Float(0x3ee07980), SkBits2Float(0xc2a5ff68));
path.lineTo(SkBits2Float(0x3ea245bb), SkBits2Float(0xc26fff25));
@@ -2182,7 +2182,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3ee07a10), SkBits2Float(0xc2a5ff68));
path.cubicTo(SkBits2Float(0x3ee7f565), SkBits2Float(0xc2a5ff5d), SkBits2Float(0x3eef70d9), SkBits2Float(0xc2a5ff52), SkBits2Float(0x3ef6ec4d), SkBits2Float(0xc2a5ff47));
path.lineTo(SkBits2Float(0x3eb27fdb), SkBits2Float(0xc26ffef6));
@@ -2197,7 +2197,7 @@
static void battleOp81(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3691e768), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e15a675), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3e95a67a), SkBits2Float(0xc2a5ffcd), SkBits2Float(0x3ee07a10), SkBits2Float(0xc2a5ff68));
@@ -2209,7 +2209,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3ef6ec9b), SkBits2Float(0xc2a5ff48));
path.cubicTo(SkBits2Float(0x3f3816c9), SkBits2Float(0xc2a5fe94), SkBits2Float(0x3f74b6e1), SkBits2Float(0xc2a5fd5b), SkBits2Float(0x3f98ab0b), SkBits2Float(0xc2a5fb9d));
path.lineTo(SkBits2Float(0x3f5cb973), SkBits2Float(0xc26ff9a8));
@@ -2224,7 +2224,7 @@
static void battleOp82(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3eff98a5), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3f7f97b3), SkBits2Float(0xc2a5fdb1), SkBits2Float(0x3fbfaf38), SkBits2Float(0xc2a5f914));
path.lineTo(SkBits2Float(0x3f8a9112), SkBits2Float(0xc26ff600));
@@ -2234,7 +2234,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3fbfaf15), SkBits2Float(0xc2a5f915));
path.cubicTo(SkBits2Float(0x3fc612b4), SkBits2Float(0xc2a5f8a0), SkBits2Float(0x3fcc7634), SkBits2Float(0xc2a5f824), SkBits2Float(0x3fd2d9ad), SkBits2Float(0xc2a5f7a2));
path.lineTo(SkBits2Float(0x3f986bef), SkBits2Float(0xc26ff3e6));
@@ -2249,7 +2249,7 @@
static void battleOp83(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3eff9875), SkBits2Float(0xc2a60000), SkBits2Float(0x3f7f9783), SkBits2Float(0xc2a5fdb1), SkBits2Float(0x3fbfaf14), SkBits2Float(0xc2a5f914));
@@ -2262,7 +2262,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3fd2d994), SkBits2Float(0xc2a5f7a1));
path.cubicTo(SkBits2Float(0x401d305c), SkBits2Float(0xc2a5ef69), SkBits2Float(0x4050ef71), SkBits2Float(0xc2a5e123), SkBits2Float(0x408252dc), SkBits2Float(0xc2a5ccd0));
path.lineTo(SkBits2Float(0x403c6b7d), SkBits2Float(0xc26fb5fe));
@@ -2277,7 +2277,7 @@
static void battleOp84(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f541e8b), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3fd41d19), SkBits2Float(0xc2a5f9a6), SkBits2Float(0x401f1022), SkBits2Float(0xc2a5ecf2));
path.lineTo(SkBits2Float(0x3fe5f882), SkBits2Float(0xc26fe473));
@@ -2287,7 +2287,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x401f1027), SkBits2Float(0xc2a5ecf2));
path.cubicTo(SkBits2Float(0x40245d21), SkBits2Float(0xc2a5ebac), SkBits2Float(0x4029aa04), SkBits2Float(0xc2a5ea57), SkBits2Float(0x402ef6d6), SkBits2Float(0xc2a5e8f1));
path.lineTo(SkBits2Float(0x3ffcf5ba), SkBits2Float(0xc26fdeaa));
@@ -2302,7 +2302,7 @@
static void battleOp85(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f541e8b), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3fd41d19), SkBits2Float(0xc2a5f9a6), SkBits2Float(0x401f1027), SkBits2Float(0xc2a5ecf2));
@@ -2314,7 +2314,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x402ef6c3), SkBits2Float(0xc2a5e8f1));
path.cubicTo(SkBits2Float(0x40826d68), SkBits2Float(0xc2a5d24c), SkBits2Float(0x40ad550a), SkBits2Float(0xc2a5aafb), SkBits2Float(0x40d82890), SkBits2Float(0xc2a57308));
path.lineTo(SkBits2Float(0x409c425c), SkBits2Float(0xc26f3430));
@@ -2329,7 +2329,7 @@
static void battleOp86(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40155bee), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40955364), SkBits2Float(0xc2a5cd99), SkBits2Float(0x40dfbd5f), SkBits2Float(0xc2a568f2));
path.lineTo(SkBits2Float(0x40a1bd53), SkBits2Float(0xc26f259d));
@@ -2339,7 +2339,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x40dfbd5e), SkBits2Float(0xc2a568f3));
path.cubicTo(SkBits2Float(0x40e72e1b), SkBits2Float(0xc2a55ee2), SkBits2Float(0x40ee9e1c), SkBits2Float(0xc2a55452), SkBits2Float(0x40f60d62), SkBits2Float(0xc2a54941));
path.lineTo(SkBits2Float(0x40b1de84), SkBits2Float(0xc26ef7c9));
@@ -2354,7 +2354,7 @@
static void battleOp87(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3619fea3), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40155bee), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40955364), SkBits2Float(0xc2a5cd99), SkBits2Float(0x40dfbd5e), SkBits2Float(0xc2a568f3));
@@ -2367,7 +2367,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x40f60d69), SkBits2Float(0xc2a54941));
path.cubicTo(SkBits2Float(0x41374a21), SkBits2Float(0xc2a495d5), SkBits2Float(0x41731962), SkBits2Float(0xc2a35eca), SkBits2Float(0x419704b1), SkBits2Float(0xc2a1a64c));
path.lineTo(SkBits2Float(0x415a56f5), SkBits2Float(0xc269b5d4));
@@ -2382,7 +2382,7 @@
static void battleOp88(skiatest::Reporter* reporter, const char* filename) { // crashed
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4059d383), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40d9b918), SkBits2Float(0xc2a594d0), SkBits2Float(0x4122e820), SkBits2Float(0xc2a4bf0c));
path.lineTo(SkBits2Float(0x40eb871c), SkBits2Float(0xc26e2ff8));
@@ -2392,7 +2392,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4122e81e), SkBits2Float(0xc2a4bf0c));
path.cubicTo(SkBits2Float(0x41284f3c), SkBits2Float(0xc2a4a9ac), SkBits2Float(0x412db549), SkBits2Float(0xc2a4933e), SkBits2Float(0x41331a33), SkBits2Float(0xc2a47bbf));
path.lineTo(SkBits2Float(0x410178be), SkBits2Float(0xc26dceac));
@@ -2406,7 +2406,7 @@
static void battleOp89(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3dd41fb8), SkBits2Float(0xc2a5fffe), SkBits2Float(0x3e541e5b), SkBits2Float(0xc2a5ffe5), SkBits2Float(0x3e9f1657), SkBits2Float(0xc2a5ffb2));
path.lineTo(SkBits2Float(0x3e66012b), SkBits2Float(0xc26fff92));
@@ -2416,7 +2416,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3e9f1626), SkBits2Float(0xc2a5ffb4));
path.cubicTo(SkBits2Float(0x3ea463a8), SkBits2Float(0xc2a5ffae), SkBits2Float(0x3ea9b10b), SkBits2Float(0xc2a5ffa8), SkBits2Float(0x3eaefe6d), SkBits2Float(0xc2a5ffa3));
path.lineTo(SkBits2Float(0x3e7d0144), SkBits2Float(0xc26fff7b));
@@ -2431,7 +2431,7 @@
static void battleOp90(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3dd41f74), SkBits2Float(0xc2a5fffe), SkBits2Float(0x3e541e17), SkBits2Float(0xc2a5ffe5), SkBits2Float(0x3e9f1624), SkBits2Float(0xc2a5ffb2));
@@ -2444,7 +2444,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3eaefebc), SkBits2Float(0xc2a5ffa4));
path.cubicTo(SkBits2Float(0x3f0276b7), SkBits2Float(0xc2a5ff4a), SkBits2Float(0x3f2d6dea), SkBits2Float(0xc2a5feac), SkBits2Float(0x3f5864cc), SkBits2Float(0xc2a5fdcd));
path.lineTo(SkBits2Float(0x3f1c6df6), SkBits2Float(0xc26ffcd0));
@@ -2459,7 +2459,7 @@
static void battleOp91(skiatest::Reporter* reporter, const char* filename) { // crashed
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3ec1e1ad), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3f41e136), SkBits2Float(0xc2a5feac), SkBits2Float(0x3f9167c6), SkBits2Float(0xc2a5fc05));
path.lineTo(SkBits2Float(0x3f523979), SkBits2Float(0xc26ffa3f));
@@ -2469,7 +2469,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f9167c1), SkBits2Float(0xc2a5fc05));
path.cubicTo(SkBits2Float(0x3f96406f), SkBits2Float(0xc2a5fbc1), SkBits2Float(0x3f9b1917), SkBits2Float(0xc2a5fb79), SkBits2Float(0x3f9ff1bc), SkBits2Float(0xc2a5fb2f));
path.lineTo(SkBits2Float(0x3f673ed7), SkBits2Float(0xc26ff909));
@@ -2483,7 +2483,7 @@
static void battleOp92(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e2c5962), SkBits2Float(0xc2a60000), SkBits2Float(0x3eac58ef), SkBits2Float(0xc2a5ffbd), SkBits2Float(0x3f014269), SkBits2Float(0xc2a5ff37));
path.lineTo(SkBits2Float(0x3ebae1ca), SkBits2Float(0xc26ffedd));
@@ -2493,7 +2493,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f014292), SkBits2Float(0xc2a5ff37));
path.cubicTo(SkBits2Float(0x3f0591a2), SkBits2Float(0xc2a5ff28), SkBits2Float(0x3f09e09b), SkBits2Float(0xc2a5ff1a), SkBits2Float(0x3f0e2f92), SkBits2Float(0xc2a5ff0b));
path.lineTo(SkBits2Float(0x3ecd91e5), SkBits2Float(0xc26ffea0));
@@ -2508,7 +2508,7 @@
static void battleOp93(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x36163ed0), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.quadTo(SkBits2Float(0x3e81430a), SkBits2Float(0xc2a60000), SkBits2Float(0x3f014292), SkBits2Float(0xc2a5ff37));
@@ -2520,7 +2520,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f0e2f94), SkBits2Float(0xc2a5ff0c));
path.cubicTo(SkBits2Float(0x3f5401b9), SkBits2Float(0xc2a5fe1c), SkBits2Float(0x3f8ce9a3), SkBits2Float(0xc2a5fc7d), SkBits2Float(0x3fafd1bd), SkBits2Float(0xc2a5fa2d));
path.lineTo(SkBits2Float(0x3f7e3238), SkBits2Float(0xc26ff796));
@@ -2535,7 +2535,7 @@
static void battleOp94(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f167e4a), SkBits2Float(0xc2a60000), SkBits2Float(0x3f967d97), SkBits2Float(0xc2a5fcce), SkBits2Float(0x3fe1b83b), SkBits2Float(0xc2a5f668));
path.lineTo(SkBits2Float(0x3fa32ba2), SkBits2Float(0xc26ff222));
@@ -2545,7 +2545,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3fe1b817), SkBits2Float(0xc2a5f668));
path.cubicTo(SkBits2Float(0x3fe93dd6), SkBits2Float(0xc2a5f5c4), SkBits2Float(0x3ff0c3a7), SkBits2Float(0xc2a5f518), SkBits2Float(0x3ff8496b), SkBits2Float(0xc2a5f464));
path.lineTo(SkBits2Float(0x3fb37c11), SkBits2Float(0xc26fef38));
@@ -2560,14 +2560,14 @@
static void battleOp95(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f167e32), SkBits2Float(0xc2a60000), SkBits2Float(0x3f967d7f), SkBits2Float(0xc2a5fcce), SkBits2Float(0x3fe1b817), SkBits2Float(0xc2a5f668));
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3ff8497f), SkBits2Float(0xc2a5f465));
path.cubicTo(SkBits2Float(0x40391895), SkBits2Float(0xc2a5e8fe), SkBits2Float(0x407604f1), SkBits2Float(0xc2a5d533), SkBits2Float(0x40997177), SkBits2Float(0xc2a5b905));
path.lineTo(SkBits2Float(0x405dd87f), SkBits2Float(0xc26f9962));
@@ -2582,7 +2582,7 @@
static void battleOp96(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3fa966bb), SkBits2Float(0xc2a5ffff), SkBits2Float(0x402963a4), SkBits2Float(0xc2a5efcb), SkBits2Float(0x407dfe39), SkBits2Float(0xc2a5cf64));
path.lineTo(SkBits2Float(0x40379c05), SkBits2Float(0xc26fb9ba));
@@ -2592,7 +2592,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x407dfe3a), SkBits2Float(0xc2a5cf65));
path.cubicTo(SkBits2Float(0x40833a01), SkBits2Float(0xc2a5cc27), SkBits2Float(0x408774bf), SkBits2Float(0xc2a5c8c0), SkBits2Float(0x408baf5a), SkBits2Float(0xc2a5c52f));
path.lineTo(SkBits2Float(0x4049f448), SkBits2Float(0xc26faaf9));
@@ -2607,7 +2607,7 @@
static void battleOp97(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x363f7e94), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3fa966bb), SkBits2Float(0xc2a5ffff), SkBits2Float(0x402963a4), SkBits2Float(0xc2a5efcb), SkBits2Float(0x407dfe3a), SkBits2Float(0xc2a5cf65));
@@ -2620,7 +2620,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x408baf5c), SkBits2Float(0xc2a5c530));
path.cubicTo(SkBits2Float(0x40d03963), SkBits2Float(0xc2a58b6e), SkBits2Float(0x410a4c7d), SkBits2Float(0xc2a52732), SkBits2Float(0x412c535f), SkBits2Float(0xc2a498b2));
path.lineTo(SkBits2Float(0x40f9253d), SkBits2Float(0xc26df886));
@@ -2635,7 +2635,7 @@
static void battleOp98(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40155bee), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40955364), SkBits2Float(0xc2a5cd99), SkBits2Float(0x40dfbd5f), SkBits2Float(0xc2a568f2));
path.lineTo(SkBits2Float(0x40a1bd53), SkBits2Float(0xc26f259d));
@@ -2645,7 +2645,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x40dfbd5e), SkBits2Float(0xc2a568f3));
path.cubicTo(SkBits2Float(0x40e72e1b), SkBits2Float(0xc2a55ee2), SkBits2Float(0x40ee9e1c), SkBits2Float(0xc2a55452), SkBits2Float(0x40f60d62), SkBits2Float(0xc2a54941));
path.lineTo(SkBits2Float(0x40b1de84), SkBits2Float(0xc26ef7c9));
@@ -2660,7 +2660,7 @@
static void battleOp99(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3619fea3), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40155bee), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40955364), SkBits2Float(0xc2a5cd99), SkBits2Float(0x40dfbd5e), SkBits2Float(0xc2a568f3));
@@ -2673,7 +2673,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x40f60d69), SkBits2Float(0xc2a54941));
path.cubicTo(SkBits2Float(0x41374a21), SkBits2Float(0xc2a495d5), SkBits2Float(0x41731962), SkBits2Float(0xc2a35eca), SkBits2Float(0x419704b1), SkBits2Float(0xc2a1a64c));
path.lineTo(SkBits2Float(0x415a56f5), SkBits2Float(0xc269b5d4));
@@ -2688,7 +2688,7 @@
static void battleOp100(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x403cde0b), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40bcccc9), SkBits2Float(0xc2a5af6a), SkBits2Float(0x410d5936), SkBits2Float(0xc2a50e98));
path.lineTo(SkBits2Float(0x40cc5bf6), SkBits2Float(0xc26ea2fc));
@@ -2698,7 +2698,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x410d5935), SkBits2Float(0xc2a50e99));
path.cubicTo(SkBits2Float(0x41120ace), SkBits2Float(0xc2a4fe85), SkBits2Float(0x4116bbb5), SkBits2Float(0xc2a4eda4), SkBits2Float(0x411b6bdd), SkBits2Float(0xc2a4dbf6));
path.lineTo(SkBits2Float(0x40e0b4a3), SkBits2Float(0xc26e59c7));
@@ -2713,7 +2713,7 @@
static void battleOp101(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x406db78d), SkBits2Float(0xc2a60000), SkBits2Float(0x40ed953d), SkBits2Float(0xc2a58058), SkBits2Float(0x4131afb7), SkBits2Float(0xc2a481e4));
path.lineTo(SkBits2Float(0x410072b2), SkBits2Float(0xc26dd78e));
@@ -2723,7 +2723,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4131afba), SkBits2Float(0xc2a481e4));
path.cubicTo(SkBits2Float(0x413792dd), SkBits2Float(0xc2a46874), SkBits2Float(0x413d74a2), SkBits2Float(0xc2a44dc1), SkBits2Float(0x414354e9), SkBits2Float(0xc2a431ca));
path.lineTo(SkBits2Float(0x410d3424), SkBits2Float(0xc26d63c0));
@@ -2738,7 +2738,7 @@
static void battleOp102(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x36b5ff52), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x406db78d), SkBits2Float(0xc2a60000), SkBits2Float(0x40ed953d), SkBits2Float(0xc2a58058), SkBits2Float(0x4131afba), SkBits2Float(0xc2a481e4));
@@ -2750,7 +2750,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x414354ed), SkBits2Float(0xc2a431cb));
path.cubicTo(SkBits2Float(0x419152e5), SkBits2Float(0xc2a26c3a), SkBits2Float(0x41c0119b), SkBits2Float(0xc29f5c06), SkBits2Float(0x41ed1335), SkBits2Float(0xc29b0f0a));
path.lineTo(SkBits2Float(0x41ab612b), SkBits2Float(0xc2602e6b));
@@ -2765,7 +2765,7 @@
static void battleOp103(skiatest::Reporter* reporter, const char* filename) { //crash
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x408e2d73), SkBits2Float(0xc2a5ffff), SkBits2Float(0x410e100a), SkBits2Float(0xc2a54957), SkBits2Float(0x41543cd2), SkBits2Float(0xc2a3ddc8));
path.lineTo(SkBits2Float(0x41196cba), SkBits2Float(0xc26cea49));
@@ -2775,7 +2775,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41543cce), SkBits2Float(0xc2a3ddc8));
path.cubicTo(SkBits2Float(0x415b4057), SkBits2Float(0xc2a3b973), SkBits2Float(0x41624181), SkBits2Float(0xc2a39350), SkBits2Float(0x41694022), SkBits2Float(0xc2a36b60));
path.lineTo(SkBits2Float(0x41289d63), SkBits2Float(0xc26c44e1));
@@ -2789,7 +2789,7 @@
static void battleOp104(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3dd41fb8), SkBits2Float(0xc2a5fffe), SkBits2Float(0x3e541e5b), SkBits2Float(0xc2a5ffe5), SkBits2Float(0x3e9f1657), SkBits2Float(0xc2a5ffb2));
path.lineTo(SkBits2Float(0x3e66012b), SkBits2Float(0xc26fff92));
@@ -2799,7 +2799,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3e9f1626), SkBits2Float(0xc2a5ffb4));
path.cubicTo(SkBits2Float(0x3ea463a8), SkBits2Float(0xc2a5ffae), SkBits2Float(0x3ea9b10b), SkBits2Float(0xc2a5ffa8), SkBits2Float(0x3eaefe6d), SkBits2Float(0xc2a5ffa3));
path.lineTo(SkBits2Float(0x3e7d0144), SkBits2Float(0xc26fff7b));
@@ -2814,7 +2814,7 @@
static void battleOp105(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3dd41f74), SkBits2Float(0xc2a5fffe), SkBits2Float(0x3e541e17), SkBits2Float(0xc2a5ffe5), SkBits2Float(0x3e9f1624), SkBits2Float(0xc2a5ffb2));
@@ -2827,7 +2827,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3eaefebc), SkBits2Float(0xc2a5ffa4));
path.cubicTo(SkBits2Float(0x3f0276b7), SkBits2Float(0xc2a5ff4a), SkBits2Float(0x3f2d6dea), SkBits2Float(0xc2a5feac), SkBits2Float(0x3f5864cc), SkBits2Float(0xc2a5fdcd));
path.lineTo(SkBits2Float(0x3f1c6df6), SkBits2Float(0xc26ffcd0));
@@ -2842,7 +2842,7 @@
static void battleOp106(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3ee221f0), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3f622166), SkBits2Float(0xc2a5fe31), SkBits2Float(0x3fa9974d), SkBits2Float(0xc2a5fa95));
path.lineTo(SkBits2Float(0x3f753159), SkBits2Float(0xc26ff82c));
@@ -2852,7 +2852,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3fa99777), SkBits2Float(0xc2a5fa96));
path.cubicTo(SkBits2Float(0x3faf3e7a), SkBits2Float(0xc2a5fa39), SkBits2Float(0x3fb4e596), SkBits2Float(0xc2a5f9d8), SkBits2Float(0x3fba8cad), SkBits2Float(0xc2a5f972));
path.lineTo(SkBits2Float(0x3f86dad5), SkBits2Float(0xc26ff687));
@@ -2867,7 +2867,7 @@
static void battleOp107(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3ee221f0), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3f622166), SkBits2Float(0xc2a5fe31), SkBits2Float(0x3fa99777), SkBits2Float(0xc2a5fa96));
@@ -2879,7 +2879,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3fba8c96), SkBits2Float(0xc2a5f973));
path.cubicTo(SkBits2Float(0x400b1301), SkBits2Float(0xc2a5f303), SkBits2Float(0x4038dc7e), SkBits2Float(0xc2a5e7d6), SkBits2Float(0x40669fe4), SkBits2Float(0xc2a5d7ed));
path.lineTo(SkBits2Float(0x4026b765), SkBits2Float(0xc26fc611));
@@ -2894,7 +2894,7 @@
static void battleOp108(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f587304), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3fd8713e), SkBits2Float(0xc2a5f962), SkBits2Float(0x40224ed5), SkBits2Float(0xc2a5ec27));
path.lineTo(SkBits2Float(0x3feaa996), SkBits2Float(0xc26fe350));
@@ -2904,7 +2904,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x40224ee4), SkBits2Float(0xc2a5ec28));
path.cubicTo(SkBits2Float(0x4027b77a), SkBits2Float(0xc2a5ead6), SkBits2Float(0x402d1ffd), SkBits2Float(0xc2a5e972), SkBits2Float(0x4032886f), SkBits2Float(0xc2a5e7fe));
path.lineTo(SkBits2Float(0x40010f64), SkBits2Float(0xc26fdd4a));
@@ -2919,7 +2919,7 @@
static void battleOp109(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f587304), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3fd8713e), SkBits2Float(0xc2a5f962), SkBits2Float(0x40224ee4), SkBits2Float(0xc2a5ec28));
@@ -2931,7 +2931,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4032887d), SkBits2Float(0xc2a5e7fe));
path.cubicTo(SkBits2Float(0x4085166b), SkBits2Float(0xc2a5d069), SkBits2Float(0x40b0dd8e), SkBits2Float(0xc2a5a77a), SkBits2Float(0x40dc8f53), SkBits2Float(0xc2a56d38));
path.lineTo(SkBits2Float(0x409f70d9), SkBits2Float(0xc26f2bca));
@@ -2946,7 +2946,7 @@
static void battleOp110(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x400cf1ae), SkBits2Float(0xc2a5ffff), SkBits2Float(0x408cea87), SkBits2Float(0xc2a5d31f), SkBits2Float(0x40d32a40), SkBits2Float(0xc2a57979));
path.lineTo(SkBits2Float(0x4098a645), SkBits2Float(0xc26f3d83));
@@ -2956,7 +2956,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x40d32a46), SkBits2Float(0xc2a5797a));
path.cubicTo(SkBits2Float(0x40da306e), SkBits2Float(0xc2a57083), SkBits2Float(0x40e135fe), SkBits2Float(0xc2a5671a), SkBits2Float(0x40e83aef), SkBits2Float(0xc2a55d3f));
path.lineTo(SkBits2Float(0x40a7e090), SkBits2Float(0xc26f14b1));
@@ -2971,7 +2971,7 @@
static void battleOp111(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3697ff59), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x400cf1ae), SkBits2Float(0xc2a5ffff), SkBits2Float(0x408cea87), SkBits2Float(0xc2a5d31f), SkBits2Float(0x40d32a46), SkBits2Float(0xc2a5797a));
@@ -2988,7 +2988,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x40e83ae9), SkBits2Float(0xc2a55d3f));
path.cubicTo(SkBits2Float(0x412d0232), SkBits2Float(0xc2a4bd73), SkBits2Float(0x4165854a), SkBits2Float(0xc2a3a860), SkBits2Float(0x418ea651), SkBits2Float(0xc2a21fbf));
path.lineTo(SkBits2Float(0x414e3d91), SkBits2Float(0xc26a656a));
@@ -3003,7 +3003,7 @@
static void battleOp112(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4035711d), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40b561d9), SkBits2Float(0xc2a5b5a1), SkBits2Float(0x4107d050), SkBits2Float(0xc2a5212f));
path.lineTo(SkBits2Float(0x40c45b76), SkBits2Float(0xc26ebddb));
@@ -3013,7 +3013,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4107d054), SkBits2Float(0xc2a5212f));
path.cubicTo(SkBits2Float(0x410c5332), SkBits2Float(0xc2a51258), SkBits2Float(0x4110d578), SkBits2Float(0xc2a502c3), SkBits2Float(0x41155714), SkBits2Float(0xc2a4f271));
path.lineTo(SkBits2Float(0x40d7e9e2), SkBits2Float(0xc26e7a46));
@@ -3028,7 +3028,7 @@
static void battleOp113(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4035711d), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40b561d9), SkBits2Float(0xc2a5b5a1), SkBits2Float(0x4107d054), SkBits2Float(0xc2a5212f));
@@ -3040,7 +3040,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4115571a), SkBits2Float(0xc2a4f271));
path.cubicTo(SkBits2Float(0x415e6818), SkBits2Float(0xc2a3e9d4), SkBits2Float(0x41935478), SkBits2Float(0xc2a21f7a), SkBits2Float(0x41b6ad74), SkBits2Float(0xc29f981d));
path.lineTo(SkBits2Float(0x41840e5b), SkBits2Float(0xc266bd14));
@@ -3055,7 +3055,7 @@
static void battleOp114(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x405f6414), SkBits2Float(0xc2a60000), SkBits2Float(0x40df4798), SkBits2Float(0xc2a58f44), SkBits2Float(0x41270b42), SkBits2Float(0xc2a4ae78));
path.lineTo(SkBits2Float(0x40f1826b), SkBits2Float(0xc26e1801));
@@ -3065,7 +3065,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41270b46), SkBits2Float(0xc2a4ae78));
path.cubicTo(SkBits2Float(0x412c952a), SkBits2Float(0xc2a497ff), SkBits2Float(0x41321de3), SkBits2Float(0xc2a48068), SkBits2Float(0x4137a563), SkBits2Float(0xc2a467b4));
path.lineTo(SkBits2Float(0x4104c195), SkBits2Float(0xc26db1b1));
@@ -3080,7 +3080,7 @@
static void battleOp115(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x405f6414), SkBits2Float(0xc2a60000), SkBits2Float(0x40df4798), SkBits2Float(0xc2a58f44), SkBits2Float(0x41270b46), SkBits2Float(0xc2a4ae78));
@@ -3092,7 +3092,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4137a563), SkBits2Float(0xc2a467b4));
path.cubicTo(SkBits2Float(0x4188a9bf), SkBits2Float(0xc2a2d700), SkBits2Float(0x41b4bec4), SkBits2Float(0xc2a021d5), SkBits2Float(0x41df619b), SkBits2Float(0xc29c5308));
path.lineTo(SkBits2Float(0x41a17afe), SkBits2Float(0xc26202d7));
@@ -3107,7 +3107,7 @@
static void battleOp116(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40894a00), SkBits2Float(0xc2a5ffff), SkBits2Float(0x41092f84), SkBits2Float(0xc2a555af), SkBits2Float(0x414d01d5), SkBits2Float(0xc2a40295));
path.lineTo(SkBits2Float(0x411432a9), SkBits2Float(0xc26d1f80));
@@ -3117,7 +3117,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x414d01d1), SkBits2Float(0xc2a40296));
path.cubicTo(SkBits2Float(0x4153c92e), SkBits2Float(0xc2a3e0b1), SkBits2Float(0x415a8e6d), SkBits2Float(0xc2a3bd1e), SkBits2Float(0x41615162), SkBits2Float(0xc2a397de));
path.lineTo(SkBits2Float(0x4122e164), SkBits2Float(0xc26c8535));
@@ -3132,7 +3132,7 @@
static void battleOp117(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x408949fd), SkBits2Float(0xc2a60000), SkBits2Float(0x41092f81), SkBits2Float(0xc2a555af), SkBits2Float(0x414d01d0), SkBits2Float(0xc2a40295));
@@ -3145,7 +3145,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41615164), SkBits2Float(0xc2a397de));
path.cubicTo(SkBits2Float(0x41a78432), SkBits2Float(0xc2a13b6d), SkBits2Float(0x41dcf7f2), SkBits2Float(0xc29d27e8), SkBits2Float(0x4207e0f5), SkBits2Float(0xc29775db));
path.lineTo(SkBits2Float(0x41c47380), SkBits2Float(0xc25afa96));
@@ -3160,7 +3160,7 @@
static void battleOp118(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40a2e582), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4122b94f), SkBits2Float(0xc2a51039), SkBits2Float(0x4172cca0), SkBits2Float(0xc2a333b4));
path.lineTo(SkBits2Float(0x412f847d), SkBits2Float(0xc26bf464));
@@ -3170,7 +3170,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4172cc9b), SkBits2Float(0xc2a333b4));
path.cubicTo(SkBits2Float(0x417acd1a), SkBits2Float(0xc2a30415), SkBits2Float(0x41816508), SkBits2Float(0xc2a2d21d), SkBits2Float(0x4185619b), SkBits2Float(0xc2a29dcb));
path.lineTo(SkBits2Float(0x4140d724), SkBits2Float(0xc26b1ba8));
@@ -3185,7 +3185,7 @@
static void battleOp119(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x36b5ff52), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40a2e57f), SkBits2Float(0xc2a60000), SkBits2Float(0x4122b94c), SkBits2Float(0xc2a51039), SkBits2Float(0x4172cc9b), SkBits2Float(0xc2a333b4));
@@ -3199,7 +3199,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4185619b), SkBits2Float(0xc2a29dcc));
path.cubicTo(SkBits2Float(0x41c61a92), SkBits2Float(0xc29f4c69), SkBits2Float(0x42023dd6), SkBits2Float(0xc299958f), SkBits2Float(0x421f3a98), SkBits2Float(0xc291a994));
path.lineTo(SkBits2Float(0x41e635e1), SkBits2Float(0xc25298a5));
@@ -3214,7 +3214,7 @@
static void battleOp120(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40c39389), SkBits2Float(0xc2a60000), SkBits2Float(0x414346f4), SkBits2Float(0xc2a4a65f), SkBits2Float(0x419158cf), SkBits2Float(0xc2a1f965));
path.lineTo(SkBits2Float(0x415223e0), SkBits2Float(0xc26a2df8));
@@ -3224,7 +3224,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x419158d0), SkBits2Float(0xc2a1f965));
path.cubicTo(SkBits2Float(0x41961cea), SkBits2Float(0xc2a1b4f6), SkBits2Float(0x419addf6), SkBits2Float(0xc2a16d2c), SkBits2Float(0x419f9bbb), SkBits2Float(0xc2a12207));
path.lineTo(SkBits2Float(0x4166c251), SkBits2Float(0xc268f69a));
@@ -3239,7 +3239,7 @@
static void battleOp121(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40c39389), SkBits2Float(0xc2a60000), SkBits2Float(0x414346f4), SkBits2Float(0xc2a4a65f), SkBits2Float(0x419158d0), SkBits2Float(0xc2a1f965));
@@ -3251,7 +3251,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x419f9bbc), SkBits2Float(0xc2a12208));
path.cubicTo(SkBits2Float(0x41eca53e), SkBits2Float(0xc29c5d1a), SkBits2Float(0x421ad1be), SkBits2Float(0xc2942e2b), SkBits2Float(0x423b8fe1), SkBits2Float(0xc288f8a3));
path.lineTo(SkBits2Float(0x42079647), SkBits2Float(0xc24607dc));
@@ -3266,7 +3266,7 @@
static void battleOp122(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x410a1653), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4189aa2f), SkBits2Float(0xc2a34ed0), SkBits2Float(0x41cb63be), SkBits2Float(0xc29e054b));
path.lineTo(SkBits2Float(0x41930758), SkBits2Float(0xc26476b2));
@@ -3276,7 +3276,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41cb63c3), SkBits2Float(0xc29e054c));
path.cubicTo(SkBits2Float(0x41d1f2f3), SkBits2Float(0xc29d7e37), SkBits2Float(0x41d879a0), SkBits2Float(0xc29cf09c), SkBits2Float(0x41def72d), SkBits2Float(0xc29c5c87));
path.lineTo(SkBits2Float(0x41a12e10), SkBits2Float(0xc2621091));
@@ -3291,7 +3291,7 @@
static void battleOp123(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3637fea3), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x410a1653), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4189aa2f), SkBits2Float(0xc2a34ed0), SkBits2Float(0x41cb63be), SkBits2Float(0xc29e054b));
@@ -3305,7 +3305,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41def730), SkBits2Float(0xc29c5c87));
path.cubicTo(SkBits2Float(0x422459f2), SkBits2Float(0xc292f017), SkBits2Float(0x42539427), SkBits2Float(0xc282f764), SkBits2Float(0x4278c050), SkBits2Float(0xc25be110));
path.lineTo(SkBits2Float(0x4233d1f5), SkBits2Float(0xc21ef2e3));
@@ -3320,7 +3320,7 @@
static void battleOp124(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x411fc00b), SkBits2Float(0xc2a5ffff), SkBits2Float(0x419f1845), SkBits2Float(0xc2a265a5), SkBits2Float(0x41e9da2b), SkBits2Float(0xc29b5d43));
path.lineTo(SkBits2Float(0x41a90cc1), SkBits2Float(0xc2609f84));
@@ -3330,7 +3330,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41e9da2e), SkBits2Float(0xc29b5d44));
path.cubicTo(SkBits2Float(0x41f14eda), SkBits2Float(0xc29aa9b5), SkBits2Float(0x41f8b671), SkBits2Float(0xc299ed94), SkBits2Float(0x42000805), SkBits2Float(0xc29928f7));
path.lineTo(SkBits2Float(0x41b91b05), SkBits2Float(0xc25d6faa));
@@ -3345,7 +3345,7 @@
static void battleOp125(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x411fc00b), SkBits2Float(0xc2a5ffff), SkBits2Float(0x419f1845), SkBits2Float(0xc2a265a5), SkBits2Float(0x41e9da2e), SkBits2Float(0xc29b5d44));
@@ -3357,7 +3357,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42000806), SkBits2Float(0xc29928f8));
path.cubicTo(SkBits2Float(0x423c0231), SkBits2Float(0xc28ca034), SkBits2Float(0x426f4e95), SkBits2Float(0xc26f2095), SkBits2Float(0x4289c821), SkBits2Float(0xc2392c12));
path.lineTo(SkBits2Float(0x424733db), SkBits2Float(0xc205dc02));
@@ -3372,7 +3372,7 @@
static void battleOp126(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41379cd4), SkBits2Float(0xc2a60000), SkBits2Float(0x41b69d77), SkBits2Float(0xc2a13d93), SkBits2Float(0x42055871), SkBits2Float(0xc29805ae));
path.lineTo(SkBits2Float(0x41c0c9e6), SkBits2Float(0xc25bca86));
@@ -3382,7 +3382,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42055872), SkBits2Float(0xc29805ae));
path.cubicTo(SkBits2Float(0x420988d2), SkBits2Float(0xc2971a85), SkBits2Float(0x420daf5c), SkBits2Float(0xc296244f), SkBits2Float(0x4211cb64), SkBits2Float(0xc2952332));
path.lineTo(SkBits2Float(0x41d2c988), SkBits2Float(0xc2579ed7));
@@ -3397,7 +3397,7 @@
static void battleOp127(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3673fea5), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41379cd4), SkBits2Float(0xc2a60000), SkBits2Float(0x41b69d77), SkBits2Float(0xc2a13d93), SkBits2Float(0x42055872), SkBits2Float(0xc29805ae));
@@ -3409,7 +3409,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4211cb65), SkBits2Float(0xc2952332));
path.cubicTo(SkBits2Float(0x42550406), SkBits2Float(0xc284b578), SkBits2Float(0x42859569), SkBits2Float(0xc252d13a), SkBits2Float(0x4295bbf4), SkBits2Float(0xc20f53bf));
path.lineTo(SkBits2Float(0x42587bb2), SkBits2Float(0xc1cf3850));
@@ -3424,7 +3424,7 @@
static void battleOp128(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4151cd59), SkBits2Float(0xc2a5ffff), SkBits2Float(0x41d04f3f), SkBits2Float(0xc29fc954), SkBits2Float(0x4216e058), SkBits2Float(0xc293de54));
path.lineTo(SkBits2Float(0x41da226b), SkBits2Float(0xc255c926));
@@ -3434,7 +3434,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4216e057), SkBits2Float(0xc293de54));
path.cubicTo(SkBits2Float(0x421b86ea), SkBits2Float(0xc292aea0), SkBits2Float(0x42201eff), SkBits2Float(0xc29170ed), SkBits2Float(0x4224a79b), SkBits2Float(0xc290257e));
path.lineTo(SkBits2Float(0x41ee0e15), SkBits2Float(0xc2506790));
@@ -3449,7 +3449,7 @@
static void battleOp129(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3697ff52), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4151cd58), SkBits2Float(0xc2a60000), SkBits2Float(0x41d04f3d), SkBits2Float(0xc29fc954), SkBits2Float(0x4216e057), SkBits2Float(0xc293de54));
@@ -3463,7 +3463,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4224a79b), SkBits2Float(0xc290257f));
path.cubicTo(SkBits2Float(0x426f06c3), SkBits2Float(0xc275d105), SkBits2Float(0x42930d85), SkBits2Float(0xc2303df6), SkBits2Float(0x429f3103), SkBits2Float(0xc1bc373f));
path.lineTo(SkBits2Float(0x42662806), SkBits2Float(0xc1880f44));
@@ -3478,7 +3478,7 @@
static void battleOp130(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x417054a2), SkBits2Float(0xc2a5ffff), SkBits2Float(0x41ee1405), SkBits2Float(0xc29dd904), SkBits2Float(0x422a9595), SkBits2Float(0xc28e6989));
path.lineTo(SkBits2Float(0x41f6a0c0), SkBits2Float(0xc24de5b0));
@@ -3488,7 +3488,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x422a9596), SkBits2Float(0xc28e6989));
path.cubicTo(SkBits2Float(0x422fb535), SkBits2Float(0xc28ce0c4), SkBits2Float(0x4234bf65), SkBits2Float(0xc28b465e), SkBits2Float(0x4239b2bc), SkBits2Float(0xc2899acc));
path.lineTo(SkBits2Float(0x42063d5a), SkBits2Float(0xc246f24e));
@@ -3503,7 +3503,7 @@
static void battleOp131(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb630015b), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x417054a2), SkBits2Float(0xc2a5ffff), SkBits2Float(0x41ee1405), SkBits2Float(0xc29dd904), SkBits2Float(0x422a9596), SkBits2Float(0xc28e6989));
@@ -3515,7 +3515,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4239b2bd), SkBits2Float(0xc2899acc));
path.cubicTo(SkBits2Float(0x42859c2b), SkBits2Float(0xc25c33ca), SkBits2Float(0x42a01474), SkBits2Float(0xc203e23a), SkBits2Float(0x42a51fce), SkBits2Float(0xc1083bae));
path.lineTo(SkBits2Float(0x426ebbdb), SkBits2Float(0xc0c4f6ab));
@@ -3530,7 +3530,7 @@
static void battleOp132(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4187e175), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42063ec3), SkBits2Float(0xc29b93fb), SkBits2Float(0x423df6fd), SkBits2Float(0xc2882410));
path.lineTo(SkBits2Float(0x420952ef), SkBits2Float(0xc244d488));
@@ -3540,7 +3540,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423df6fe), SkBits2Float(0xc2882411));
path.cubicTo(SkBits2Float(0x42437e7a), SkBits2Float(0xc286364a), SkBits2Float(0x4248e78f), SkBits2Float(0xc2843312), SkBits2Float(0x424e304d), SkBits2Float(0xc2821b20));
path.lineTo(SkBits2Float(0x42150d53), SkBits2Float(0xc23c1ae0));
@@ -3555,7 +3555,7 @@
static void battleOp133(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4187e175), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42063ec3), SkBits2Float(0xc29b93fb), SkBits2Float(0x423df6fe), SkBits2Float(0xc2882411));
@@ -3568,7 +3568,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x424e304d), SkBits2Float(0xc2821b20));
path.cubicTo(SkBits2Float(0x4292cbf1), SkBits2Float(0xc23ef41d), SkBits2Float(0x42aa31a6), SkBits2Float(0xc1a4e14c), SkBits2Float(0x42a56158), SkBits2Float(0x40e54b3a));
path.lineTo(SkBits2Float(0x426f1a9e), SkBits2Float(0x40a5c12f));
@@ -3583,7 +3583,7 @@
static void battleOp134(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x419c5b1f), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4219d929), SkBits2Float(0xc29834b3), SkBits2Float(0x4255ae76), SkBits2Float(0xc27e184c));
path.lineTo(SkBits2Float(0x421a77f2), SkBits2Float(0xc237aede));
@@ -3593,7 +3593,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4255ae76), SkBits2Float(0xc27e184c));
path.cubicTo(SkBits2Float(0x425b9ab5), SkBits2Float(0xc2791d33), SkBits2Float(0x426159ea), SkBits2Float(0xc273ed7b), SkBits2Float(0x4266e960), SkBits2Float(0xc26e8b92));
path.lineTo(SkBits2Float(0x4226ec90), SkBits2Float(0xc22c713c));
@@ -3608,7 +3608,7 @@
static void battleOp135(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3637fea5), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x419c5b1f), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4219d929), SkBits2Float(0xc29834b3), SkBits2Float(0x4255ae76), SkBits2Float(0xc27e184c));
@@ -3620,7 +3620,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4266e961), SkBits2Float(0xc26e8b93));
path.cubicTo(SkBits2Float(0x42a1bfce), SkBits2Float(0xc214ebcf), SkBits2Float(0x42b1ee5a), SkBits2Float(0xc05d1412), SkBits2Float(0x429cf75a), SkBits2Float(0x41d80f2c));
path.lineTo(SkBits2Float(0x4262f06b), SkBits2Float(0x419c2ffb));
@@ -3635,7 +3635,7 @@
static void battleOp136(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41ae0130), SkBits2Float(0xc2a5ffff), SkBits2Float(0x422a8737), SkBits2Float(0xc294ec91), SkBits2Float(0x42689b67), SkBits2Float(0xc26ce46c));
path.lineTo(SkBits2Float(0x42282651), SkBits2Float(0xc22b3f58));
@@ -3645,7 +3645,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42689b68), SkBits2Float(0xc26ce46d));
path.cubicTo(SkBits2Float(0x426ebcd2), SkBits2Float(0xc266df67), SkBits2Float(0x4274a1d2), SkBits2Float(0xc2609e09), SkBits2Float(0x427a4701), SkBits2Float(0xc25a23f2));
path.lineTo(SkBits2Float(0x4234ec64), SkBits2Float(0xc21db11e));
@@ -3660,7 +3660,7 @@
static void battleOp137(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41ae0130), SkBits2Float(0xc2a5ffff), SkBits2Float(0x422a8737), SkBits2Float(0xc294ec91), SkBits2Float(0x42689b68), SkBits2Float(0xc26ce46d));
@@ -3672,7 +3672,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x427a4702), SkBits2Float(0xc25a23f2));
path.cubicTo(SkBits2Float(0x42ac7185), SkBits2Float(0xc1db2f83), SkBits2Float(0x42b35ed0), SkBits2Float(0x413e447a), SkBits2Float(0x428e4a3d), SkBits2Float(0x422afde8));
path.lineTo(SkBits2Float(0x424db871), SkBits2Float(0x41f73799));
@@ -3687,7 +3687,7 @@
static void battleOp138(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41c2602d), SkBits2Float(0xc2a5ffff), SkBits2Float(0x423d7ece), SkBits2Float(0xc290b51a), SkBits2Float(0x427c92bc), SkBits2Float(0xc2577a5f));
path.lineTo(SkBits2Float(0x42369543), SkBits2Float(0xc21bc469));
@@ -3697,7 +3697,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x427c92be), SkBits2Float(0xc2577a5f));
path.cubicTo(SkBits2Float(0x42816448), SkBits2Float(0xc25032db), SkBits2Float(0x42845689), SkBits2Float(0xc248a77c), SkBits2Float(0x42871e08), SkBits2Float(0xc240ddaa));
path.lineTo(SkBits2Float(0x424359af), SkBits2Float(0xc20b6bce));
@@ -3712,7 +3712,7 @@
static void battleOp139(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41c2602d), SkBits2Float(0xc2a5ffff), SkBits2Float(0x423d7ece), SkBits2Float(0xc290b51a), SkBits2Float(0x427c92bc), SkBits2Float(0xc2577a5f));
@@ -3726,7 +3726,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42871e08), SkBits2Float(0xc240ddaa));
path.cubicTo(SkBits2Float(0x42b615a2), SkBits2Float(0xc174ff4e), SkBits2Float(0x42aecf41), SkBits2Float(0x41edcc49), SkBits2Float(0x426bc7a7), SkBits2Float(0x4269bc09));
path.lineTo(SkBits2Float(0x422a717e), SkBits2Float(0x4228f6f7));
@@ -3741,7 +3741,7 @@
static void battleOp140(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41d9e52a), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4252f644), SkBits2Float(0xc28b460f), SkBits2Float(0x42887c98), SkBits2Float(0xc23cf83b));
path.lineTo(SkBits2Float(0x42455485), SkBits2Float(0xc2089ac5));
@@ -3751,7 +3751,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42887c98), SkBits2Float(0xc23cf83b));
path.cubicTo(SkBits2Float(0x428b8706), SkBits2Float(0xc2342f4a), SkBits2Float(0x428e5ab7), SkBits2Float(0xc22b1c84), SkBits2Float(0x4290f525), SkBits2Float(0xc221c800));
path.lineTo(SkBits2Float(0x425193c7), SkBits2Float(0xc1e9e68d));
@@ -3766,7 +3766,7 @@
static void battleOp141(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41d9e52a), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4252f644), SkBits2Float(0xc28b460f), SkBits2Float(0x42887c98), SkBits2Float(0xc23cf83b));
@@ -3779,7 +3779,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4290f526), SkBits2Float(0xc221c800));
path.cubicTo(SkBits2Float(0x42bd6cdd), SkBits2Float(0xbf1a1474), SkBits2Float(0x42a13baa), SkBits2Float(0x4246de93), SkBits2Float(0x4223add7), SkBits2Float(0x42906c8a));
path.lineTo(SkBits2Float(0x41eca4f8), SkBits2Float(0x4250ce48));
@@ -3794,7 +3794,7 @@
static void battleOp142(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41f6a97d), SkBits2Float(0xc2a60000), SkBits2Float(0x426c7f9e), SkBits2Float(0xc283d12f), SkBits2Float(0x4292f07c), SkBits2Float(0xc21a76e5));
path.lineTo(SkBits2Float(0x42547147), SkBits2Float(0xc1df5274));
@@ -3804,7 +3804,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4292f07c), SkBits2Float(0xc21a76e5));
path.cubicTo(SkBits2Float(0x4295bcf6), SkBits2Float(0xc20fd099), SkBits2Float(0x42983ed1), SkBits2Float(0xc204de6d), SkBits2Float(0x429a7333), SkBits2Float(0xc1f3598c));
path.lineTo(SkBits2Float(0x425f4d1c), SkBits2Float(0xc1afea60));
@@ -3819,7 +3819,7 @@
static void battleOp143(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41f6a97d), SkBits2Float(0xc2a60000), SkBits2Float(0x426c7f9e), SkBits2Float(0xc283d12f), SkBits2Float(0x4292f07c), SkBits2Float(0xc21a76e5));
@@ -3831,7 +3831,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x429a7334), SkBits2Float(0xc1f3598d));
path.cubicTo(SkBits2Float(0x42ac9a56), SkBits2Float(0xc0ec08d5), SkBits2Float(0x42a93a4b), SkBits2Float(0x4194209c), SkBits2Float(0x42913f11), SkBits2Float(0x4220bdeb));
path.cubicTo(SkBits2Float(0x427287b0), SkBits2Float(0x42776b87), SkBits2Float(0x421e5dc6), SkBits2Float(0x429a1372), SkBits2Float(0x4173f4a4), SkBits2Float(0x42a32ccd));
@@ -3848,7 +3848,7 @@
static void battleOp144(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42079c39), SkBits2Float(0xc2a60000), SkBits2Float(0x4280cb64), SkBits2Float(0xc279860f), SkBits2Float(0x429a0d79), SkBits2Float(0xc1f758df));
path.lineTo(SkBits2Float(0x425eba08), SkBits2Float(0xc1b2ce1f));
@@ -3858,7 +3858,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x429a0d79), SkBits2Float(0xc1f758de));
path.cubicTo(SkBits2Float(0x429c811b), SkBits2Float(0xc1deea6e), SkBits2Float(0x429e9731), SkBits2Float(0xc1c5ec3a), SkBits2Float(0x42a04ce7), SkBits2Float(0xc1ac8024));
path.lineTo(SkBits2Float(0x4267c277), SkBits2Float(0xc17965fc));
@@ -3873,7 +3873,7 @@
static void battleOp145(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42079c39), SkBits2Float(0xc2a60000), SkBits2Float(0x4280cb64), SkBits2Float(0xc279860f), SkBits2Float(0x429a0d79), SkBits2Float(0xc1f758df));
@@ -3886,7 +3886,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a04ce8), SkBits2Float(0xc1ac8024));
path.cubicTo(SkBits2Float(0x42ae6ca1), SkBits2Float(0x4095ff41), SkBits2Float(0x42a1f1fa), SkBits2Float(0x4202ed54), SkBits2Float(0x427dc9de), SkBits2Float(0x42560b98));
path.cubicTo(SkBits2Float(0x4237afc7), SkBits2Float(0x429494ee), SkBits2Float(0x419aa752), SkBits2Float(0x42aa57e8), SkBits2Float(0xc0f777b3), SkBits2Float(0x42a54724));
@@ -3903,7 +3903,7 @@
static void battleOp146(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x421472e7), SkBits2Float(0xc2a5ffff), SkBits2Float(0x428b6da4), SkBits2Float(0xc26973d7), SkBits2Float(0x429fb179), SkBits2Float(0xc1b54986));
path.lineTo(SkBits2Float(0x4266e1be), SkBits2Float(0xc1830d0f));
@@ -3913,7 +3913,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x429fb179), SkBits2Float(0xc1b54988));
path.cubicTo(SkBits2Float(0x42a1a632), SkBits2Float(0xc199b837), SkBits2Float(0x42a3282f), SkBits2Float(0xc17b594e), SkBits2Float(0x42a43501), SkBits2Float(0xc142a7ba));
path.lineTo(SkBits2Float(0x426d6865), SkBits2Float(0xc10cb6f0));
@@ -3928,7 +3928,7 @@
static void battleOp147(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x421472e7), SkBits2Float(0xc2a60000), SkBits2Float(0x428b6da4), SkBits2Float(0xc26973d8), SkBits2Float(0x429fb179), SkBits2Float(0xc1b54988));
@@ -3941,7 +3941,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a43502), SkBits2Float(0xc142a7bb));
path.cubicTo(SkBits2Float(0x42ace9b0), SkBits2Float(0x4189ae79), SkBits2Float(0x429590d6), SkBits2Float(0x423ab1c1), SkBits2Float(0x424df762), SkBits2Float(0x428231a6));
path.cubicTo(SkBits2Float(0x41e19a31), SkBits2Float(0x42a70a69), SkBits2Float(0xc04a3289), SkBits2Float(0x42b03133), SkBits2Float(0xc1f5f36e), SkBits2Float(0x429a3139));
@@ -3958,7 +3958,7 @@
static void battleOp148(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42216831), SkBits2Float(0xc2a60000), SkBits2Float(0x4295b6bc), SkBits2Float(0xc257ea44), SkBits2Float(0x42a38b53), SkBits2Float(0xc1639572));
path.lineTo(SkBits2Float(0x426c7311), SkBits2Float(0xc12484b9));
@@ -3968,7 +3968,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a38b52), SkBits2Float(0xc1639578));
path.cubicTo(SkBits2Float(0x42a4def8), SkBits2Float(0xc1269090), SkBits2Float(0x42a5a99a), SkBits2Float(0xc0d1c16f), SkBits2Float(0x42a5e9be), SkBits2Float(0xc02be63c));
path.lineTo(SkBits2Float(0x426fdfd2), SkBits2Float(0xbff8877d));
@@ -3983,7 +3983,7 @@
static void battleOp149(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42216831), SkBits2Float(0xc2a60000), SkBits2Float(0x4295b6bc), SkBits2Float(0xc257ea44), SkBits2Float(0x42a38b52), SkBits2Float(0xc1639578));
@@ -3993,7 +3993,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a5e9be), SkBits2Float(0xc02be63f));
path.cubicTo(SkBits2Float(0x42a7ff8e), SkBits2Float(0x41ec1faa), SkBits2Float(0x42849fff), SkBits2Float(0x426da4e1), SkBits2Float(0x4216595b), SkBits2Float(0x429400af));
path.cubicTo(SkBits2Float(0x410dcade), SkBits2Float(0x42b12eec), SkBits2Float(0xc1cdb135), SkBits2Float(0x42aa7b1c), SkBits2Float(0xc24c6646), SkBits2Float(0x4282cf52));
@@ -4010,7 +4010,7 @@
static void battleOp150(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x422dab0f), SkBits2Float(0xc2a5ffff), SkBits2Float(0x429efeec), SkBits2Float(0xc2462810), SkBits2Float(0x42a58789), SkBits2Float(0xc0c7d837));
path.lineTo(SkBits2Float(0x426f51d5), SkBits2Float(0xc0907750));
@@ -4020,7 +4020,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a58789), SkBits2Float(0xc0c7d840));
path.cubicTo(SkBits2Float(0x42a626ff), SkBits2Float(0xc0078454), SkBits2Float(0x42a62824), SkBits2Float(0x4001c6d5), SkBits2Float(0x42a58af5), SkBits2Float(0x40c4fc3c));
path.lineTo(SkBits2Float(0x426f56ca), SkBits2Float(0x408e6626));
@@ -4035,7 +4035,7 @@
static void battleOp151(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3637fea5), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x422dab0f), SkBits2Float(0xc2a60000), SkBits2Float(0x429efeec), SkBits2Float(0xc2462811), SkBits2Float(0x42a58789), SkBits2Float(0xc0c7d840));
@@ -4049,7 +4049,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a58af6), SkBits2Float(0x40c4fc3d));
path.cubicTo(SkBits2Float(0x42a06986), SkBits2Float(0x422298c3), SkBits2Float(0x42621341), SkBits2Float(0x428bdf10), SkBits2Float(0x41ba9762), SkBits2Float(0x429f4f99));
path.cubicTo(SkBits2Float(0xc11def80), SkBits2Float(0x42b2c022), SkBits2Float(0xc236745f), SkBits2Float(0x429afb1c), SkBits2Float(0xc284c1e2), SkBits2Float(0x4247504a));
@@ -4066,7 +4066,7 @@
static void battleOp152(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41b12ed4), SkBits2Float(0xc2a60000), SkBits2Float(0x422d822c), SkBits2Float(0xc2944bde), SkBits2Float(0x426bdb91), SkBits2Float(0xc269a7f3));
path.cubicTo(SkBits2Float(0x42951a7b), SkBits2Float(0xc22ab829), SkBits2Float(0x42a66879), SkBits2Float(0xc1aaf2b1), SkBits2Float(0x42a5fe21), SkBits2Float(0x3f4744a4));
@@ -4078,7 +4078,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a5fe22), SkBits2Float(0x3f4744a1));
path.cubicTo(SkBits2Float(0x42a5e921), SkBits2Float(0x40a4df91), SkBits2Float(0x42a52322), SkBits2Float(0x411841f7), SkBits2Float(0x42a3adfe), SkBits2Float(0x415d43d0));
path.lineTo(SkBits2Float(0x426ca531), SkBits2Float(0x411ff355));
@@ -4093,7 +4093,7 @@
static void battleOp153(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41b12ed4), SkBits2Float(0xc2a60000), SkBits2Float(0x422d822c), SkBits2Float(0xc2944bde), SkBits2Float(0x426bdb91), SkBits2Float(0xc269a7f3));
@@ -4105,7 +4105,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a3adfe), SkBits2Float(0x415d43d0));
path.cubicTo(SkBits2Float(0x42977493), SkBits2Float(0x42480062), SkBits2Float(0x423a617c), SkBits2Float(0x429bbd03), SkBits2Float(0x4123044a), SkBits2Float(0x42a4be9a));
path.cubicTo(SkBits2Float(0xc1d1beaf), SkBits2Float(0x42adc030), SkBits2Float(0xc2750d30), SkBits2Float(0x4285e3a3), SkBits2Float(0xc2980208), SkBits2Float(0x42056911));
@@ -4122,7 +4122,7 @@
static void battleOp154(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41bb5603), SkBits2Float(0xc2a60000), SkBits2Float(0x4236fa4e), SkBits2Float(0xc2923760), SkBits2Float(0x4275e892), SkBits2Float(0xc25f0dc8));
path.cubicTo(SkBits2Float(0x429a6b6b), SkBits2Float(0xc219acd0), SkBits2Float(0x42a9c473), SkBits2Float(0xc173c3a6), SkBits2Float(0x42a5369d), SkBits2Float(0x410121d8));
@@ -4134,7 +4134,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a5369e), SkBits2Float(0x410121d6));
path.cubicTo(SkBits2Float(0x42a450b5), SkBits2Float(0x414aab85), SkBits2Float(0x42a2a6cd), SkBits2Float(0x4189bd6e), SkBits2Float(0x42a03d57), SkBits2Float(0x41ad66e6));
path.lineTo(SkBits2Float(0x4267abf7), SkBits2Float(0x417ab39f));
@@ -4149,7 +4149,7 @@
static void battleOp155(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41bb5603), SkBits2Float(0xc2a60000), SkBits2Float(0x4236fa4e), SkBits2Float(0xc2923760), SkBits2Float(0x4275e892), SkBits2Float(0xc25f0dc8));
@@ -4164,7 +4164,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a03d58), SkBits2Float(0x41ad66e7));
path.cubicTo(SkBits2Float(0x428bedd4), SkBits2Float(0x426cda0a), SkBits2Float(0x420c6f35), SkBits2Float(0x42a955c4), SkBits2Float(0xc06f4c79), SkBits2Float(0x42a5d4d6));
path.cubicTo(SkBits2Float(0xc22a58c2), SkBits2Float(0x42a253e8), SkBits2Float(0xc2960525), SkBits2Float(0x4252b394), SkBits2Float(0xc2a37db3), SkBits2Float(0x41660422));
@@ -4181,7 +4181,7 @@
static void battleOp156(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41c3ae1a), SkBits2Float(0xc2a60000), SkBits2Float(0x423eb2d3), SkBits2Float(0xc2906c00), SkBits2Float(0x427dc7c2), SkBits2Float(0xc2560e13));
path.cubicTo(SkBits2Float(0x429e6e58), SkBits2Float(0xc20b4426), SkBits2Float(0x42abdf2b), SkBits2Float(0xc121d7a7), SkBits2Float(0x42a39f93), SkBits2Float(0x415fea21));
@@ -4193,7 +4193,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a39f93), SkBits2Float(0x415fea20));
path.cubicTo(SkBits2Float(0x42a1ffad), SkBits2Float(0x4195f252), SkBits2Float(0x429f8ce1), SkBits2Float(0x41bb4c45), SkBits2Float(0x429c4e4c), SkBits2Float(0x41df969a));
path.lineTo(SkBits2Float(0x4261fbff), SkBits2Float(0x41a1a14e));
@@ -4208,7 +4208,7 @@
static void battleOp157(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41c3ae1a), SkBits2Float(0xc2a60000), SkBits2Float(0x423eb2d3), SkBits2Float(0xc2906c00), SkBits2Float(0x427dc7c2), SkBits2Float(0xc2560e13));
@@ -4224,7 +4224,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x429c4e4c), SkBits2Float(0x41df969b));
path.cubicTo(SkBits2Float(0x4280e391), SkBits2Float(0x4284903f), SkBits2Float(0x41c7a851), SkBits2Float(0x42b2072e), SkBits2Float(0xc1713833), SkBits2Float(0x42a33d14));
path.cubicTo(SkBits2Float(0xc25c7040), SkBits2Float(0x429472fb), SkBits2Float(0xc2a7bda2), SkBits2Float(0x421b8b2e), SkBits2Float(0xc2a5f5d6), SkBits2Float(0xbfe85110));
@@ -4241,7 +4241,7 @@
static void battleOp158(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41cb677f), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4245cb36), SkBits2Float(0xc28eb15b), SkBits2Float(0x42825fc2), SkBits2Float(0xc24d8299));
path.cubicTo(SkBits2Float(0x42a1d9e8), SkBits2Float(0xc1fb44f8), SkBits2Float(0x42ad4967), SkBits2Float(0xc0aa7cf8), SkBits2Float(0x42a1679f), SkBits2Float(0x419b26cf));
@@ -4253,7 +4253,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a1679f), SkBits2Float(0x419b26d0));
path.cubicTo(SkBits2Float(0x429f113c), SkBits2Float(0x41c20ede), SkBits2Float(0x429bdafe), SkBits2Float(0x41e80a2e), SkBits2Float(0x4297ceee), SkBits2Float(0x42065107));
path.lineTo(SkBits2Float(0x425b7b5f), SkBits2Float(0x41c2314a));
@@ -4268,7 +4268,7 @@
static void battleOp159(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41cb677f), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4245cb36), SkBits2Float(0xc28eb15b), SkBits2Float(0x42825fc2), SkBits2Float(0xc24d8299));
@@ -4282,7 +4282,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4297ceef), SkBits2Float(0x42065107));
path.cubicTo(SkBits2Float(0x426afc81), SkBits2Float(0x4290b9e3), SkBits2Float(0x4171c53f), SkBits2Float(0x42b7f2c1), SkBits2Float(0xc1ca446b), SkBits2Float(0x429e1c54));
path.cubicTo(SkBits2Float(0xc2835add), SkBits2Float(0x428445e8), SkBits2Float(0xc2b3ab9e), SkBits2Float(0x41c6c009), SkBits2Float(0xc2a29b10), SkBits2Float(0xc18596e4));
@@ -4299,7 +4299,7 @@
static void battleOp160(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41d3ccce), SkBits2Float(0xc2a5ffff), SkBits2Float(0x424d7252), SkBits2Float(0xc28cbd55), SkBits2Float(0x4285fbcc), SkBits2Float(0xc244010c));
path.cubicTo(SkBits2Float(0x42a53e6e), SkBits2Float(0xc1dd0edd), SkBits2Float(0x42ae3d82), SkBits2Float(0xbdb630d0), SkBits2Float(0x429e3366), SkBits2Float(0x41c92323));
@@ -4311,7 +4311,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x429e3367), SkBits2Float(0x41c92322));
path.cubicTo(SkBits2Float(0x429b0cbc), SkBits2Float(0x41f0ca9b), SkBits2Float(0x4296f94f), SkBits2Float(0x420b9629), SkBits2Float(0x429206e2), SkBits2Float(0x421de34f));
path.lineTo(SkBits2Float(0x42531f8a), SkBits2Float(0x41e4458f));
@@ -4326,7 +4326,7 @@
static void battleOp161(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb630015b), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41d3ccce), SkBits2Float(0xc2a5ffff), SkBits2Float(0x424d7252), SkBits2Float(0xc28cbd55), SkBits2Float(0x4285fbcc), SkBits2Float(0xc244010c));
@@ -4340,7 +4340,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x429206e2), SkBits2Float(0x421de34f));
path.cubicTo(SkBits2Float(0x424fd7be), SkBits2Float(0x429cd433), SkBits2Float(0x40819da9), SkBits2Float(0x42bbf605), SkBits2Float(0xc20f7b98), SkBits2Float(0x4295b271));
path.cubicTo(SkBits2Float(0xc2979573), SkBits2Float(0x425eddba), SkBits2Float(0xc2bb57fe), SkBits2Float(0x4109ef62), SkBits2Float(0xc2990315), SkBits2Float(0xc200bcbb));
@@ -4357,7 +4357,7 @@
static void battleOp162(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41da3d7f), SkBits2Float(0xc2a60000), SkBits2Float(0x425345ee), SkBits2Float(0xc28b3082), SkBits2Float(0x4288a01b), SkBits2Float(0xc23c9177));
path.cubicTo(SkBits2Float(0x42a79d3f), SkBits2Float(0xc1c583d9), SkBits2Float(0x42ae8eeb), SkBits2Float(0x407c6461), SkBits2Float(0x429b333a), SkBits2Float(0x41eb9731));
@@ -4369,7 +4369,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x429b3339), SkBits2Float(0x41eb9733));
path.cubicTo(SkBits2Float(0x429766b3), SkBits2Float(0x4209d0f3), SkBits2Float(0x4292a485), SkBits2Float(0x421d0e17), SkBits2Float(0x428cfdb5), SkBits2Float(0x422f3e33));
path.lineTo(SkBits2Float(0x424bd7ac), SkBits2Float(0x41fd5d06));
@@ -4384,7 +4384,7 @@
static void battleOp163(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3697ff52), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41da3d7f), SkBits2Float(0xc2a60000), SkBits2Float(0x425345ee), SkBits2Float(0xc28b3082), SkBits2Float(0x4288a01b), SkBits2Float(0xc23c9177));
@@ -4398,7 +4398,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x428cfdb5), SkBits2Float(0x422f3e36));
path.cubicTo(SkBits2Float(0x42397b9c), SkBits2Float(0x42a54202), SkBits2Float(0xc0931849), SkBits2Float(0x42bd474f), SkBits2Float(0xc22e0fe8), SkBits2Float(0x428d5ab7));
path.cubicTo(SkBits2Float(0xc2a4de63), SkBits2Float(0x423adc3f), SkBits2Float(0xc2bd50df), SkBits2Float(0xc08673c0), SkBits2Float(0xc28db7cd), SkBits2Float(0xc22ce1b4));
@@ -4415,7 +4415,7 @@
static void battleOp164(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41e183ec), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4259cec4), SkBits2Float(0xc2896274), SkBits2Float(0x428b79bc), SkBits2Float(0xc2340753));
path.cubicTo(SkBits2Float(0x42aa0c16), SkBits2Float(0xc1aa937d), SkBits2Float(0x42ae7c71), SkBits2Float(0x41080a55), SkBits2Float(0x42974339), SkBits2Float(0x4208c1d5));
@@ -4427,7 +4427,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42974339), SkBits2Float(0x4208c1d6));
path.cubicTo(SkBits2Float(0x4292b5f8), SkBits2Float(0x421ce537), SkBits2Float(0x428d2a3f), SkBits2Float(0x42301305), SkBits2Float(0x4286b52e), SkBits2Float(0x4242022c));
path.lineTo(SkBits2Float(0x4242c218), SkBits2Float(0x420c3f43));
@@ -4442,7 +4442,7 @@
static void battleOp165(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3725ffa9), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41e183ec), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4259cec4), SkBits2Float(0xc2896274), SkBits2Float(0x428b79bc), SkBits2Float(0xc2340753));
@@ -4456,7 +4456,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4286b52e), SkBits2Float(0x4242022d));
path.cubicTo(SkBits2Float(0x4245f9c6), SkBits2Float(0x42929b97), SkBits2Float(0x419b96e9), SkBits2Float(0x42ac9135), SkBits2Float(0xc12da222), SkBits2Float(0x42a4933a));
path.cubicTo(SkBits2Float(0xc2249c85), SkBits2Float(0x429c9540), SkBits2Float(0xc2859c99), SkBits2Float(0x4267dd85), SkBits2Float(0xc29b4028), SkBits2Float(0x41eb0f05));
@@ -4475,7 +4475,7 @@
static void battleOp166(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41e5cd16), SkBits2Float(0xc2a60000), SkBits2Float(0x425da203), SkBits2Float(0xc2884b73), SkBits2Float(0x428d165b), SkBits2Float(0xc22eeec9));
path.cubicTo(SkBits2Float(0x42ab5bb4), SkBits2Float(0xc19a8d5b), SkBits2Float(0x42ae3add), SkBits2Float(0x4132f7c2), SkBits2Float(0x4294adf4), SkBits2Float(0x4213a75b));
@@ -4487,7 +4487,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4294adf4), SkBits2Float(0x4213a75b));
path.cubicTo(SkBits2Float(0x428facea), SkBits2Float(0x4227cf1b), SkBits2Float(0x4289a8e5), SkBits2Float(0x423ae500), SkBits2Float(0x4282b9a7), SkBits2Float(0x424c9dab));
path.lineTo(SkBits2Float(0x423d0015), SkBits2Float(0x4213ea45));
@@ -4502,7 +4502,7 @@
static void battleOp167(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb7060057), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41e5cd16), SkBits2Float(0xc2a60000), SkBits2Float(0x425da203), SkBits2Float(0xc2884b73), SkBits2Float(0x428d165b), SkBits2Float(0xc22eeec9));
@@ -4516,7 +4516,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4282b9a8), SkBits2Float(0x424c9dac));
path.cubicTo(SkBits2Float(0x4238a98e), SkBits2Float(0x42975dcd), SkBits2Float(0x416d9db4), SkBits2Float(0x42aecc7f), SkBits2Float(0xc17bb856), SkBits2Float(0x42a2fd9a));
path.cubicTo(SkBits2Float(0xc2394396), SkBits2Float(0x42972eb6), SkBits2Float(0xc28e09e8), SkBits2Float(0x42543e5a), SkBits2Float(0xc29f69c3), SkBits2Float(0x41b9307a));
@@ -4535,7 +4535,7 @@
static void battleOp168(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41ea54b9), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4261a7de), SkBits2Float(0xc2871f16), SkBits2Float(0x428ebc81), SkBits2Float(0xc2297f4d));
path.cubicTo(SkBits2Float(0x42aca513), SkBits2Float(0xc18980da), SkBits2Float(0x42adc9a4), SkBits2Float(0x41604127), SkBits2Float(0x4291be57), SkBits2Float(0x421eee87));
@@ -4547,7 +4547,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4291be57), SkBits2Float(0x421eee8a));
path.cubicTo(SkBits2Float(0x428c4169), SkBits2Float(0x42330feb), SkBits2Float(0x4285bd57), SkBits2Float(0x4246005c), SkBits2Float(0x427c99ac), SkBits2Float(0x4257723d));
path.lineTo(SkBits2Float(0x42369a46), SkBits2Float(0x421bbe89));
@@ -4562,7 +4562,7 @@
static void battleOp169(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3725ffa9), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41ea54b9), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4261a7de), SkBits2Float(0xc2871f16), SkBits2Float(0x428ebc81), SkBits2Float(0xc2297f4d));
@@ -4576,7 +4576,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x427c99ad), SkBits2Float(0x4257723e));
path.cubicTo(SkBits2Float(0x422a2459), SkBits2Float(0x429c0ff6), SkBits2Float(0x411ef0c1), SkBits2Float(0x42b0a109), SkBits2Float(0xc1a68a7f), SkBits2Float(0x42a0b1a2));
path.cubicTo(SkBits2Float(0xc24e46af), SkBits2Float(0x4290c23b), SkBits2Float(0xc296269a), SkBits2Float(0x423e3c04), SkBits2Float(0xc2a2b82b), SkBits2Float(0x41835b51));
@@ -4595,7 +4595,7 @@
static void battleOp170(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41ef3488), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4265f5fc), SkBits2Float(0xc285d5a4), SkBits2Float(0x429072a6), SkBits2Float(0xc2239841));
path.cubicTo(SkBits2Float(0x42adea4e), SkBits2Float(0xc16e14e5), SkBits2Float(0x42ad1da2), SkBits2Float(0x41886b20), SkBits2Float(0x428e5adb), SkBits2Float(0x422ac68e));
@@ -4607,7 +4607,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x428e5adb), SkBits2Float(0x422ac690));
path.cubicTo(SkBits2Float(0x42885732), SkBits2Float(0x423ed443), SkBits2Float(0x428148a8), SkBits2Float(0x42518e43), SkBits2Float(0x42729aa0), SkBits2Float(0x4262a4bd));
path.lineTo(SkBits2Float(0x422f605c), SkBits2Float(0x4223d6b5));
@@ -4622,7 +4622,7 @@
static void battleOp171(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3637fea5), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41ef3488), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4265f5fc), SkBits2Float(0xc285d5a4), SkBits2Float(0x429072a6), SkBits2Float(0xc2239841));
@@ -4636,7 +4636,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42729aa1), SkBits2Float(0x4262a4be));
path.cubicTo(SkBits2Float(0x421a0aa1), SkBits2Float(0x42a0b8ab), SkBits2Float(0x4092ff14), SkBits2Float(0x42b1fc82), SkBits2Float(0xc1d17709), SkBits2Float(0x429d861f));
path.cubicTo(SkBits2Float(0xc263d6eb), SkBits2Float(0x42890fbc), SkBits2Float(0xc29dea71), SkBits2Float(0x42253dbf), SkBits2Float(0xc2a5016a), SkBits2Float(0x4111261a));
@@ -4655,7 +4655,7 @@
static void battleOp172(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41f30c96), SkBits2Float(0xc2a60000), SkBits2Float(0x426956a5), SkBits2Float(0xc284cd4a), SkBits2Float(0x4291c05e), SkBits2Float(0xc21ee718));
path.cubicTo(SkBits2Float(0x42aed56a), SkBits2Float(0xc150ce71), SkBits2Float(0x42ac7181), SkBits2Float(0x419b8107), SkBits2Float(0x428b8516), SkBits2Float(0x4233e422));
@@ -4667,7 +4667,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x428b8516), SkBits2Float(0x4233e422));
path.cubicTo(SkBits2Float(0x4285165c), SkBits2Float(0x4247d8d0), SkBits2Float(0x427b34bd), SkBits2Float(0x425a5d74), SkBits2Float(0x426a6401), SkBits2Float(0x426b20b1));
path.lineTo(SkBits2Float(0x42297063), SkBits2Float(0x4229f8c9));
@@ -4682,7 +4682,7 @@
static void battleOp173(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41f30c96), SkBits2Float(0xc2a60000), SkBits2Float(0x426956a5), SkBits2Float(0xc284cd4a), SkBits2Float(0x4291c05e), SkBits2Float(0xc21ee718));
@@ -4697,7 +4697,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x426a6401), SkBits2Float(0x426b20b0));
path.cubicTo(SkBits2Float(0x420d0644), SkBits2Float(0x42a419c2), SkBits2Float(0x3eb79d8f), SkBits2Float(0x42b29b69), SkBits2Float(0xc1f292a7), SkBits2Float(0x429a86c6));
path.cubicTo(SkBits2Float(0xc27401e4), SkBits2Float(0x42827223), SkBits2Float(0xc2a34d81), SkBits2Float(0x4210aea0), SkBits2Float(0xc2a5dfaf), SkBits2Float(0x404f3106));
@@ -4716,7 +4716,7 @@
static void battleOp174(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41f67553), SkBits2Float(0xc2a5ffff), SkBits2Float(0x426c5214), SkBits2Float(0xc283df7d), SkBits2Float(0x4292df93), SkBits2Float(0xc21ab724));
path.cubicTo(SkBits2Float(0x42af961c), SkBits2Float(0xc136bd38), SkBits2Float(0x42abbe10), SkBits2Float(0x41ac5dd5), SkBits2Float(0x4288e395), SkBits2Float(0x423bcd53));
@@ -4728,7 +4728,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4288e396), SkBits2Float(0x423bcd52));
path.cubicTo(SkBits2Float(0x42821571), SkBits2Float(0x424fa4b8), SkBits2Float(0x427470be), SkBits2Float(0x4261f24c), SkBits2Float(0x4262dfb6), SkBits2Float(0x4272637b));
path.lineTo(SkBits2Float(0x42240156), SkBits2Float(0x422f387f));
@@ -4743,7 +4743,7 @@
static void battleOp175(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41f67553), SkBits2Float(0xc2a5ffff), SkBits2Float(0x426c5214), SkBits2Float(0xc283df7d), SkBits2Float(0x4292df93), SkBits2Float(0xc21ab724));
@@ -4758,7 +4758,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4262dfb7), SkBits2Float(0x4272637c));
path.cubicTo(SkBits2Float(0x4201435c), SkBits2Float(0x42a6e035), SkBits2Float(0xc05a052a), SkBits2Float(0x42b2d330), SkBits2Float(0xc207a774), SkBits2Float(0x429782c3));
path.cubicTo(SkBits2Float(0xc280d74a), SkBits2Float(0x427864aa), SkBits2Float(0xc2a78489), SkBits2Float(0x41fbcc10), SkBits2Float(0xc2a5f467), SkBits2Float(0xbff86670));
@@ -4777,7 +4777,7 @@
static void battleOp176(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41f9cdf3), SkBits2Float(0xc2a5ffff), SkBits2Float(0x426f3c43), SkBits2Float(0xc282f30b), SkBits2Float(0x4293f176), SkBits2Float(0xc2169536));
path.cubicTo(SkBits2Float(0x42b044ca), SkBits2Float(0xc11d115b), SkBits2Float(0x42aaf59e), SkBits2Float(0x41bcd986), SkBits2Float(0x428633ff), SkBits2Float(0x42436703));
@@ -4789,7 +4789,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x428633ff), SkBits2Float(0x42436705));
path.cubicTo(SkBits2Float(0x427e0fd0), SkBits2Float(0x42571b29), SkBits2Float(0x426d975d), SkBits2Float(0x42692b9b), SkBits2Float(0x425b4ae0), SkBits2Float(0x427944c1));
path.lineTo(SkBits2Float(0x421e8652), SkBits2Float(0x423431b3));
@@ -4804,7 +4804,7 @@
static void battleOp177(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3743ffa9), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41f9cdf3), SkBits2Float(0xc2a5ffff), SkBits2Float(0x426f3c43), SkBits2Float(0xc282f30b), SkBits2Float(0x4293f176), SkBits2Float(0xc2169536));
@@ -4818,7 +4818,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x425b4ae0), SkBits2Float(0x427944c0));
path.cubicTo(SkBits2Float(0x41eb12b8), SkBits2Float(0x42a964d5), SkBits2Float(0xc0e3546a), SkBits2Float(0x42b2bc1c), SkBits2Float(0xc2157060), SkBits2Float(0x42943ba4));
path.cubicTo(SkBits2Float(0xc2873b19), SkBits2Float(0x426b7658), SkBits2Float(0xc2ab209f), SkBits2Float(0x41d60b1d), SkBits2Float(0xc2a5685b), SkBits2Float(0xc0e02f3c));
@@ -4837,7 +4837,7 @@
static void battleOp178(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41fc5f30), SkBits2Float(0xc2a5fffe), SkBits2Float(0x427176a0), SkBits2Float(0xc2823b95), SkBits2Float(0x4294be35), SkBits2Float(0xc21365c9));
path.cubicTo(SkBits2Float(0x42b0c118), SkBits2Float(0xc1095198), SkBits2Float(0x42aa4b8f), SkBits2Float(0x41c9721a), SkBits2Float(0x42841312), SkBits2Float(0x42491ec0));
@@ -4849,7 +4849,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42841313), SkBits2Float(0x42491ebf));
path.cubicTo(SkBits2Float(0x42793d8e), SkBits2Float(0x425cb36e), SkBits2Float(0x4268336d), SkBits2Float(0x426e9032), SkBits2Float(0x4255582b), SkBits2Float(0x427e60c5));
path.lineTo(SkBits2Float(0x421a3990), SkBits2Float(0x4237e342));
@@ -4864,7 +4864,7 @@
static void battleOp179(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb7060057), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41fc5f30), SkBits2Float(0xc2a5fffe), SkBits2Float(0x427176a0), SkBits2Float(0xc2823b95), SkBits2Float(0x4294be35), SkBits2Float(0xc21365c9));
@@ -4878,7 +4878,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4255582a), SkBits2Float(0x427e60c6));
path.cubicTo(SkBits2Float(0x41d8da26), SkBits2Float(0x42ab2f9f), SkBits2Float(0xc11f0392), SkBits2Float(0x42b2763a), SkBits2Float(0xc21fc8f1), SkBits2Float(0x4291829a));
path.cubicTo(SkBits2Float(0xc28be87e), SkBits2Float(0x42611df4), SkBits2Float(0xc2ad8941), SkBits2Float(0x41b88f93), SkBits2Float(0xc2a49219), SkBits2Float(0xc12de56c));
@@ -4897,7 +4897,7 @@
static void battleOp180(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41fed5d1), SkBits2Float(0xc2a60000), SkBits2Float(0x4273981d), SkBits2Float(0xc28189e8), SkBits2Float(0x42957e40), SkBits2Float(0xc210547e));
path.cubicTo(SkBits2Float(0x42b13073), SkBits2Float(0xc0eca961), SkBits2Float(0x42a99b35), SkBits2Float(0x41d57c6c), SkBits2Float(0x4281fa62), SkBits2Float(0x424e82d3));
@@ -4909,7 +4909,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4281fa62), SkBits2Float(0x424e82d5));
path.cubicTo(SkBits2Float(0x4274817d), SkBits2Float(0x4261f5b7), SkBits2Float(0x4262ebfa), SkBits2Float(0x42739d02), SkBits2Float(0x424f88b8), SkBits2Float(0x428191ef));
path.lineTo(SkBits2Float(0x4216064f), SkBits2Float(0x423b5489));
@@ -4924,7 +4924,7 @@
static void battleOp181(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb7060057), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41fed5d1), SkBits2Float(0xc2a60000), SkBits2Float(0x4273981d), SkBits2Float(0xc28189e8), SkBits2Float(0x42957e40), SkBits2Float(0xc210547e));
@@ -4938,7 +4938,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x424f88ba), SkBits2Float(0x428191f0));
path.cubicTo(SkBits2Float(0x41c732b7), SkBits2Float(0x42acca52), SkBits2Float(0xc14a7268), SkBits2Float(0x42b208b4), SkBits2Float(0xc22982dc), SkBits2Float(0x428ebb75));
path.cubicTo(SkBits2Float(0xc2903490), SkBits2Float(0x4256dc6c), SkBits2Float(0xc2af8c6f), SkBits2Float(0x419be833), SkBits2Float(0xc2a36e37), SkBits2Float(0xc168c0a6));
@@ -4957,7 +4957,7 @@
static void battleOp182(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x420048ef), SkBits2Float(0xc2a60000), SkBits2Float(0x4275172d), SkBits2Float(0xc2810bd2), SkBits2Float(0x429602e3), SkBits2Float(0xc20e29dc));
path.cubicTo(SkBits2Float(0x42b17a30), SkBits2Float(0xc0d1e0a1), SkBits2Float(0x42a9174e), SkBits2Float(0x41ddef9e), SkBits2Float(0x4280787d), SkBits2Float(0x4252400e));
@@ -4969,7 +4969,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4280787d), SkBits2Float(0x42524010));
path.cubicTo(SkBits2Float(0x42711c0e), SkBits2Float(0x42659909), SkBits2Float(0x425f24ad), SkBits2Float(0x42771864), SkBits2Float(0x424b624a), SkBits2Float(0x4283347a));
path.lineTo(SkBits2Float(0x42130648), SkBits2Float(0x423db1a5));
@@ -4984,7 +4984,7 @@
static void battleOp183(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x36d3ff52), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x420048ef), SkBits2Float(0xc2a60000), SkBits2Float(0x4275172d), SkBits2Float(0xc2810bd2), SkBits2Float(0x429602e3), SkBits2Float(0xc20e29dc));
@@ -4998,7 +4998,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x424b624a), SkBits2Float(0x42833479));
path.cubicTo(SkBits2Float(0x41baac2f), SkBits2Float(0x42adda12), SkBits2Float(0xc168f6a7), SkBits2Float(0x42b1a2b3), SkBits2Float(0xc2303c92), SkBits2Float(0x428cae5c));
path.cubicTo(SkBits2Float(0xc2931dbe), SkBits2Float(0x424f7409), SkBits2Float(0xc2b0c9d8), SkBits2Float(0x41878abe), SkBits2Float(0xc2a26e7f), SkBits2Float(0xc188ef9a));
@@ -5017,7 +5017,7 @@
static void battleOp184(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42011b87), SkBits2Float(0xc2a5fffe), SkBits2Float(0x427681ab), SkBits2Float(0xc280937a), SkBits2Float(0x42967eb3), SkBits2Float(0xc20c1a94));
path.cubicTo(SkBits2Float(0x42b1bc91), SkBits2Float(0xc0b87191), SkBits2Float(0x42a89454), SkBits2Float(0x41e5ed6f), SkBits2Float(0x427e0902), SkBits2Float(0x4255c0a2));
@@ -5029,7 +5029,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x427e0901), SkBits2Float(0x4255c0a4));
path.cubicTo(SkBits2Float(0x426dd77c), SkBits2Float(0x4268ff65), SkBits2Float(0x425b838b), SkBits2Float(0x427a571f), SkBits2Float(0x42476779), SkBits2Float(0x4284b92f));
path.lineTo(SkBits2Float(0x421025c9), SkBits2Float(0x423fe3a3));
@@ -5044,7 +5044,7 @@
static void battleOp185(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42011b87), SkBits2Float(0xc2a5fffe), SkBits2Float(0x427681ab), SkBits2Float(0xc280937a), SkBits2Float(0x42967eb3), SkBits2Float(0xc20c1a94));
@@ -5060,7 +5060,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42476779), SkBits2Float(0x4284b92f));
path.cubicTo(SkBits2Float(0x41aeb99d), SkBits2Float(0x42aece6d), SkBits2Float(0xc182ebc7), SkBits2Float(0x42b12f04), SkBits2Float(0xc236847b), SkBits2Float(0x428aaa1d));
path.cubicTo(SkBits2Float(0xc295c989), SkBits2Float(0x42484a6d), SkBits2Float(0xc2b1d401), SkBits2Float(0x41683386), SkBits2Float(0xc2a15607), SkBits2Float(0xc19c4a77));
@@ -5079,7 +5079,7 @@
static void battleOp186(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4201bd60), SkBits2Float(0xc2a5ffff), SkBits2Float(0x427797bb), SkBits2Float(0xc2803682), SkBits2Float(0x4296dc8c), SkBits2Float(0xc20a848f));
path.cubicTo(SkBits2Float(0x42b1ed3b), SkBits2Float(0xc0a4e0c3), SkBits2Float(0x42a82bcd), SkBits2Float(0x41ec0db8), SkBits2Float(0x427bc56e), SkBits2Float(0x42586a20));
@@ -5091,7 +5091,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x427bc56c), SkBits2Float(0x42586a22));
path.cubicTo(SkBits2Float(0x426b4cc6), SkBits2Float(0x426b93ad), SkBits2Float(0x4258b1e1), SkBits2Float(0x427ccbca), SkBits2Float(0x42445140), SkBits2Float(0x4285de6e));
path.lineTo(SkBits2Float(0x420dea8b), SkBits2Float(0x42418b9b));
@@ -5106,7 +5106,7 @@
static void battleOp187(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb69400ae), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4201bd60), SkBits2Float(0xc2a5ffff), SkBits2Float(0x427797bb), SkBits2Float(0xc2803682), SkBits2Float(0x4296dc8c), SkBits2Float(0xc20a848f));
@@ -5124,7 +5124,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42445140), SkBits2Float(0x4285de6e));
path.cubicTo(SkBits2Float(0x41a5801a), SkBits2Float(0x42af8153), SkBits2Float(0xc18dfe3b), SkBits2Float(0x42b0c99d), SkBits2Float(0xc23b472e), SkBits2Float(0x42891183));
path.cubicTo(SkBits2Float(0xc297c79f), SkBits2Float(0x4242b2d1), SkBits2Float(0xc2b28961), SkBits2Float(0x414a2ba6), SkBits2Float(0xc2a0659f), SkBits2Float(0xc1ab0f22));
@@ -5143,7 +5143,7 @@
static void battleOp188(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42025498), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42789b1b), SkBits2Float(0xc27fbe84), SkBits2Float(0x42973334), SkBits2Float(0xc2090897));
path.cubicTo(SkBits2Float(0x42b218da), SkBits2Float(0xc092954a), SkBits2Float(0x42a7c71a), SkBits2Float(0x41f1c3b5), SkBits2Float(0x4279a1de), SkBits2Float(0x425ae0d9));
@@ -5155,7 +5155,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4279a1de), SkBits2Float(0x425ae0d9));
path.cubicTo(SkBits2Float(0x4268e6ce), SkBits2Float(0x426df5b7), SkBits2Float(0x425609c8), SkBits2Float(0x427f0f64), SkBits2Float(0x42416967), SkBits2Float(0x4286ec0f));
path.lineTo(SkBits2Float(0x420bd0d2), SkBits2Float(0x42431170));
@@ -5170,7 +5170,7 @@
static void battleOp189(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb7240057), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42025498), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42789b1b), SkBits2Float(0xc27fbe84), SkBits2Float(0x42973334), SkBits2Float(0xc2090897));
@@ -5185,7 +5185,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42416967), SkBits2Float(0x4286ec0f));
path.cubicTo(SkBits2Float(0x419cd99a), SkBits2Float(0x42b02173), SkBits2Float(0xc19850b8), SkBits2Float(0x42b06117), SkBits2Float(0xc23fac11), SkBits2Float(0x42878a96));
path.cubicTo(SkBits2Float(0xc29997e3), SkBits2Float(0x423d682a), SkBits2Float(0xc2b3208c), SkBits2Float(0x412e025f), SkBits2Float(0xc29f71a3), SkBits2Float(0xc1b8c415));
@@ -5204,7 +5204,7 @@
static void battleOp190(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4202b56e), SkBits2Float(0xc2a60000), SkBits2Float(0x427940ff), SkBits2Float(0xc27f4e67), SkBits2Float(0x42976a2d), SkBits2Float(0xc20814ff));
path.cubicTo(SkBits2Float(0x42b233da), SkBits2Float(0xc086dcb5), SkBits2Float(0x42a78518), SkBits2Float(0x41f56a27), SkBits2Float(0x42784037), SkBits2Float(0x425c71a4));
@@ -5216,7 +5216,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42784038), SkBits2Float(0x425c71a4));
path.cubicTo(SkBits2Float(0x42675aa4), SkBits2Float(0x426f78d5), SkBits2Float(0x4254535c), SkBits2Float(0x42803f48), SkBits2Float(0x423f8a54), SkBits2Float(0x4287967e));
path.lineTo(SkBits2Float(0x420a7682), SkBits2Float(0x424407da));
@@ -5231,7 +5231,7 @@
static void battleOp191(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3637fea5), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4202b56e), SkBits2Float(0xc2a60000), SkBits2Float(0x427940ff), SkBits2Float(0xc27f4e67), SkBits2Float(0x42976a2d), SkBits2Float(0xc20814ff));
@@ -5246,7 +5246,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423f8a55), SkBits2Float(0x4287967f));
path.cubicTo(SkBits2Float(0x41974ba2), SkBits2Float(0x42b0846d), SkBits2Float(0xc19ee9a3), SkBits2Float(0x42b01937), SkBits2Float(0xc2427547), SkBits2Float(0x42868bae));
path.cubicTo(SkBits2Float(0xc29abade), SkBits2Float(0x4239fc4c), SkBits2Float(0xc2b3780d), SkBits2Float(0x411bee16), SkBits2Float(0xc29ecbab), SkBits2Float(0xc1c17e4f));
@@ -5265,7 +5265,7 @@
static void battleOp192(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4202fa25), SkBits2Float(0xc2a60000), SkBits2Float(0x4279b699), SkBits2Float(0xc27efea4), SkBits2Float(0x429790ee), SkBits2Float(0xc20767f9));
path.cubicTo(SkBits2Float(0x42b24690), SkBits2Float(0xc07d14fa), SkBits2Float(0x42a75587), SkBits2Float(0x41f80076), SkBits2Float(0x427743d2), SkBits2Float(0x425d8c9b));
@@ -5277,7 +5277,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x427743d4), SkBits2Float(0x425d8c98));
path.cubicTo(SkBits2Float(0x4266401a), SkBits2Float(0x427089e5), SkBits2Float(0x42531ae2), SkBits2Float(0x4280c0a0), SkBits2Float(0x423e3514), SkBits2Float(0x42880e64));
path.lineTo(SkBits2Float(0x42097fd1), SkBits2Float(0x4244b531));
@@ -5291,7 +5291,7 @@
static void battleOp193(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e15a675), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3e95a67a), SkBits2Float(0xc2a5ffcd), SkBits2Float(0x3ee07980), SkBits2Float(0xc2a5ff68));
path.lineTo(SkBits2Float(0x3ea245bb), SkBits2Float(0xc26fff25));
@@ -5301,7 +5301,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3ee07a10), SkBits2Float(0xc2a5ff68));
path.cubicTo(SkBits2Float(0x3ee7f565), SkBits2Float(0xc2a5ff5d), SkBits2Float(0x3eef70d9), SkBits2Float(0xc2a5ff52), SkBits2Float(0x3ef6ec4d), SkBits2Float(0xc2a5ff47));
path.lineTo(SkBits2Float(0x3eb27fdb), SkBits2Float(0xc26ffef6));
@@ -5316,7 +5316,7 @@
static void battleOp194(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3691e768), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e15a675), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3e95a67a), SkBits2Float(0xc2a5ffcd), SkBits2Float(0x3ee07a10), SkBits2Float(0xc2a5ff68));
@@ -5328,7 +5328,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3ef6ec9b), SkBits2Float(0xc2a5ff48));
path.cubicTo(SkBits2Float(0x3f3816c9), SkBits2Float(0xc2a5fe94), SkBits2Float(0x3f74b6e1), SkBits2Float(0xc2a5fd5b), SkBits2Float(0x3f98ab0b), SkBits2Float(0xc2a5fb9d));
path.lineTo(SkBits2Float(0x3f5cb973), SkBits2Float(0xc26ff9a8));
@@ -5343,7 +5343,7 @@
static void battleOp195(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f0607d9), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3f860760), SkBits2Float(0xc2a5fd76), SkBits2Float(0x3fc90825), SkBits2Float(0xc2a5f863));
path.lineTo(SkBits2Float(0x3f9152f7), SkBits2Float(0xc26ff500));
@@ -5353,7 +5353,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3fc9081a), SkBits2Float(0xc2a5f864));
path.cubicTo(SkBits2Float(0x3fcfbb75), SkBits2Float(0xc2a5f7e2), SkBits2Float(0x3fd66eab), SkBits2Float(0xc2a5f75a), SkBits2Float(0x3fdd21d8), SkBits2Float(0xc2a5f6cb));
path.lineTo(SkBits2Float(0x3f9fdac0), SkBits2Float(0xc26ff2b1));
@@ -5368,14 +5368,14 @@
static void battleOp196(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x36a51f4a), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3f0607d1), SkBits2Float(0xc2a60000), SkBits2Float(0x3f860758), SkBits2Float(0xc2a5fd76), SkBits2Float(0x3fc9081a), SkBits2Float(0xc2a5f864));
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3fdd21ce), SkBits2Float(0xc2a5f6cb));
path.cubicTo(SkBits2Float(0x4024daa1), SkBits2Float(0xc2a5edc0), SkBits2Float(0x405b1f05), SkBits2Float(0xc2a5de0d), SkBits2Float(0x4088aca3), SkBits2Float(0xc2a5c7b3));
path.lineTo(SkBits2Float(0x40459a01), SkBits2Float(0xc26fae99));
@@ -5390,7 +5390,7 @@
static void battleOp197(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3fa0bd52), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4020babd), SkBits2Float(0xc2a5f168), SkBits2Float(0x40710446), SkBits2Float(0xc2a5d43c));
path.lineTo(SkBits2Float(0x402e3a94), SkBits2Float(0xc26fc0ba));
@@ -5400,7 +5400,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4071043c), SkBits2Float(0xc2a5d43c));
path.cubicTo(SkBits2Float(0x40790b78), SkBits2Float(0xc2a5d151), SkBits2Float(0x40808943), SkBits2Float(0xc2a5ce41), SkBits2Float(0x40848cac), SkBits2Float(0xc2a5cb0c));
path.lineTo(SkBits2Float(0x403fa34c), SkBits2Float(0xc26fb371));
@@ -5415,7 +5415,7 @@
static void battleOp198(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x369bbf59), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3fa0bd4b), SkBits2Float(0xc2a60000), SkBits2Float(0x4020bab6), SkBits2Float(0xc2a5f168), SkBits2Float(0x4071043c), SkBits2Float(0xc2a5d43c));
@@ -5429,7 +5429,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x40848cae), SkBits2Float(0xc2a5cb0c));
path.cubicTo(SkBits2Float(0x40c597bc), SkBits2Float(0xc2a5970c), SkBits2Float(0x41033f43), SkBits2Float(0xc2a53cca), SkBits2Float(0x41238fb3), SkBits2Float(0xc2a4bc74));
path.lineTo(SkBits2Float(0x40ec7963), SkBits2Float(0xc26e2c38));
@@ -5444,7 +5444,7 @@
static void battleOp199(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3ffdfad4), SkBits2Float(0xc2a60000), SkBits2Float(0x407df074), SkBits2Float(0xc2a5db92), SkBits2Float(0x40be4d32), SkBits2Float(0xc2a592c7));
path.lineTo(SkBits2Float(0x40899143), SkBits2Float(0xc26f6217));
@@ -5454,7 +5454,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x40be4d37), SkBits2Float(0xc2a592c7));
path.cubicTo(SkBits2Float(0x40c4a257), SkBits2Float(0xc2a58b80), SkBits2Float(0x40caf70c), SkBits2Float(0xc2a583db), SkBits2Float(0x40d14b4e), SkBits2Float(0xc2a57bda));
path.lineTo(SkBits2Float(0x40974c04), SkBits2Float(0xc26f40f2));
@@ -5469,7 +5469,7 @@
static void battleOp200(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3673fea3), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3ffdfad4), SkBits2Float(0xc2a60000), SkBits2Float(0x407df074), SkBits2Float(0xc2a5db92), SkBits2Float(0x40be4d37), SkBits2Float(0xc2a592c7));
@@ -5482,7 +5482,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x40d14b4a), SkBits2Float(0xc2a57bdb));
path.cubicTo(SkBits2Float(0x411bf161), SkBits2Float(0xc2a4fa1a), SkBits2Float(0x414ef5ad), SkBits2Float(0xc2a4190e), SkBits2Float(0x4180b83e), SkBits2Float(0xc2a2d9dc));
path.lineTo(SkBits2Float(0x413a19cf), SkBits2Float(0xc26b727f));
@@ -5497,7 +5497,7 @@
static void battleOp201(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4059d383), SkBits2Float(0xc2a5ffff), SkBits2Float(0x40d9b918), SkBits2Float(0xc2a594d0), SkBits2Float(0x4122e820), SkBits2Float(0xc2a4bf0c));
path.lineTo(SkBits2Float(0x40eb871c), SkBits2Float(0xc26e2ff8));
@@ -5507,7 +5507,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4122e81e), SkBits2Float(0xc2a4bf0c));
path.cubicTo(SkBits2Float(0x41284f3c), SkBits2Float(0xc2a4a9ac), SkBits2Float(0x412db549), SkBits2Float(0xc2a4933e), SkBits2Float(0x41331a33), SkBits2Float(0xc2a47bbf));
path.lineTo(SkBits2Float(0x410178be), SkBits2Float(0xc26dceac));
@@ -5522,7 +5522,7 @@
static void battleOp202(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4059d380), SkBits2Float(0xc2a60000), SkBits2Float(0x40d9b915), SkBits2Float(0xc2a594d0), SkBits2Float(0x4122e81e), SkBits2Float(0xc2a4bf0c));
@@ -5536,7 +5536,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41331a39), SkBits2Float(0xc2a47bc0));
path.cubicTo(SkBits2Float(0x41854b40), SkBits2Float(0xc2a2feb5), SkBits2Float(0x41b05576), SkBits2Float(0xc2a06b6c), SkBits2Float(0x41da0834), SkBits2Float(0xc29ccbb1));
path.lineTo(SkBits2Float(0x419d9d10), SkBits2Float(0xc262b148));
@@ -5551,7 +5551,7 @@
static void battleOp203(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4087af55), SkBits2Float(0xc2a5ffff), SkBits2Float(0x410795c5), SkBits2Float(0xc2a559a4), SkBits2Float(0x414aa20a), SkBits2Float(0xc2a40e63));
path.lineTo(SkBits2Float(0x41127b4b), SkBits2Float(0xc26d308f));
@@ -5561,7 +5561,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x414aa206), SkBits2Float(0xc2a40e63));
path.cubicTo(SkBits2Float(0x4151559c), SkBits2Float(0xc2a3ed46), SkBits2Float(0x41580726), SkBits2Float(0xc2a3ca86), SkBits2Float(0x415eb67b), SkBits2Float(0xc2a3a622));
path.lineTo(SkBits2Float(0x4120ff4d), SkBits2Float(0xc26c99d6));
@@ -5576,7 +5576,7 @@
static void battleOp204(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x36b5ff52), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4087af52), SkBits2Float(0xc2a60000), SkBits2Float(0x410795c2), SkBits2Float(0xc2a559a4), SkBits2Float(0x414aa206), SkBits2Float(0xc2a40e63));
@@ -5590,7 +5590,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x415eb680), SkBits2Float(0xc2a3a623));
path.cubicTo(SkBits2Float(0x41a59721), SkBits2Float(0xc2a157ad), SkBits2Float(0x41da77ab), SkBits2Float(0xc29d5c25), SkBits2Float(0x420662d7), SkBits2Float(0xc297cafd));
path.lineTo(SkBits2Float(0x41c24b0d), SkBits2Float(0xc25b75ac));
@@ -5605,7 +5605,7 @@
static void battleOp205(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40a2e582), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4122b94f), SkBits2Float(0xc2a51039), SkBits2Float(0x4172cca0), SkBits2Float(0xc2a333b4));
path.lineTo(SkBits2Float(0x412f847d), SkBits2Float(0xc26bf464));
@@ -5615,7 +5615,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4172cc9b), SkBits2Float(0xc2a333b4));
path.cubicTo(SkBits2Float(0x417acd1a), SkBits2Float(0xc2a30415), SkBits2Float(0x41816508), SkBits2Float(0xc2a2d21d), SkBits2Float(0x4185619b), SkBits2Float(0xc2a29dcb));
path.lineTo(SkBits2Float(0x4140d724), SkBits2Float(0xc26b1ba8));
@@ -5630,7 +5630,7 @@
static void battleOp206(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x36b5ff52), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40a2e57f), SkBits2Float(0xc2a60000), SkBits2Float(0x4122b94c), SkBits2Float(0xc2a51039), SkBits2Float(0x4172cc9b), SkBits2Float(0xc2a333b4));
@@ -5644,7 +5644,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4185619b), SkBits2Float(0xc2a29dcc));
path.cubicTo(SkBits2Float(0x41c61a92), SkBits2Float(0xc29f4c69), SkBits2Float(0x42023dd6), SkBits2Float(0xc299958f), SkBits2Float(0x421f3a98), SkBits2Float(0xc291a994));
path.lineTo(SkBits2Float(0x41e635e1), SkBits2Float(0xc25298a5));
@@ -5659,7 +5659,7 @@
static void battleOp207(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40c39389), SkBits2Float(0xc2a60000), SkBits2Float(0x414346f4), SkBits2Float(0xc2a4a65f), SkBits2Float(0x419158cf), SkBits2Float(0xc2a1f965));
path.lineTo(SkBits2Float(0x415223e0), SkBits2Float(0xc26a2df8));
@@ -5669,7 +5669,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x419158d0), SkBits2Float(0xc2a1f965));
path.cubicTo(SkBits2Float(0x41961cea), SkBits2Float(0xc2a1b4f6), SkBits2Float(0x419addf6), SkBits2Float(0xc2a16d2c), SkBits2Float(0x419f9bbb), SkBits2Float(0xc2a12207));
path.lineTo(SkBits2Float(0x4166c251), SkBits2Float(0xc268f69a));
@@ -5684,7 +5684,7 @@
static void battleOp208(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40c39389), SkBits2Float(0xc2a60000), SkBits2Float(0x414346f4), SkBits2Float(0xc2a4a65f), SkBits2Float(0x419158d0), SkBits2Float(0xc2a1f965));
@@ -5696,7 +5696,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x419f9bbc), SkBits2Float(0xc2a12208));
path.cubicTo(SkBits2Float(0x41eca53e), SkBits2Float(0xc29c5d1a), SkBits2Float(0x421ad1be), SkBits2Float(0xc2942e2b), SkBits2Float(0x423b8fe1), SkBits2Float(0xc288f8a3));
path.lineTo(SkBits2Float(0x42079647), SkBits2Float(0xc24607dc));
@@ -5711,7 +5711,7 @@
static void battleOp209(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40e86425), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4167e385), SkBits2Float(0xc2a41801), SkBits2Float(0x41ac0ecd), SkBits2Float(0xc2a05484));
path.lineTo(SkBits2Float(0x4178c21d), SkBits2Float(0xc267cd79));
@@ -5721,7 +5721,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41ac0ecb), SkBits2Float(0xc2a05485));
path.cubicTo(SkBits2Float(0x41b1a941), SkBits2Float(0xc29ff44e), SkBits2Float(0x41b73ea0), SkBits2Float(0xc29f8f65), SkBits2Float(0x41bcce84), SkBits2Float(0xc29f25d1));
path.lineTo(SkBits2Float(0x41887c9d), SkBits2Float(0xc26617d6));
@@ -5736,7 +5736,7 @@
static void battleOp210(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3673fea3), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x40e86421), SkBits2Float(0xc2a60000), SkBits2Float(0x4167e381), SkBits2Float(0xc2a41801), SkBits2Float(0x41ac0eca), SkBits2Float(0xc2a05484));
@@ -5751,7 +5751,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41bcce83), SkBits2Float(0xc29f25d2));
path.cubicTo(SkBits2Float(0x420ba3b4), SkBits2Float(0xc2987080), SkBits2Float(0x42357f09), SkBits2Float(0xc28cfcb1), SkBits2Float(0x42592f07), SkBits2Float(0xc27b1ba7));
path.lineTo(SkBits2Float(0x421d0012), SkBits2Float(0xc235861c));
@@ -5766,7 +5766,7 @@
static void battleOp211(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x411e5541), SkBits2Float(0xc2a5ffff), SkBits2Float(0x419db1ee), SkBits2Float(0xc2a275ef), SkBits2Float(0x41e7e0a3), SkBits2Float(0xc29b8c98));
path.lineTo(SkBits2Float(0x41a79f51), SkBits2Float(0xc260e3f1));
@@ -5776,7 +5776,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41e7e0a8), SkBits2Float(0xc29b8c98));
path.cubicTo(SkBits2Float(0x41ef46bb), SkBits2Float(0xc29adc20), SkBits2Float(0x41f6a013), SkBits2Float(0xc29a2338), SkBits2Float(0x41fdebc8), SkBits2Float(0xc29961f8));
path.lineTo(SkBits2Float(0x41b78eb0), SkBits2Float(0xc25dc215));
@@ -5791,7 +5791,7 @@
static void battleOp212(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3637fea3), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x411e5541), SkBits2Float(0xc2a5ffff), SkBits2Float(0x419db1ee), SkBits2Float(0xc2a275ef), SkBits2Float(0x41e7e0a8), SkBits2Float(0xc29b8c98));
@@ -5803,7 +5803,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41fdebc9), SkBits2Float(0xc29961f9));
path.cubicTo(SkBits2Float(0x423a7ccd), SkBits2Float(0xc28d1085), SkBits2Float(0x426d8f8d), SkBits2Float(0xc270b4b0), SkBits2Float(0x4288fa0c), SkBits2Float(0xc23b8bbf));
path.lineTo(SkBits2Float(0x424609e8), SkBits2Float(0xc207934a));
@@ -5818,7 +5818,7 @@
static void battleOp213(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4151cd59), SkBits2Float(0xc2a5ffff), SkBits2Float(0x41d04f3f), SkBits2Float(0xc29fc954), SkBits2Float(0x4216e058), SkBits2Float(0xc293de54));
path.lineTo(SkBits2Float(0x41da226b), SkBits2Float(0xc255c926));
@@ -5828,7 +5828,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4216e057), SkBits2Float(0xc293de54));
path.cubicTo(SkBits2Float(0x421b86ea), SkBits2Float(0xc292aea0), SkBits2Float(0x42201eff), SkBits2Float(0xc29170ed), SkBits2Float(0x4224a79b), SkBits2Float(0xc290257e));
path.lineTo(SkBits2Float(0x41ee0e15), SkBits2Float(0xc2506790));
@@ -5843,7 +5843,7 @@
static void battleOp214(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3697ff52), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4151cd58), SkBits2Float(0xc2a60000), SkBits2Float(0x41d04f3d), SkBits2Float(0xc29fc954), SkBits2Float(0x4216e057), SkBits2Float(0xc293de54));
@@ -5857,7 +5857,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4224a79b), SkBits2Float(0xc290257f));
path.cubicTo(SkBits2Float(0x426f06c3), SkBits2Float(0xc275d105), SkBits2Float(0x42930d85), SkBits2Float(0xc2303df6), SkBits2Float(0x429f3103), SkBits2Float(0xc1bc373f));
path.lineTo(SkBits2Float(0x42662806), SkBits2Float(0xc1880f44));
@@ -5872,7 +5872,7 @@
static void battleOp215(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41741cf0), SkBits2Float(0xc2a60000), SkBits2Float(0x41f1c060), SkBits2Float(0xc29d96da), SkBits2Float(0x422cf7a2), SkBits2Float(0xc28db11c));
path.lineTo(SkBits2Float(0x41fa12be), SkBits2Float(0xc24cdb0d));
@@ -5882,7 +5882,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x422cf7a1), SkBits2Float(0xc28db11c));
path.cubicTo(SkBits2Float(0x423224e7), SkBits2Float(0xc28c1ca8), SkBits2Float(0x42373bc3), SkBits2Float(0xc28a7620), SkBits2Float(0x423c3abd), SkBits2Float(0xc288bdfd));
path.lineTo(SkBits2Float(0x420811ca), SkBits2Float(0xc245b313));
@@ -5897,7 +5897,7 @@
static void battleOp216(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3637fea5), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41741cef), SkBits2Float(0xc2a60000), SkBits2Float(0x41f1c05e), SkBits2Float(0xc29d96da), SkBits2Float(0x422cf7a1), SkBits2Float(0xc28db11c));
@@ -5911,7 +5911,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423c3abe), SkBits2Float(0xc288bdfe));
path.cubicTo(SkBits2Float(0x42874551), SkBits2Float(0xc258d4f5), SkBits2Float(0x42a17ace), SkBits2Float(0xc1fc3ce7), SkBits2Float(0x42a57844), SkBits2Float(0xc0d41d22));
path.lineTo(SkBits2Float(0x426f3bc1), SkBits2Float(0xc09955d3));
@@ -5926,7 +5926,7 @@
static void battleOp217(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4188e880), SkBits2Float(0xc2a60000), SkBits2Float(0x42073c1a), SkBits2Float(0xc29b6b86), SkBits2Float(0x423f3295), SkBits2Float(0xc287b573));
path.lineTo(SkBits2Float(0x420a3712), SkBits2Float(0xc2443499));
@@ -5936,7 +5936,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423f3294), SkBits2Float(0xc287b572));
path.cubicTo(SkBits2Float(0x4244c015), SkBits2Float(0xc285c0c3), SkBits2Float(0x424a2e84), SkBits2Float(0xc283b664), SkBits2Float(0x424f7bec), SkBits2Float(0xc281970f));
path.lineTo(SkBits2Float(0x4215fd0e), SkBits2Float(0xc23b5bf1));
@@ -5951,7 +5951,7 @@
static void battleOp218(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3637fea5), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4188e880), SkBits2Float(0xc2a60000), SkBits2Float(0x42073c1a), SkBits2Float(0xc29b6b86), SkBits2Float(0x423f3295), SkBits2Float(0xc287b573));
@@ -5964,7 +5964,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x424f7bed), SkBits2Float(0xc281970f));
path.cubicTo(SkBits2Float(0x42939bdb), SkBits2Float(0xc23cf22a), SkBits2Float(0x42aabb70), SkBits2Float(0xc19e30f8), SkBits2Float(0x42a530dd), SkBits2Float(0x4102f5b1));
path.lineTo(SkBits2Float(0x426ed486), SkBits2Float(0x40bd56e4));
@@ -5979,7 +5979,7 @@
static void battleOp219(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4198fc97), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4216a3e3), SkBits2Float(0xc298caff), SkBits2Float(0x4251e7a7), SkBits2Float(0xc2809c9b));
path.lineTo(SkBits2Float(0x4217bd0d), SkBits2Float(0xc239f1d8));
@@ -5989,7 +5989,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4251e7a7), SkBits2Float(0xc2809c9c));
path.cubicTo(SkBits2Float(0x4257c623), SkBits2Float(0xc27c6f1e), SkBits2Float(0x425d7a38), SkBits2Float(0xc27771f7), SkBits2Float(0x42630157), SkBits2Float(0xc27243fd));
path.lineTo(SkBits2Float(0x422419a4), SkBits2Float(0xc22f21bb));
@@ -6004,7 +6004,7 @@
static void battleOp220(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb630015b), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4198fc97), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4216a3e3), SkBits2Float(0xc298caff), SkBits2Float(0x4251e7a7), SkBits2Float(0xc2809c9c));
@@ -6016,7 +6016,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42630157), SkBits2Float(0xc27243ff));
path.cubicTo(SkBits2Float(0x429f78af), SkBits2Float(0xc21c1e80), SkBits2Float(0x42b11918), SkBits2Float(0xc0cad7ee), SkBits2Float(0x429f0274), SkBits2Float(0x41bea8f4));
path.lineTo(SkBits2Float(0x4265e4b4), SkBits2Float(0x4189d394));
@@ -6031,7 +6031,7 @@
static void battleOp221(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41ae0130), SkBits2Float(0xc2a5ffff), SkBits2Float(0x422a8737), SkBits2Float(0xc294ec91), SkBits2Float(0x42689b67), SkBits2Float(0xc26ce46c));
path.lineTo(SkBits2Float(0x42282651), SkBits2Float(0xc22b3f58));
@@ -6041,7 +6041,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42689b68), SkBits2Float(0xc26ce46d));
path.cubicTo(SkBits2Float(0x426ebcd2), SkBits2Float(0xc266df67), SkBits2Float(0x4274a1d2), SkBits2Float(0xc2609e09), SkBits2Float(0x427a4701), SkBits2Float(0xc25a23f2));
path.lineTo(SkBits2Float(0x4234ec64), SkBits2Float(0xc21db11e));
@@ -6056,7 +6056,7 @@
static void battleOp222(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41ae0130), SkBits2Float(0xc2a5ffff), SkBits2Float(0x422a8737), SkBits2Float(0xc294ec91), SkBits2Float(0x42689b68), SkBits2Float(0xc26ce46d));
@@ -6068,7 +6068,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x427a4702), SkBits2Float(0xc25a23f2));
path.cubicTo(SkBits2Float(0x42ac7185), SkBits2Float(0xc1db2f83), SkBits2Float(0x42b35ed0), SkBits2Float(0x413e447a), SkBits2Float(0x428e4a3d), SkBits2Float(0x422afde8));
path.lineTo(SkBits2Float(0x424db871), SkBits2Float(0x41f73799));
@@ -6083,7 +6083,7 @@
static void battleOp223(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41c50a2c), SkBits2Float(0xc2a60000), SkBits2Float(0x423ff37f), SkBits2Float(0xc2901f4e), SkBits2Float(0x427f077c), SkBits2Float(0xc25490c6));
path.lineTo(SkBits2Float(0x42385bc5), SkBits2Float(0xc219a96d));
@@ -6093,7 +6093,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x427f077b), SkBits2Float(0xc25490c6));
path.cubicTo(SkBits2Float(0x42829e52), SkBits2Float(0xc24d1e28), SkBits2Float(0x42858ec1), SkBits2Float(0xc24566d6), SkBits2Float(0x428852e3), SkBits2Float(0xc23d7081));
path.lineTo(SkBits2Float(0x42451839), SkBits2Float(0xc208f1b7));
@@ -6108,7 +6108,7 @@
static void battleOp224(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3637fea5), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41c50a2c), SkBits2Float(0xc2a60000), SkBits2Float(0x423ff37f), SkBits2Float(0xc2901f4e), SkBits2Float(0x427f077c), SkBits2Float(0xc25490c6));
@@ -6121,7 +6121,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x428852e3), SkBits2Float(0xc23d7081));
path.cubicTo(SkBits2Float(0x42b71f8a), SkBits2Float(0xc15aea65), SkBits2Float(0x42adb77f), SkBits2Float(0x42002593), SkBits2Float(0x42645e8b), SkBits2Float(0x4270faee));
path.lineTo(SkBits2Float(0x42251616), SkBits2Float(0x422e33d9));
@@ -6136,7 +6136,7 @@
static void battleOp225(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41d8749b), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4251a993), SkBits2Float(0xc28b9f9f), SkBits2Float(0x4287e789), SkBits2Float(0xc23ea40d));
path.lineTo(SkBits2Float(0x42447d05), SkBits2Float(0xc209d00a));
@@ -6146,7 +6146,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4287e78a), SkBits2Float(0xc23ea40e));
path.cubicTo(SkBits2Float(0x428af3dc), SkBits2Float(0xc235f2f3), SkBits2Float(0x428dca5e), SkBits2Float(0xc22cf844), SkBits2Float(0x4290688d), SkBits2Float(0xc223bbef));
path.lineTo(SkBits2Float(0x4250c881), SkBits2Float(0xc1ecb95a));
@@ -6161,7 +6161,7 @@
static void battleOp226(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41d8749b), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4251a993), SkBits2Float(0xc28b9f9f), SkBits2Float(0x4287e78a), SkBits2Float(0xc23ea40e));
@@ -6173,7 +6173,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4290688d), SkBits2Float(0xc223bbef));
path.cubicTo(SkBits2Float(0x42bd187d), SkBits2Float(0xbfc2a74a), SkBits2Float(0x42a250ed), SkBits2Float(0x42421cbf), SkBits2Float(0x42287a28), SkBits2Float(0x428f09b7));
path.lineTo(SkBits2Float(0x41f394da), SkBits2Float(0x424ecd48));
@@ -6188,7 +6188,7 @@
static void battleOp227(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41f1efaa), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42685cb5), SkBits2Float(0xc2851a3e), SkBits2Float(0x429160d2), SkBits2Float(0xc22043b6));
path.lineTo(SkBits2Float(0x42522f73), SkBits2Float(0xc1e7b52d));
@@ -6198,7 +6198,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x429160d2), SkBits2Float(0xc22043b7));
path.cubicTo(SkBits2Float(0x42943aa0), SkBits2Float(0xc215eba6), SkBits2Float(0x4296cd42), SkBits2Float(0xc20b4794), SkBits2Float(0x429915e6), SkBits2Float(0xc200631e));
path.lineTo(SkBits2Float(0x425d5418), SkBits2Float(0xc1b99eb9));
@@ -6213,7 +6213,7 @@
static void battleOp228(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41f1efa9), SkBits2Float(0xc2a60000), SkBits2Float(0x42685cb5), SkBits2Float(0xc2851a3e), SkBits2Float(0x429160d2), SkBits2Float(0xc22043b7));
@@ -6227,7 +6227,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x429915e6), SkBits2Float(0xc200631e));
path.cubicTo(SkBits2Float(0x42abe101), SkBits2Float(0xc11b0235), SkBits2Float(0x42aa16bb), SkBits2Float(0x417b685c), SkBits2Float(0x42942fff), SkBits2Float(0x42159e77));
path.cubicTo(SkBits2Float(0x427c9284), SkBits2Float(0x426c62d8), SkBits2Float(0x422cf27d), SkBits2Float(0x4295ccdb), SkBits2Float(0x419d039e), SkBits2Float(0x42a14aca));
@@ -6244,7 +6244,7 @@
static void battleOp229(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4206c976), SkBits2Float(0xc2a60000), SkBits2Float(0x42801937), SkBits2Float(0xc27a823c), SkBits2Float(0x4299a0d7), SkBits2Float(0xc1fb88d1));
path.lineTo(SkBits2Float(0x425e1cfa), SkBits2Float(0xc1b5d505));
@@ -6254,7 +6254,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4299a0d8), SkBits2Float(0xc1fb88d0));
path.cubicTo(SkBits2Float(0x429c1b73), SkBits2Float(0xc1e34f53), SkBits2Float(0x429e39d2), SkBits2Float(0xc1ca8528), SkBits2Float(0x429ff920), SkBits2Float(0xc1b14b8c));
path.lineTo(SkBits2Float(0x42674955), SkBits2Float(0xc1802a45));
@@ -6269,7 +6269,7 @@
static void battleOp230(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4206c976), SkBits2Float(0xc2a60000), SkBits2Float(0x42801937), SkBits2Float(0xc27a823c), SkBits2Float(0x4299a0d8), SkBits2Float(0xc1fb88d0));
@@ -6281,7 +6281,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x429ff91f), SkBits2Float(0xc1b14b8a));
path.cubicTo(SkBits2Float(0x42ae673b), SkBits2Float(0x40783c41), SkBits2Float(0x42a293c2), SkBits2Float(0x41fe6960), SkBits2Float(0x4280464e), SkBits2Float(0x4252ba7b));
path.cubicTo(SkBits2Float(0x423bf1b3), SkBits2Float(0x42932023), SkBits2Float(0x41a5f32c), SkBits2Float(0x42a99309), SkBits2Float(0xc0c67989), SkBits2Float(0x42a5892f));
@@ -6298,7 +6298,7 @@
static void battleOp231(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x421472e7), SkBits2Float(0xc2a5ffff), SkBits2Float(0x428b6da4), SkBits2Float(0xc26973d7), SkBits2Float(0x429fb179), SkBits2Float(0xc1b54986));
path.lineTo(SkBits2Float(0x4266e1be), SkBits2Float(0xc1830d0f));
@@ -6308,7 +6308,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x429fb179), SkBits2Float(0xc1b54988));
path.cubicTo(SkBits2Float(0x42a1a632), SkBits2Float(0xc199b837), SkBits2Float(0x42a3282f), SkBits2Float(0xc17b594e), SkBits2Float(0x42a43501), SkBits2Float(0xc142a7ba));
path.lineTo(SkBits2Float(0x426d6865), SkBits2Float(0xc10cb6f0));
@@ -6323,7 +6323,7 @@
static void battleOp232(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x421472e7), SkBits2Float(0xc2a60000), SkBits2Float(0x428b6da4), SkBits2Float(0xc26973d8), SkBits2Float(0x429fb179), SkBits2Float(0xc1b54988));
@@ -6336,7 +6336,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a43502), SkBits2Float(0xc142a7bb));
path.cubicTo(SkBits2Float(0x42ace9b0), SkBits2Float(0x4189ae79), SkBits2Float(0x429590d6), SkBits2Float(0x423ab1c1), SkBits2Float(0x424df762), SkBits2Float(0x428231a6));
path.cubicTo(SkBits2Float(0x41e19a31), SkBits2Float(0x42a70a69), SkBits2Float(0xc04a3289), SkBits2Float(0x42b03133), SkBits2Float(0xc1f5f36e), SkBits2Float(0x429a3139));
@@ -6353,7 +6353,7 @@
static void battleOp233(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4220aa02), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42952310), SkBits2Float(0xc258f48d), SkBits2Float(0x42a35f68), SkBits2Float(0xc16b5614));
path.lineTo(SkBits2Float(0x426c3395), SkBits2Float(0xc12a1f61));
@@ -6363,7 +6363,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a35f69), SkBits2Float(0xc16b5613));
path.cubicTo(SkBits2Float(0x42a4bd24), SkBits2Float(0xc12ea3c2), SkBits2Float(0x42a59325), SkBits2Float(0xc0e282d6), SkBits2Float(0x42a5dfdf), SkBits2Float(0xc04e84a0));
path.lineTo(SkBits2Float(0x426fd18d), SkBits2Float(0xc0154a48));
@@ -6378,7 +6378,7 @@
static void battleOp234(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3697ff52), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4220aa02), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42952310), SkBits2Float(0xc258f48d), SkBits2Float(0x42a35f69), SkBits2Float(0xc16b5613));
@@ -6391,7 +6391,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a5dfdf), SkBits2Float(0xc04e84a0));
path.cubicTo(SkBits2Float(0x42a85e4f), SkBits2Float(0x41e6959e), SkBits2Float(0x4285b4e3), SkBits2Float(0x426ae44f), SkBits2Float(0x4219b105), SkBits2Float(0x42932450));
path.cubicTo(SkBits2Float(0x411fe111), SkBits2Float(0x42b0d679), SkBits2Float(0xc1c3966b), SkBits2Float(0x42ab1d42), SkBits2Float(0xc2482755), SkBits2Float(0x428470e8));
@@ -6408,7 +6408,7 @@
static void battleOp235(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x422e5e2d), SkBits2Float(0xc2a5ffff), SkBits2Float(0x429f82f2), SkBits2Float(0xc2451c35), SkBits2Float(0x42a59867), SkBits2Float(0xc0b956c5));
path.lineTo(SkBits2Float(0x426f6a3b), SkBits2Float(0xc085fae3));
@@ -6418,7 +6418,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a59868), SkBits2Float(0xc0b956ca));
path.cubicTo(SkBits2Float(0x42a62cd8), SkBits2Float(0xbfd2dd07), SkBits2Float(0x42a621be), SkBits2Float(0x4020d557), SkBits2Float(0x42a57734), SkBits2Float(0x40d4ef9c));
path.lineTo(SkBits2Float(0x426f3a3b), SkBits2Float(0x4099edfc));
@@ -6433,7 +6433,7 @@
static void battleOp236(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3637fea5), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x422e5e2d), SkBits2Float(0xc2a5ffff), SkBits2Float(0x429f82f2), SkBits2Float(0xc2451c35), SkBits2Float(0x42a59868), SkBits2Float(0xc0b956ca));
@@ -6446,7 +6446,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a57735), SkBits2Float(0x40d4ef9d));
path.cubicTo(SkBits2Float(0x429fe5e1), SkBits2Float(0x4225104d), SkBits2Float(0x425fa7d9), SkBits2Float(0x428cf91a), SkBits2Float(0x41b3ea58), SkBits2Float(0x429fca49));
path.cubicTo(SkBits2Float(0xc12ef606), SkBits2Float(0x42b29b77), SkBits2Float(0xc23abc07), SkBits2Float(0x4299d29d), SkBits2Float(0xc2863a28), SkBits2Float(0x42435615));
@@ -6463,7 +6463,7 @@
static void battleOp237(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41b25a1b), SkBits2Float(0xc2a60000), SkBits2Float(0x422e9a51), SkBits2Float(0xc294100b), SkBits2Float(0x426d0a79), SkBits2Float(0xc26874a1));
path.cubicTo(SkBits2Float(0x4295bd51), SkBits2Float(0xc228c92e), SkBits2Float(0x42a6d6d5), SkBits2Float(0xc1a5596e), SkBits2Float(0x42a5f7e5), SkBits2Float(0x3fcf7f4c));
@@ -6475,7 +6475,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a5f7e5), SkBits2Float(0x3fcf7f2e));
path.cubicTo(SkBits2Float(0x42a5cbdf), SkBits2Float(0x40c0b7f8), SkBits2Float(0x42a4eca2), SkBits2Float(0x41268f7d), SkBits2Float(0x42a35c4c), SkBits2Float(0x416be04e));
path.lineTo(SkBits2Float(0x426c2f14), SkBits2Float(0x412a834e));
@@ -6490,7 +6490,7 @@
static void battleOp238(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3697ff52), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41b25a1b), SkBits2Float(0xc2a60000), SkBits2Float(0x422e9a51), SkBits2Float(0xc294100b), SkBits2Float(0x426d0a79), SkBits2Float(0xc26874a1));
@@ -6504,7 +6504,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a35c4c), SkBits2Float(0x416be04e));
path.cubicTo(SkBits2Float(0x42963d3f), SkBits2Float(0x424c5e0d), SkBits2Float(0x42354f77), SkBits2Float(0x429d76d6), SkBits2Float(0x41096c90), SkBits2Float(0x42a51bdb));
path.cubicTo(SkBits2Float(0xc1e1325f), SkBits2Float(0x42acc0e0), SkBits2Float(0xc27bf938), SkBits2Float(0x4282ec23), SkBits2Float(0xc299cad8), SkBits2Float(0x41f9ecd8));
@@ -6521,7 +6521,7 @@
static void battleOp239(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41ba3f99), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4235f79d), SkBits2Float(0xc29271cf), SkBits2Float(0x4274db3f), SkBits2Float(0xc260354d));
path.cubicTo(SkBits2Float(0x4299df70), SkBits2Float(0xc21b86fd), SkBits2Float(0x42a97305), SkBits2Float(0xc17e5d7a), SkBits2Float(0x42a55ba0), SkBits2Float(0x40e961b4));
@@ -6533,7 +6533,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a55ba0), SkBits2Float(0x40e961b9));
path.cubicTo(SkBits2Float(0x42a48d09), SkBits2Float(0x413de0a1), SkBits2Float(0x42a2fc74), SkBits2Float(0x41833376), SkBits2Float(0x42a0adff), SkBits2Float(0x41a6c250));
path.lineTo(SkBits2Float(0x42684ed9), SkBits2Float(0x417118ef));
@@ -6548,7 +6548,7 @@
static void battleOp240(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41ba3f99), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4235f79d), SkBits2Float(0xc29271cf), SkBits2Float(0x4274db3f), SkBits2Float(0xc260354d));
@@ -6562,7 +6562,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a0ae00), SkBits2Float(0x41a6c250));
path.cubicTo(SkBits2Float(0x428d4422), SkBits2Float(0x4269069e), SkBits2Float(0x42118d33), SkBits2Float(0x42a8086f), SkBits2Float(0xc00fe376), SkBits2Float(0x42a5f066));
path.cubicTo(SkBits2Float(0xc22389a2), SkBits2Float(0x42a3d85e), SkBits2Float(0xc2935e5d), SkBits2Float(0x42596224), SkBits2Float(0xc2a2b39d), SkBits2Float(0x4183b53a));
@@ -6579,7 +6579,7 @@
static void battleOp241(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41c2abe0), SkBits2Float(0xc2a5ffff), SkBits2Float(0x423dc4ab), SkBits2Float(0xc290a493), SkBits2Float(0x427cd8fd), SkBits2Float(0xc25727eb));
path.cubicTo(SkBits2Float(0x429df6a6), SkBits2Float(0xc20d06b1), SkBits2Float(0x42aba628), SkBits2Float(0xc12bcbe5), SkBits2Float(0x42a3dc46), SkBits2Float(0x4154872f));
@@ -6591,7 +6591,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a3dc46), SkBits2Float(0x41548735));
path.cubicTo(SkBits2Float(0x42a2537f), SkBits2Float(0x41901e3f), SkBits2Float(0x429ff996), SkBits2Float(0x41b55e92), SkBits2Float(0x429cd549), SkBits2Float(0x41d999a0));
path.lineTo(SkBits2Float(0x4262bf29), SkBits2Float(0x419d4d21));
@@ -6606,7 +6606,7 @@
static void battleOp242(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3697ff52), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41c2abe0), SkBits2Float(0xc2a5ffff), SkBits2Float(0x423dc4ab), SkBits2Float(0xc290a493), SkBits2Float(0x427cd8fd), SkBits2Float(0xc25727eb));
@@ -6620,7 +6620,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x429cd549), SkBits2Float(0x41d999a0));
path.cubicTo(SkBits2Float(0x42824b9e), SkBits2Float(0x4282e841), SkBits2Float(0x41d1b597), SkBits2Float(0x42b119ff), SkBits2Float(0xc15b80c3), SkBits2Float(0x42a3b776));
path.cubicTo(SkBits2Float(0xc2569b2d), SkBits2Float(0x429654ee), SkBits2Float(0xc2a5db0b), SkBits2Float(0x42228c64), SkBits2Float(0xc2a5ffee), SkBits2Float(0x3e172efd));
@@ -6637,7 +6637,7 @@
static void battleOp243(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41caf078), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42455e40), SkBits2Float(0xc28ecc78), SkBits2Float(0x42822b31), SkBits2Float(0xc24e07b4));
path.cubicTo(SkBits2Float(0x42a1a743), SkBits2Float(0xc1fcecee), SkBits2Float(0x42ad3753), SkBits2Float(0xc0b3be45), SkBits2Float(0x42a18eed), SkBits2Float(0x419892cb));
@@ -6649,7 +6649,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a18eed), SkBits2Float(0x419892ca));
path.cubicTo(SkBits2Float(0x429f43c9), SkBits2Float(0x41bf6e44), SkBits2Float(0x429c198b), SkBits2Float(0x41e561a5), SkBits2Float(0x42981a0b), SkBits2Float(0x4204fb6e));
path.lineTo(SkBits2Float(0x425be7f8), SkBits2Float(0x41c0436a));
@@ -6664,7 +6664,7 @@
static void battleOp244(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb630015b), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41caf078), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42455e40), SkBits2Float(0xc28ecc78), SkBits2Float(0x42822b31), SkBits2Float(0xc24e07b4));
@@ -6680,7 +6680,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42981a0b), SkBits2Float(0x4204fb6e));
path.cubicTo(SkBits2Float(0x426c6b55), SkBits2Float(0x42900555), SkBits2Float(0x417b6a9f), SkBits2Float(0x42b7a6c3), SkBits2Float(0xc1c57072), SkBits2Float(0x429e7dd7));
path.cubicTo(SkBits2Float(0xc282258c), SkBits2Float(0x428554eb), SkBits2Float(0xc2b314c4), SkBits2Float(0x41cdbc89), SkBits2Float(0xc2a2f571), SkBits2Float(0xc17d09b6));
@@ -6697,7 +6697,7 @@
static void battleOp245(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41d28773), SkBits2Float(0xc2a5ffff), SkBits2Float(0x424c4acf), SkBits2Float(0xc28d0a47), SkBits2Float(0x428572fc), SkBits2Float(0xc24574fc));
path.cubicTo(SkBits2Float(0x42a4c090), SkBits2Float(0xc1e1aad9), SkBits2Float(0x42ae2294), SkBits2Float(0xbf62367e), SkBits2Float(0x429ebce0), SkBits2Float(0x41c23fec));
@@ -6709,7 +6709,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x429ebce1), SkBits2Float(0x41c23fee));
path.cubicTo(SkBits2Float(0x429bb658), SkBits2Float(0x41e9cedc), SkBits2Float(0x4297c4ea), SkBits2Float(0x4208130e), SkBits2Float(0x4292f5c0), SkBits2Float(0x421a62d5));
path.lineTo(SkBits2Float(0x425478e6), SkBits2Float(0x41df3573));
@@ -6724,7 +6724,7 @@
static void battleOp246(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3637fea5), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41d28773), SkBits2Float(0xc2a5ffff), SkBits2Float(0x424c4acf), SkBits2Float(0xc28d0a47), SkBits2Float(0x428572fc), SkBits2Float(0xc24574fc));
@@ -6738,7 +6738,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4292f5c1), SkBits2Float(0x421a62d6));
path.cubicTo(SkBits2Float(0x42541a09), SkBits2Float(0x429b1363), SkBits2Float(0x40b7c75d), SkBits2Float(0x42bb84d6), SkBits2Float(0xc2093cef), SkBits2Float(0x42972755));
path.cubicTo(SkBits2Float(0xc294b966), SkBits2Float(0x426593a9), SkBits2Float(0xc2ba8c7c), SkBits2Float(0x4131f51c), SkBits2Float(0xc29ad8fe), SkBits2Float(0xc1ef45cd));
@@ -6755,7 +6755,7 @@
static void battleOp247(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41d91350), SkBits2Float(0xc2a5ffff), SkBits2Float(0x425238e3), SkBits2Float(0xc28b791f), SkBits2Float(0x428827e4), SkBits2Float(0xc23dec02));
path.cubicTo(SkBits2Float(0x42a73357), SkBits2Float(0xc1c9cb8b), SkBits2Float(0x42ae86ff), SkBits2Float(0x404daf5b), SkBits2Float(0x429bc6e8), SkBits2Float(0x41e56ae9));
@@ -6767,7 +6767,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x429bc6e9), SkBits2Float(0x41e56aeb));
path.cubicTo(SkBits2Float(0x429818bd), SkBits2Float(0x4206b36a), SkBits2Float(0x42937671), SkBits2Float(0x4219f01e), SkBits2Float(0x428df070), SkBits2Float(0x422c2771));
path.lineTo(SkBits2Float(0x424d369d), SkBits2Float(0x41f8e5bf));
@@ -6782,7 +6782,7 @@
static void battleOp248(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb630015b), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41d91350), SkBits2Float(0xc2a5ffff), SkBits2Float(0x425238e3), SkBits2Float(0xc28b791f), SkBits2Float(0x428827e4), SkBits2Float(0xc23dec02));
@@ -6797,7 +6797,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x428df071), SkBits2Float(0x422c2771));
path.cubicTo(SkBits2Float(0x423d9ebb), SkBits2Float(0x42a3ca6a), SkBits2Float(0xc041a78f), SkBits2Float(0x42bd279e), SkBits2Float(0xc228abe7), SkBits2Float(0x428efaad));
path.cubicTo(SkBits2Float(0xc2a29eac), SkBits2Float(0x42419b78), SkBits2Float(0xc2bd3710), SkBits2Float(0xbfef63d4), SkBits2Float(0xc2900003), SkBits2Float(0xc2252a98));
@@ -6814,7 +6814,7 @@
static void battleOp249(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41df6bc7), SkBits2Float(0xc2a60000), SkBits2Float(0x4257ee8b), SkBits2Float(0xc289e8f6), SkBits2Float(0x428aab73), SkBits2Float(0xc2368066));
path.cubicTo(SkBits2Float(0x42a95fa1), SkBits2Float(0xc1b25dc1), SkBits2Float(0x42ae8dc1), SkBits2Float(0x40e61789), SkBits2Float(0x42987459), SkBits2Float(0x42035b41));
@@ -6826,7 +6826,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42987459), SkBits2Float(0x42035b41));
path.cubicTo(SkBits2Float(0x42941f1a), SkBits2Float(0x421778e1), SkBits2Float(0x428ecdc9), SkBits2Float(0x422aae55), SkBits2Float(0x42889449), SkBits2Float(0x423cb3b9));
path.lineTo(SkBits2Float(0x424576c5), SkBits2Float(0x4208693e));
@@ -6841,7 +6841,7 @@
static void battleOp250(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb69400ae), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41df6bc7), SkBits2Float(0xc2a60000), SkBits2Float(0x4257ee8b), SkBits2Float(0xc289e8f6), SkBits2Float(0x428aab73), SkBits2Float(0xc2368066));
@@ -6855,7 +6855,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42889449), SkBits2Float(0x423cb3b8));
path.cubicTo(SkBits2Float(0x424c5291), SkBits2Float(0x42902c61), SkBits2Float(0x41ad609d), SkBits2Float(0x42ab4d26), SkBits2Float(0xc1072a9c), SkBits2Float(0x42a52356));
path.cubicTo(SkBits2Float(0xc21a459c), SkBits2Float(0x429ef985), SkBits2Float(0xc2813d9b), SkBits2Float(0x4270fef6), SkBits2Float(0xc298db30), SkBits2Float(0x420179e4));
@@ -6874,7 +6874,7 @@
static void battleOp251(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41e529f0), SkBits2Float(0xc2a5ffff), SkBits2Float(0x425d10b2), SkBits2Float(0xc2887541), SkBits2Float(0x428cd9cf), SkBits2Float(0xc22fb184));
path.cubicTo(SkBits2Float(0x42ab2b45), SkBits2Float(0xc19cf10c), SkBits2Float(0x42ae472d), SkBits2Float(0x412c96c0), SkBits2Float(0x42951360), SkBits2Float(0x42120c0d));
@@ -6886,7 +6886,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42951360), SkBits2Float(0x42120c0f));
path.cubicTo(SkBits2Float(0x429023a5), SkBits2Float(0x422633cd), SkBits2Float(0x428a3193), SkBits2Float(0x42394df4), SkBits2Float(0x42835484), SkBits2Float(0x424b0f7e));
path.lineTo(SkBits2Float(0x423ddffa), SkBits2Float(0x4212ca6e));
@@ -6901,7 +6901,7 @@
static void battleOp252(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3725ffa9), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41e529f0), SkBits2Float(0xc2a5ffff), SkBits2Float(0x425d10b2), SkBits2Float(0xc2887541), SkBits2Float(0x428cd9cf), SkBits2Float(0xc22fb184));
@@ -6915,7 +6915,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42835484), SkBits2Float(0x424b0f7e));
path.cubicTo(SkBits2Float(0x423aab34), SkBits2Float(0x4296ad9b), SkBits2Float(0x41789cf4), SkBits2Float(0x42ae7f70), SkBits2Float(0xc1702bd2), SkBits2Float(0x42a3434e));
path.cubicTo(SkBits2Float(0xc2363d27), SkBits2Float(0x4298072c), SkBits2Float(0xc28cd4c4), SkBits2Float(0x42573cf7), SkBits2Float(0xc29edb8e), SkBits2Float(0x41c0adb0));
@@ -6934,7 +6934,7 @@
static void battleOp253(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41ea9e19), SkBits2Float(0xc2a60000), SkBits2Float(0x4261e8db), SkBits2Float(0xc2870be6), SkBits2Float(0x428ed6bc), SkBits2Float(0xc22926d7));
path.cubicTo(SkBits2Float(0x42acb90a), SkBits2Float(0xc1886bc1), SkBits2Float(0x42adc0f7), SkBits2Float(0x41631db6), SkBits2Float(0x42918cff), SkBits2Float(0x421fa302));
@@ -6946,7 +6946,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42918d00), SkBits2Float(0x421fa301));
path.cubicTo(SkBits2Float(0x428c0830), SkBits2Float(0x4233c399), SkBits2Float(0x42857bfe), SkBits2Float(0x4246b13f), SkBits2Float(0x427c06a0), SkBits2Float(0x42581e30));
path.lineTo(SkBits2Float(0x42362ff8), SkBits2Float(0x421c3ad6));
@@ -6961,7 +6961,7 @@
static void battleOp254(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3697ff52), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41ea9e19), SkBits2Float(0xc2a60000), SkBits2Float(0x4261e8db), SkBits2Float(0xc2870be6), SkBits2Float(0x428ed6bc), SkBits2Float(0xc22926d7));
@@ -6975,7 +6975,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x427c069f), SkBits2Float(0x42581e31));
path.cubicTo(SkBits2Float(0x4229355f), SkBits2Float(0x429c5901), SkBits2Float(0x4119ef9b), SkBits2Float(0x42b0b9f6), SkBits2Float(0xc1a91754), SkBits2Float(0x42a086fc));
path.cubicTo(SkBits2Float(0xc24f933a), SkBits2Float(0x42905402), SkBits2Float(0xc296a2af), SkBits2Float(0x423cccf9), SkBits2Float(0xc2a2e3f0), SkBits2Float(0x417fd713));
@@ -6994,7 +6994,7 @@
static void battleOp255(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41eeb164), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42658277), SkBits2Float(0xc285f892), SkBits2Float(0x42904565), SkBits2Float(0xc22437b5));
path.cubicTo(SkBits2Float(0x42adc98d), SkBits2Float(0xc171f916), SkBits2Float(0x42ad3226), SkBits2Float(0x4185deb6), SkBits2Float(0x428eb8d5), SkBits2Float(0x42298bae));
@@ -7006,7 +7006,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x428eb8d5), SkBits2Float(0x42298bad));
path.cubicTo(SkBits2Float(0x4288c365), SkBits2Float(0x423d9c15), SkBits2Float(0x4281c36f), SkBits2Float(0x42505c7e), SkBits2Float(0x4273ad50), SkBits2Float(0x42617d52));
path.lineTo(SkBits2Float(0x423026ec), SkBits2Float(0x42230126));
@@ -7021,7 +7021,7 @@
static void battleOp256(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb69400ae), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41eeb164), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42658277), SkBits2Float(0xc285f892), SkBits2Float(0x42904565), SkBits2Float(0xc22437b5));
@@ -7036,7 +7036,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4273ad4f), SkBits2Float(0x42617d52));
path.cubicTo(SkBits2Float(0x421bc173), SkBits2Float(0x42a0404f), SkBits2Float(0x40a50405), SkBits2Float(0x42b1dfaa), SkBits2Float(0xc1cd0022), SkBits2Float(0x429de3fd));
path.cubicTo(SkBits2Float(0xc261a0a2), SkBits2Float(0x4289e850), SkBits2Float(0xc29d25ee), SkBits2Float(0x4227ed4e), SkBits2Float(0xc2a4d3d8), SkBits2Float(0x411d8f80));
@@ -7055,7 +7055,7 @@
static void battleOp257(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41f2d268), SkBits2Float(0xc2a5ffff), SkBits2Float(0x426923a2), SkBits2Float(0xc284dd06), SkBits2Float(0x4291aced), SkBits2Float(0xc21f2e53));
path.cubicTo(SkBits2Float(0x42aec809), SkBits2Float(0xc1528a66), SkBits2Float(0x42ac7c90), SkBits2Float(0x419a60b1), SkBits2Float(0x428bb0fe), SkBits2Float(0x42335ba0));
@@ -7067,7 +7067,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x428bb0ff), SkBits2Float(0x42335ba2));
path.cubicTo(SkBits2Float(0x4285489d), SkBits2Float(0x42475206), SkBits2Float(0x427ba631), SkBits2Float(0x4259da14), SkBits2Float(0x426ae250), SkBits2Float(0x426aa282));
path.lineTo(SkBits2Float(0x4229cbb3), SkBits2Float(0x42299d92));
@@ -7082,7 +7082,7 @@
static void battleOp258(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x36d3ff52), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41f2d268), SkBits2Float(0xc2a5ffff), SkBits2Float(0x426923a2), SkBits2Float(0xc284dd06), SkBits2Float(0x4291aced), SkBits2Float(0xc21f2e53));
@@ -7096,7 +7096,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x426ae251), SkBits2Float(0x426aa281));
path.cubicTo(SkBits2Float(0x420dcd2c), SkBits2Float(0x42a3e87c), SkBits2Float(0x3f1c0197), SkBits2Float(0x42b294d6), SkBits2Float(0xc1f0a2ab), SkBits2Float(0x429ab731));
path.cubicTo(SkBits2Float(0xc27312b1), SkBits2Float(0x4282d98e), SkBits2Float(0xc2a300b1), SkBits2Float(0x4211eaa7), SkBits2Float(0xc2a5d865), SkBits2Float(0x40654aaf));
@@ -7115,7 +7115,7 @@
static void battleOp259(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41f70d18), SkBits2Float(0xc2a60000), SkBits2Float(0x426cd682), SkBits2Float(0xc283b5d2), SkBits2Float(0x429310ae), SkBits2Float(0xc219fc22));
path.cubicTo(SkBits2Float(0x42afb61c), SkBits2Float(0xc132327f), SkBits2Float(0x42ab9c4e), SkBits2Float(0x41af4ab2), SkBits2Float(0x42886baa), SkBits2Float(0x423d2918));
@@ -7127,7 +7127,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42886bab), SkBits2Float(0x423d2917));
path.cubicTo(SkBits2Float(0x42818ce6), SkBits2Float(0x4250fab6), SkBits2Float(0x42733ded), SkBits2Float(0x42633df9), SkBits2Float(0x42618b96), SkBits2Float(0x4273a01b));
path.lineTo(SkBits2Float(0x42230b75), SkBits2Float(0x42301d61));
@@ -7142,7 +7142,7 @@
static void battleOp260(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb630015b), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41f70d18), SkBits2Float(0xc2a60000), SkBits2Float(0x426cd682), SkBits2Float(0xc283b5d2), SkBits2Float(0x429310ae), SkBits2Float(0xc219fc22));
@@ -7156,7 +7156,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42618b95), SkBits2Float(0x4273a01c));
path.cubicTo(SkBits2Float(0x41fe659e), SkBits2Float(0x42a75638), SkBits2Float(0xc081f8cf), SkBits2Float(0x42b2d4b3), SkBits2Float(0xc20a1eaa), SkBits2Float(0x4296f3e7));
path.cubicTo(SkBits2Float(0xc281ff1e), SkBits2Float(0x42762634), SkBits2Float(0xc2a8320c), SkBits2Float(0x41f52b39), SkBits2Float(0xc2a5e71e), SkBits2Float(0xc035be80));
@@ -7175,7 +7175,7 @@
static void battleOp261(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41f9750b), SkBits2Float(0xc2a5ffff), SkBits2Float(0x426eeefa), SkBits2Float(0xc2830bb8), SkBits2Float(0x4293d569), SkBits2Float(0xc2170343));
path.cubicTo(SkBits2Float(0x42b03354), SkBits2Float(0xc11fbc55), SkBits2Float(0x42ab0b89), SkBits2Float(0x41bb247a), SkBits2Float(0x42867c8e), SkBits2Float(0x42429f12));
@@ -7187,7 +7187,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42867c8e), SkBits2Float(0x42429f13));
path.cubicTo(SkBits2Float(0x427eb473), SkBits2Float(0x4256572c), SkBits2Float(0x426e4fbb), SkBits2Float(0x42686e49), SkBits2Float(0x425c16a2), SkBits2Float(0x427890ea));
path.lineTo(SkBits2Float(0x421f199c), SkBits2Float(0x4233afb3));
@@ -7202,7 +7202,7 @@
static void battleOp262(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3725ffa9), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41f9750b), SkBits2Float(0xc2a5ffff), SkBits2Float(0x426eeefa), SkBits2Float(0xc2830bb8), SkBits2Float(0x4293d569), SkBits2Float(0xc2170343));
@@ -7216,7 +7216,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x425c16a1), SkBits2Float(0x427890eb));
path.cubicTo(SkBits2Float(0x41ed85e5), SkBits2Float(0x42a9245e), SkBits2Float(0xc0d70d9a), SkBits2Float(0x42b2c211), SkBits2Float(0xc2140612), SkBits2Float(0x42949665));
path.cubicTo(SkBits2Float(0xc2869539), SkBits2Float(0x426cd56f), SkBits2Float(0xc2aac701), SkBits2Float(0x41d9ff9c), SkBits2Float(0xc2a57e3b), SkBits2Float(0xc0cf6824));
@@ -7235,7 +7235,7 @@
static void battleOp263(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41fc38da), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4271556b), SkBits2Float(0xc2824656), SkBits2Float(0x4294b266), SkBits2Float(0xc213956f));
path.cubicTo(SkBits2Float(0x42b0ba15), SkBits2Float(0xc10a78c9), SkBits2Float(0x42aa55de), SkBits2Float(0x41c8b65d), SkBits2Float(0x42843343), SkBits2Float(0x4248ca15));
@@ -7247,7 +7247,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42843344), SkBits2Float(0x4248ca14));
path.cubicTo(SkBits2Float(0x4279865a), SkBits2Float(0x425c60b2), SkBits2Float(0x426884b7), SkBits2Float(0x426e4097), SkBits2Float(0x4255b1c1), SkBits2Float(0x427e1584));
path.lineTo(SkBits2Float(0x421a7a55), SkBits2Float(0x4237acdc));
@@ -7262,7 +7262,7 @@
static void battleOp264(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41fc38da), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4271556b), SkBits2Float(0xc2824656), SkBits2Float(0x4294b266), SkBits2Float(0xc213956f));
@@ -7276,7 +7276,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4255b1c2), SkBits2Float(0x427e1586));
path.cubicTo(SkBits2Float(0x41d9eb88), SkBits2Float(0x42ab15b8), SkBits2Float(0xc11c5ee2), SkBits2Float(0x42b27b8c), SkBits2Float(0xc21f2fec), SkBits2Float(0x4291ac82));
path.cubicTo(SkBits2Float(0xc28ba40f), SkBits2Float(0x4261baf0), SkBits2Float(0xc2ad6782), SkBits2Float(0x41ba4aab), SkBits2Float(0xc2a4a120), SkBits2Float(0xc12a4d95));
@@ -7295,7 +7295,7 @@
static void battleOp265(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41fe7454), SkBits2Float(0xc2a5ffff), SkBits2Float(0x427343e8), SkBits2Float(0xc281a57b), SkBits2Float(0x429560d9), SkBits2Float(0xc210ce12));
path.cubicTo(SkBits2Float(0x42b11fbd), SkBits2Float(0xc0f2896e), SkBits2Float(0x42a9b750), SkBits2Float(0x41d3a0ba), SkBits2Float(0x42824e39), SkBits2Float(0x424daf12));
@@ -7307,7 +7307,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42824e38), SkBits2Float(0x424daf15));
path.cubicTo(SkBits2Float(0x42753e9a), SkBits2Float(0x4261276c), SkBits2Float(0x4263be9a), SkBits2Float(0x4272d73c), SkBits2Float(0x4250704b), SkBits2Float(0x428134df));
path.lineTo(SkBits2Float(0x4216adb6), SkBits2Float(0x423acdfc));
@@ -7322,7 +7322,7 @@
static void battleOp266(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x41fe7454), SkBits2Float(0xc2a5ffff), SkBits2Float(0x427343e8), SkBits2Float(0xc281a57b), SkBits2Float(0x429560d9), SkBits2Float(0xc210ce12));
@@ -7338,7 +7338,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4250704d), SkBits2Float(0x428134e0));
path.cubicTo(SkBits2Float(0x41c9effb), SkBits2Float(0x42ac8cba), SkBits2Float(0xc143bd6b), SkBits2Float(0x42b21c58), SkBits2Float(0xc2280561), SkBits2Float(0x428f2c0c));
path.cubicTo(SkBits2Float(0xc28f8db2), SkBits2Float(0x42587782), SkBits2Float(0xc2af41ba), SkBits2Float(0x41a05b8a), SkBits2Float(0xc2a3a0d2), SkBits2Float(0xc15fb01a));
@@ -7357,7 +7357,7 @@
static void battleOp267(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42003b3a), SkBits2Float(0xc2a60000), SkBits2Float(0x4274ff8d), SkBits2Float(0xc28113a0), SkBits2Float(0x4295fac2), SkBits2Float(0xc20e4c24));
path.cubicTo(SkBits2Float(0x42b175be), SkBits2Float(0xc0d38840), SkBits2Float(0x42a91fa3), SkBits2Float(0x41dd6a3d), SkBits2Float(0x42809081), SkBits2Float(0x4252054f));
@@ -7369,7 +7369,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42809082), SkBits2Float(0x4252054e));
path.cubicTo(SkBits2Float(0x4271521d), SkBits2Float(0x42655feb), SkBits2Float(0x425f60c7), SkBits2Float(0x4276e1ca), SkBits2Float(0x424ba43f), SkBits2Float(0x42831ae1));
path.lineTo(SkBits2Float(0x421335f7), SkBits2Float(0x423d8ca7));
@@ -7384,7 +7384,7 @@
static void battleOp268(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3697ff52), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42003b3a), SkBits2Float(0xc2a60000), SkBits2Float(0x4274ff8d), SkBits2Float(0xc28113a0), SkBits2Float(0x4295fac2), SkBits2Float(0xc20e4c24));
@@ -7398,7 +7398,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x424ba440), SkBits2Float(0x42831ae2));
path.cubicTo(SkBits2Float(0x41bb72ba), SkBits2Float(0x42adc9b8), SkBits2Float(0xc16714ca), SkBits2Float(0x42b1a998), SkBits2Float(0xc22fd30d), SkBits2Float(0x428ccf5c));
path.cubicTo(SkBits2Float(0xc292f074), SkBits2Float(0x424fea41), SkBits2Float(0xc2b0b757), SkBits2Float(0x4188cdbd), SkBits2Float(0xc2a27f7d), SkBits2Float(0xc187abb1));
@@ -7417,7 +7417,7 @@
static void battleOp269(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42011047), SkBits2Float(0xc2a60000), SkBits2Float(0x42766e56), SkBits2Float(0xc28099ef), SkBits2Float(0x42967824), SkBits2Float(0xc20c36c8));
path.cubicTo(SkBits2Float(0x42b1b91c), SkBits2Float(0xc0b9cd9b), SkBits2Float(0x42a89b7a), SkBits2Float(0x41e5804f), SkBits2Float(0x427e310b), SkBits2Float(0x42559106));
@@ -7429,7 +7429,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x427e3109), SkBits2Float(0x42559108));
path.cubicTo(SkBits2Float(0x426e0477), SkBits2Float(0x4268d13b), SkBits2Float(0x425bb575), SkBits2Float(0x427a2b1d), SkBits2Float(0x42479e2a), SkBits2Float(0x4284a4a0));
path.lineTo(SkBits2Float(0x42104d52), SkBits2Float(0x423fc5ea));
@@ -7444,7 +7444,7 @@
static void battleOp270(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb7060057), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42011047), SkBits2Float(0xc2a60000), SkBits2Float(0x42766e56), SkBits2Float(0xc28099ef), SkBits2Float(0x42967824), SkBits2Float(0xc20c36c8));
@@ -7453,7 +7453,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42479e29), SkBits2Float(0x4284a4a0));
path.cubicTo(SkBits2Float(0x41af5d68), SkBits2Float(0x42aec1b4), SkBits2Float(0xc1822698), SkBits2Float(0x42b135a9), SkBits2Float(0xc2362f3e), SkBits2Float(0x428ac623));
path.cubicTo(SkBits2Float(0xc295a599), SkBits2Float(0x4248ad36), SkBits2Float(0xc2b1c6ab), SkBits2Float(0x416a48a9), SkBits2Float(0xc2a165f3), SkBits2Float(0xc19b42cf));
@@ -7472,7 +7472,7 @@
static void battleOp271(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4201b43a), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4277880a), SkBits2Float(0xc2803bc7), SkBits2Float(0x4296d747), SkBits2Float(0xc20a9b85));
path.cubicTo(SkBits2Float(0x42b1ea89), SkBits2Float(0xc0a5fbe3), SkBits2Float(0x42a831cc), SkBits2Float(0x41ebb52f), SkBits2Float(0x427be65b), SkBits2Float(0x425843c9));
@@ -7484,7 +7484,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x427be65e), SkBits2Float(0x425843c9));
path.cubicTo(SkBits2Float(0x426b71bd), SkBits2Float(0x426b6e8c), SkBits2Float(0x4258dad9), SkBits2Float(0x427ca87a), SkBits2Float(0x42447e14), SkBits2Float(0x4285cdfb));
path.lineTo(SkBits2Float(0x420e0af4), SkBits2Float(0x424173d3));
@@ -7499,7 +7499,7 @@
static void battleOp272(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4201b43a), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4277880a), SkBits2Float(0xc2803bc7), SkBits2Float(0x4296d747), SkBits2Float(0xc20a9b85));
@@ -7515,7 +7515,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42447e16), SkBits2Float(0x4285cdfb));
path.cubicTo(SkBits2Float(0x41a605d7), SkBits2Float(0x42af776a), SkBits2Float(0xc18d5e26), SkBits2Float(0x42b0cfa2), SkBits2Float(0xc23b02ad), SkBits2Float(0x428928e1));
path.cubicTo(SkBits2Float(0xc297ab24), SkBits2Float(0x42430442), SkBits2Float(0xc2b27fa9), SkBits2Float(0x414bdf0d), SkBits2Float(0xc2a073c8), SkBits2Float(0xc1aa3a13));
@@ -7534,7 +7534,7 @@
static void battleOp273(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42023f77), SkBits2Float(0xc2a5ffff), SkBits2Float(0x427876e4), SkBits2Float(0xc27fd6f4), SkBits2Float(0x42972728), SkBits2Float(0xc2093dbb));
path.cubicTo(SkBits2Float(0x42b212de), SkBits2Float(0xc0952410), SkBits2Float(0x42a7d55b), SkBits2Float(0x41f0f791), SkBits2Float(0x4279eebf), SkBits2Float(0x425a890b));
@@ -7546,7 +7546,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4279eebd), SkBits2Float(0x425a890e));
path.cubicTo(SkBits2Float(0x42693cf3), SkBits2Float(0x426da0dc), SkBits2Float(0x42566929), SkBits2Float(0x427ebed8), SkBits2Float(0x4241d1ac), SkBits2Float(0x4286c6a2));
path.lineTo(SkBits2Float(0x420c1c33), SkBits2Float(0x4242db53));
@@ -7561,7 +7561,7 @@
static void battleOp274(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb630015d), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42023f77), SkBits2Float(0xc2a5ffff), SkBits2Float(0x427876e4), SkBits2Float(0xc27fd6f4), SkBits2Float(0x42972728), SkBits2Float(0xc2093dbb));
@@ -7573,7 +7573,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4241d1ad), SkBits2Float(0x4286c6a2));
path.cubicTo(SkBits2Float(0x419e0f8e), SkBits2Float(0x42b00b7b), SkBits2Float(0xc196dfc4), SkBits2Float(0x42b07042), SkBits2Float(0xc23f0fa7), SkBits2Float(0x4287c1be));
path.cubicTo(SkBits2Float(0xc29957b6), SkBits2Float(0x423e2672), SkBits2Float(0xc2b30c7a), SkBits2Float(0x4131f351), SkBits2Float(0xc29f94d8), SkBits2Float(0xc1b6db1d));
@@ -7592,7 +7592,7 @@
static void battleOp275(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4202aab9), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42792ea4), SkBits2Float(0xc27f5acc), SkBits2Float(0x4297641b), SkBits2Float(0xc2082fee));
path.cubicTo(SkBits2Float(0x42b230e5), SkBits2Float(0xc0882884), SkBits2Float(0x42a78c73), SkBits2Float(0x41f502e3), SkBits2Float(0x4278676f), SkBits2Float(0x425c4571));
@@ -7604,7 +7604,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42786771), SkBits2Float(0x425c4570));
path.cubicTo(SkBits2Float(0x42678692), SkBits2Float(0x426f4e2b), SkBits2Float(0x425483f6), SkBits2Float(0x42802b0f), SkBits2Float(0x423fbf6b), SkBits2Float(0x428783bc));
path.lineTo(SkBits2Float(0x420a9ce1), SkBits2Float(0x4243ecb9));
@@ -7619,7 +7619,7 @@
static void battleOp276(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3725ffa9), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4202aab9), SkBits2Float(0xc2a5ffff), SkBits2Float(0x42792ea4), SkBits2Float(0xc27f5acc), SkBits2Float(0x4297641b), SkBits2Float(0xc2082fee));
@@ -7634,7 +7634,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423fbf6b), SkBits2Float(0x428783bc));
path.cubicTo(SkBits2Float(0x4197e908), SkBits2Float(0x42b0799e), SkBits2Float(0xc19e2f01), SkBits2Float(0x42b0215b), SkBits2Float(0xc24226b0), SkBits2Float(0x4286a80b));
path.cubicTo(SkBits2Float(0xc29a9aef), SkBits2Float(0x423a5d79), SkBits2Float(0xc2b36ebb), SkBits2Float(0x411dee4a), SkBits2Float(0xc29ede64), SkBits2Float(0xc1c087c1));
@@ -7653,7 +7653,7 @@
static void battleOp277(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4202f62b), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4279afc7), SkBits2Float(0xc27f0340), SkBits2Float(0x42978eaf), SkBits2Float(0xc20771fd));
path.cubicTo(SkBits2Float(0x42b2457b), SkBits2Float(0xc07e0b91), SkBits2Float(0x42a7584a), SkBits2Float(0x41f7da1e), SkBits2Float(0x42775276), SkBits2Float(0x425d7c3f));
@@ -7665,7 +7665,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42775277), SkBits2Float(0x425d7c41));
path.cubicTo(SkBits2Float(0x4266507b), SkBits2Float(0x42707a20), SkBits2Float(0x42532cff), SkBits2Float(0x4280b928), SkBits2Float(0x423e48db), SkBits2Float(0x42880779));
path.lineTo(SkBits2Float(0x42098e1c), SkBits2Float(0x4244ab32));
@@ -7680,7 +7680,7 @@
static void battleOp278(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb7240057), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x4202f62b), SkBits2Float(0xc2a5ffff), SkBits2Float(0x4279afc7), SkBits2Float(0xc27f0340), SkBits2Float(0x42978eaf), SkBits2Float(0xc20771fd));
@@ -7695,7 +7695,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423e48db), SkBits2Float(0x4288077a));
path.cubicTo(SkBits2Float(0x41939344), SkBits2Float(0x42b0c509), SkBits2Float(0xc1a3515b), SkBits2Float(0x42afe6ff), SkBits2Float(0xc2444efb), SkBits2Float(0x4285df44));
path.cubicTo(SkBits2Float(0xc29b7aa2), SkBits2Float(0x4237af14), SkBits2Float(0xc2b3ae7d), SkBits2Float(0x410fd2d1), SkBits2Float(0xc29e5879), SkBits2Float(0xc1c74e5b));
@@ -7714,7 +7714,7 @@
static void battleOp279(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x420331e6), SkBits2Float(0xc2a60000), SkBits2Float(0x427a15f4), SkBits2Float(0xc27ebdd3), SkBits2Float(0x4297b03a), SkBits2Float(0xc206db86));
path.cubicTo(SkBits2Float(0x42b2557a), SkBits2Float(0xc06f9378), SkBits2Float(0x42a72e7e), SkBits2Float(0x41fa194a), SkBits2Float(0x4276762d), SkBits2Float(0x425e7148));
@@ -7726,7 +7726,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4276762e), SkBits2Float(0x425e7147));
path.cubicTo(SkBits2Float(0x42655a01), SkBits2Float(0x42716669), SkBits2Float(0x42521c84), SkBits2Float(0x428128fd), SkBits2Float(0x423d1f69), SkBits2Float(0x42886f05));
path.lineTo(SkBits2Float(0x4208b718), SkBits2Float(0x424540e7));
@@ -7741,7 +7741,7 @@
static void battleOp280(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3707ffa9), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x420331e6), SkBits2Float(0xc2a60000), SkBits2Float(0x427a15f4), SkBits2Float(0xc27ebdd3), SkBits2Float(0x4297b03a), SkBits2Float(0xc206db86));
@@ -7757,7 +7757,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423d1f69), SkBits2Float(0x42886f06));
path.cubicTo(SkBits2Float(0x4190236c), SkBits2Float(0x42b0ff8c), SkBits2Float(0xc1a760b7), SkBits2Float(0x42afb726), SkBits2Float(0xc24601c7), SkBits2Float(0x42853ece));
path.cubicTo(SkBits2Float(0xc29c2998), SkBits2Float(0x42358ced), SkBits2Float(0xc2b3ddd5), SkBits2Float(0x4104a433), SkBits2Float(0xc29deb35), SkBits2Float(0xc1cca70e));
@@ -7776,7 +7776,7 @@
static void battleOp281(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42035955), SkBits2Float(0xc2a5ffff), SkBits2Float(0x427a595d), SkBits2Float(0xc27e8fe6), SkBits2Float(0x4297c647), SkBits2Float(0xc206781b));
path.cubicTo(SkBits2Float(0x42b25fdf), SkBits2Float(0xc0660504), SkBits2Float(0x42a712a2), SkBits2Float(0x41fb94c7), SkBits2Float(0x4275e43b), SkBits2Float(0x425f1290));
@@ -7788,7 +7788,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4275e43b), SkBits2Float(0x425f1292));
path.cubicTo(SkBits2Float(0x4264b6c3), SkBits2Float(0x427201df), SkBits2Float(0x4251681e), SkBits2Float(0x42817283), SkBits2Float(0x423c5a8f), SkBits2Float(0x4288b309));
path.lineTo(SkBits2Float(0x420828ca), SkBits2Float(0x4245a33c));
@@ -7803,7 +7803,7 @@
static void battleOp282(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3637fea5), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42035955), SkBits2Float(0xc2a5ffff), SkBits2Float(0x427a595d), SkBits2Float(0xc27e8fe6), SkBits2Float(0x4297c647), SkBits2Float(0xc206781b));
@@ -7818,7 +7818,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423c5a8f), SkBits2Float(0x4288b30a));
path.cubicTo(SkBits2Float(0x418dddd4), SkBits2Float(0x42b12599), SkBits2Float(0xc1aa0e7c), SkBits2Float(0x42af96c0), SkBits2Float(0xc2471fb7), SkBits2Float(0x4284d41e));
path.cubicTo(SkBits2Float(0xc29c9c18), SkBits2Float(0x423422f8), SkBits2Float(0xc2b3fb95), SkBits2Float(0x40fa8096), SkBits2Float(0xc29da17e), SkBits2Float(0xc1d02ca0));
@@ -7837,7 +7837,7 @@
static void battleOp283(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42036bf7), SkBits2Float(0xc2a60000), SkBits2Float(0x427a7934), SkBits2Float(0xc27e7a35), SkBits2Float(0x4297d0ad), SkBits2Float(0xc2064926));
path.cubicTo(SkBits2Float(0x42b264c0), SkBits2Float(0xc061818a), SkBits2Float(0x42a70569), SkBits2Float(0x41fc47ee), SkBits2Float(0x42759f2d), SkBits2Float(0x425f5e99));
@@ -7849,7 +7849,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42759f2b), SkBits2Float(0x425f5e9b));
path.cubicTo(SkBits2Float(0x42646988), SkBits2Float(0x42724b20), SkBits2Float(0x425112cb), SkBits2Float(0x42819524), SkBits2Float(0x423bfd7a), SkBits2Float(0x4288d30e));
path.lineTo(SkBits2Float(0x4207e580), SkBits2Float(0x4245d187));
@@ -7864,7 +7864,7 @@
static void battleOp284(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3707ffa9), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42036bf7), SkBits2Float(0xc2a60000), SkBits2Float(0x427a7934), SkBits2Float(0xc27e7a35), SkBits2Float(0x4297d0ad), SkBits2Float(0xc2064926));
@@ -7873,7 +7873,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bfd7a), SkBits2Float(0x4288d30e));
path.cubicTo(SkBits2Float(0x418ccafd), SkBits2Float(0x42b13768), SkBits2Float(0xc1ab522b), SkBits2Float(0x42af873b), SkBits2Float(0xc247a66c), SkBits2Float(0x4284a188));
path.cubicTo(SkBits2Float(0xc29cd1e0), SkBits2Float(0x423377ac), SkBits2Float(0xc2b40936), SkBits2Float(0x40f384e7), SkBits2Float(0xc29d7e41), SkBits2Float(0xc1d1d5b9));
@@ -7892,7 +7892,7 @@
static void battleOp285(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x420374f9), SkBits2Float(0xc2a5ffff), SkBits2Float(0x427a8897), SkBits2Float(0xc27e6fb3), SkBits2Float(0x4297d5b1), SkBits2Float(0xc2063270));
path.cubicTo(SkBits2Float(0x42b26718), SkBits2Float(0xc05f52ba), SkBits2Float(0x42a6ff00), SkBits2Float(0x41fc9e87), SkBits2Float(0x42757dbf), SkBits2Float(0x425f8353));
@@ -7904,7 +7904,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757dc1), SkBits2Float(0x425f8353));
path.cubicTo(SkBits2Float(0x4264442b), SkBits2Float(0x42726e80), SkBits2Float(0x4250e985), SkBits2Float(0x4281a5dc), SkBits2Float(0x423bd072), SkBits2Float(0x4288e283));
path.lineTo(SkBits2Float(0x4207c4f4), SkBits2Float(0x4245e7df));
@@ -7919,7 +7919,7 @@
static void battleOp286(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb630015b), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x420374f9), SkBits2Float(0xc2a5ffff), SkBits2Float(0x427a8897), SkBits2Float(0xc27e6fb3), SkBits2Float(0x4297d5b1), SkBits2Float(0xc2063270));
@@ -7933,7 +7933,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bd073), SkBits2Float(0x4288e283));
path.cubicTo(SkBits2Float(0x418c461b), SkBits2Float(0x42b13ffc), SkBits2Float(0xc1abee9c), SkBits2Float(0x42af7fac), SkBits2Float(0xc247e775), SkBits2Float(0x42848907));
path.cubicTo(SkBits2Float(0xc29cebcd), SkBits2Float(0x423324c4), SkBits2Float(0xc2b40fb2), SkBits2Float(0x40f02474), SkBits2Float(0xc29d6d1c), SkBits2Float(0xc1d2a316));
@@ -7952,7 +7952,7 @@
static void battleOp287(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x420377c9), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8d67), SkBits2Float(0xc27e6c6d), SkBits2Float(0x4297d744), SkBits2Float(0xc2062b59));
path.cubicTo(SkBits2Float(0x42b267d3), SkBits2Float(0xc05ea43d), SkBits2Float(0x42a6fd01), SkBits2Float(0x41fcb991), SkBits2Float(0x42757351), SkBits2Float(0x425f8ecb));
@@ -7964,7 +7964,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757350), SkBits2Float(0x425f8ecb));
path.cubicTo(SkBits2Float(0x42643881), SkBits2Float(0x4272798e), SkBits2Float(0x4250dca0), SkBits2Float(0x4281ab15), SkBits2Float(0x423bc262), SkBits2Float(0x4288e756));
path.lineTo(SkBits2Float(0x4207bac8), SkBits2Float(0x4245eed9));
@@ -7979,7 +7979,7 @@
static void battleOp288(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x420377c9), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8d67), SkBits2Float(0xc27e6c6d), SkBits2Float(0x4297d744), SkBits2Float(0xc2062b59));
@@ -7994,7 +7994,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc261), SkBits2Float(0x4288e756));
path.cubicTo(SkBits2Float(0x418c1c95), SkBits2Float(0x42b142a6), SkBits2Float(0xc1ac1f7e), SkBits2Float(0x42af7d4d), SkBits2Float(0xc247fbc6), SkBits2Float(0x4284815d));
path.cubicTo(SkBits2Float(0xc29cf3e6), SkBits2Float(0x42330ad8), SkBits2Float(0xc2b411b5), SkBits2Float(0x40ef163d), SkBits2Float(0xc29d67bc), SkBits2Float(0xc1d2e345));
@@ -8013,7 +8013,7 @@
static void battleOp289(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -8025,7 +8025,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -8040,7 +8040,7 @@
static void battleOp290(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -8055,7 +8055,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -8074,7 +8074,7 @@
static void battleOp291(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -8086,7 +8086,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -8101,7 +8101,7 @@
static void battleOp292(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -8116,7 +8116,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -8135,7 +8135,7 @@
static void battleOp293(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -8147,7 +8147,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -8162,7 +8162,7 @@
static void battleOp294(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -8177,7 +8177,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -8196,7 +8196,7 @@
static void battleOp295(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -8208,7 +8208,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -8223,7 +8223,7 @@
static void battleOp296(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -8238,7 +8238,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -8257,7 +8257,7 @@
static void battleOp297(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -8269,7 +8269,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -8284,7 +8284,7 @@
static void battleOp298(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -8299,7 +8299,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -8318,7 +8318,7 @@
static void battleOp299(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -8330,7 +8330,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -8345,7 +8345,7 @@
static void battleOp300(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -8360,7 +8360,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -8379,7 +8379,7 @@
static void battleOp301(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -8391,7 +8391,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -8406,7 +8406,7 @@
static void battleOp302(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -8421,7 +8421,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -8440,7 +8440,7 @@
static void battleOp303(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -8452,7 +8452,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -8467,7 +8467,7 @@
static void battleOp304(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -8482,7 +8482,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -8501,7 +8501,7 @@
static void battleOp305(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -8513,7 +8513,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -8528,7 +8528,7 @@
static void battleOp306(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -8543,7 +8543,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -8562,7 +8562,7 @@
static void battleOp307(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -8574,7 +8574,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -8589,7 +8589,7 @@
static void battleOp308(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -8604,7 +8604,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -8623,7 +8623,7 @@
static void battleOp309(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -8635,7 +8635,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -8650,7 +8650,7 @@
static void battleOp310(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -8665,7 +8665,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -8684,7 +8684,7 @@
static void battleOp311(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -8696,7 +8696,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -8711,7 +8711,7 @@
static void battleOp312(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -8726,7 +8726,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -8745,7 +8745,7 @@
static void battleOp313(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -8757,7 +8757,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -8772,7 +8772,7 @@
static void battleOp314(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -8787,7 +8787,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -8806,7 +8806,7 @@
static void battleOp315(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -8818,7 +8818,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -8833,7 +8833,7 @@
static void battleOp316(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -8848,7 +8848,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -8867,7 +8867,7 @@
static void battleOp317(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -8879,7 +8879,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -8894,7 +8894,7 @@
static void battleOp318(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -8909,7 +8909,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -8928,7 +8928,7 @@
static void battleOp319(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -8940,7 +8940,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -8955,7 +8955,7 @@
static void battleOp320(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -8970,7 +8970,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -8989,7 +8989,7 @@
static void battleOp321(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -9001,7 +9001,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -9016,7 +9016,7 @@
static void battleOp322(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -9031,7 +9031,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -9050,7 +9050,7 @@
static void battleOp323(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -9062,7 +9062,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -9077,7 +9077,7 @@
static void battleOp324(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -9092,7 +9092,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -9111,7 +9111,7 @@
static void battleOp325(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -9123,7 +9123,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -9138,7 +9138,7 @@
static void battleOp326(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -9153,7 +9153,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -9172,7 +9172,7 @@
static void battleOp327(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -9184,7 +9184,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -9199,7 +9199,7 @@
static void battleOp328(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -9214,7 +9214,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -9233,7 +9233,7 @@
static void battleOp329(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -9245,7 +9245,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -9260,7 +9260,7 @@
static void battleOp330(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -9275,7 +9275,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -9294,7 +9294,7 @@
static void battleOp331(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -9306,7 +9306,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -9321,7 +9321,7 @@
static void battleOp332(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -9336,7 +9336,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -9355,7 +9355,7 @@
static void battleOp333(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -9367,7 +9367,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -9382,7 +9382,7 @@
static void battleOp334(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -9397,7 +9397,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -9416,7 +9416,7 @@
static void battleOp335(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -9428,7 +9428,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -9443,7 +9443,7 @@
static void battleOp336(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -9458,7 +9458,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -9477,7 +9477,7 @@
static void battleOp337(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -9489,7 +9489,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -9504,7 +9504,7 @@
static void battleOp338(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -9519,7 +9519,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -9538,7 +9538,7 @@
static void battleOp339(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -9550,7 +9550,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -9565,7 +9565,7 @@
static void battleOp340(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -9580,7 +9580,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -9599,7 +9599,7 @@
static void battleOp341(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -9611,7 +9611,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -9626,7 +9626,7 @@
static void battleOp342(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -9641,7 +9641,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -9660,7 +9660,7 @@
static void battleOp343(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -9672,7 +9672,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -9687,7 +9687,7 @@
static void battleOp344(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -9702,7 +9702,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -9721,7 +9721,7 @@
static void battleOp345(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -9733,7 +9733,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -9748,7 +9748,7 @@
static void battleOp346(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -9763,7 +9763,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -9782,7 +9782,7 @@
static void battleOp347(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3d570205), SkBits2Float(0xc2a60000), SkBits2Float(0x3dd7026d), SkBits2Float(0xc2a5fffa), SkBits2Float(0x3e2141e6), SkBits2Float(0xc2a5ffed));
path.lineTo(SkBits2Float(0x3de92565), SkBits2Float(0xc26fffe4));
@@ -9792,7 +9792,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3e214267), SkBits2Float(0xc2a5ffec));
path.cubicTo(SkBits2Float(0x3e26a1f2), SkBits2Float(0xc2a5ffeb), SkBits2Float(0x3e2c025b), SkBits2Float(0xc2a5ffe9), SkBits2Float(0x3e3162c6), SkBits2Float(0xc2a5ffe7));
path.lineTo(SkBits2Float(0x3e003af5), SkBits2Float(0xc26fffde));
@@ -9807,7 +9807,7 @@
static void battleOp348(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x365677c0), SkBits2Float(0xc2700002));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3d570205), SkBits2Float(0xc2a60000), SkBits2Float(0x3dd7026d), SkBits2Float(0xc2a5fffa), SkBits2Float(0x3e2141e6), SkBits2Float(0xc2a5ffed));
@@ -9822,7 +9822,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3e3162a4), SkBits2Float(0xc2a5ffe8));
path.cubicTo(SkBits2Float(0x3e843f51), SkBits2Float(0xc2a5ffd1), SkBits2Float(0x3eafcce9), SkBits2Float(0xc2a5ffa8), SkBits2Float(0x3edb5a6f), SkBits2Float(0xc2a5ff6f));
path.lineTo(SkBits2Float(0x3e9e9160), SkBits2Float(0xc26fff2e));
@@ -9837,7 +9837,7 @@
static void battleOp349(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e678fda), SkBits2Float(0xc2a60000), SkBits2Float(0x3ee78f7d), SkBits2Float(0xc2a5ff87), SkBits2Float(0x3f2dab18), SkBits2Float(0xc2a5fe96));
path.lineTo(SkBits2Float(0x3efb15d4), SkBits2Float(0xc26ffdf3));
@@ -9847,7 +9847,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f2daad3), SkBits2Float(0xc2a5fe95));
path.cubicTo(SkBits2Float(0x3f3374d8), SkBits2Float(0xc2a5fe7b), SkBits2Float(0x3f393eae), SkBits2Float(0xc2a5fe62), SkBits2Float(0x3f3f0885), SkBits2Float(0xc2a5fe46));
path.lineTo(SkBits2Float(0x3f0a18b8), SkBits2Float(0xc26ffd84));
@@ -9862,7 +9862,7 @@
static void battleOp350(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e678fda), SkBits2Float(0xc2a60000), SkBits2Float(0x3ee78f7d), SkBits2Float(0xc2a5ff87), SkBits2Float(0x3f2dab18), SkBits2Float(0xc2a5fe96));
@@ -9875,7 +9875,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f3f0899), SkBits2Float(0xc2a5fe48));
path.cubicTo(SkBits2Float(0x3f8e6b81), SkBits2Float(0xc2a5fc98), SkBits2Float(0x3fbd51fb), SkBits2Float(0xc2a5f9aa), SkBits2Float(0x3fec36d3), SkBits2Float(0xc2a5f57e));
path.lineTo(SkBits2Float(0x3faac1d7), SkBits2Float(0xc26ff0d0));
@@ -9890,7 +9890,7 @@
static void battleOp351(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x403f62fc), SkBits2Float(0xc2a60000), SkBits2Float(0x40bf510b), SkBits2Float(0xc2a5ad41), SkBits2Float(0x410f39cc), SkBits2Float(0xc2a50821));
path.lineTo(SkBits2Float(0x40cf12cc), SkBits2Float(0xc26e99a0));
@@ -9900,7 +9900,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x410f39cd), SkBits2Float(0xc2a50820));
path.cubicTo(SkBits2Float(0x4113fb3b), SkBits2Float(0xc2a4f79d), SkBits2Float(0x4118bbf1), SkBits2Float(0xc2a4e648), SkBits2Float(0x411d7be1), SkBits2Float(0xc2a4d421));
path.lineTo(SkBits2Float(0x40e3b008), SkBits2Float(0xc26e4e75));
@@ -9914,7 +9914,7 @@
static void battleOp352(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e0b17a8), SkBits2Float(0xc2a60000), SkBits2Float(0x3e8b179e), SkBits2Float(0xc2a5ffd4), SkBits2Float(0x3ed0a337), SkBits2Float(0xc2a5ff7c));
@@ -9928,7 +9928,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3ee58048), SkBits2Float(0xc2a5ff61));
path.cubicTo(SkBits2Float(0x3f2b1987), SkBits2Float(0xc2a5fec4), SkBits2Float(0x3f637253), SkBits2Float(0xc2a5fdb6), SkBits2Float(0x3f8de535), SkBits2Float(0xc2a5fc35));
path.lineTo(SkBits2Float(0x3f4d269a), SkBits2Float(0xc26ffa85));
@@ -9942,7 +9942,7 @@
static void battleOp1390(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xb7240057), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x420377ff), SkBits2Float(0xc2a5ffff), SkBits2Float(0x427a8dc0), SkBits2Float(0xc27e6c2f), SkBits2Float(0x4297d760), SkBits2Float(0xc2062ad2));
@@ -9956,7 +9956,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc156), SkBits2Float(0x4288e7b2));
path.cubicTo(SkBits2Float(0x418c1984), SkBits2Float(0x42b142da), SkBits2Float(0xc1ac2314), SkBits2Float(0x42af7d21), SkBits2Float(0xc247fd43), SkBits2Float(0x428480ce));
path.cubicTo(SkBits2Float(0xc29cf47f), SkBits2Float(0x423308f3), SkBits2Float(0xc2b411dd), SkBits2Float(0x40ef0242), SkBits2Float(0xc29d6757), SkBits2Float(0xc1d2e807));
@@ -9975,7 +9975,7 @@
static void battleOp1391(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -9987,7 +9987,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -10002,7 +10002,7 @@
static void battleOp1392(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -10017,7 +10017,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -10036,7 +10036,7 @@
static void battleOp1393(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3c436965), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3cc36072), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3d128619), SkBits2Float(0xc2a5fffe));
path.lineTo(SkBits2Float(0x3cd3db06), SkBits2Float(0xc26fffff));
@@ -10046,7 +10046,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3d12888d), SkBits2Float(0xc2a5ffff));
path.cubicTo(SkBits2Float(0x3d176d55), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3d1c4dcb), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3d212e40), SkBits2Float(0xc2a5ffff));
path.lineTo(SkBits2Float(0x3ce90a84), SkBits2Float(0xc26ffffe));
@@ -10061,7 +10061,7 @@
static void battleOp1394(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x36606a00), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3c436965), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3cc36072), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3d128619), SkBits2Float(0xc2a5fffe));
@@ -10074,7 +10074,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3d212fd0), SkBits2Float(0xc2a5ffff));
path.cubicTo(SkBits2Float(0x3d705530), SkBits2Float(0xc2a5fffe), SkBits2Float(0x3d9fbf82), SkBits2Float(0xc2a5fffc), SkBits2Float(0x3dc7546b), SkBits2Float(0xc2a5fffa));
path.lineTo(SkBits2Float(0x3d901696), SkBits2Float(0xc26ffff5));
@@ -10089,7 +10089,7 @@
static void battleOp1395(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e06023f), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3e860192), SkBits2Float(0xc2a5ffd6), SkBits2Float(0x3ec901db), SkBits2Float(0xc2a5ff85));
path.lineTo(SkBits2Float(0x3e914e16), SkBits2Float(0xc26fff50));
@@ -10099,7 +10099,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3ec9015b), SkBits2Float(0xc2a5ff86));
path.cubicTo(SkBits2Float(0x3ecfb4f0), SkBits2Float(0xc2a5ff7d), SkBits2Float(0x3ed66842), SkBits2Float(0xc2a5ff75), SkBits2Float(0x3edd1b92), SkBits2Float(0xc2a5ff6c));
path.lineTo(SkBits2Float(0x3e9fd5de), SkBits2Float(0xc26fff2b));
@@ -10114,7 +10114,7 @@
static void battleOp1396(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e0601e9), SkBits2Float(0xc2a60000), SkBits2Float(0x3e86013c), SkBits2Float(0xc2a5ffd6), SkBits2Float(0x3ec9015a), SkBits2Float(0xc2a5ff85));
@@ -10127,7 +10127,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3edd1b0d), SkBits2Float(0xc2a5ff6d));
path.cubicTo(SkBits2Float(0x3f24d70e), SkBits2Float(0xc2a5fedc), SkBits2Float(0x3f5b204e), SkBits2Float(0xc2a5fde1), SkBits2Float(0x3f88b475), SkBits2Float(0xc2a5fc7b));
path.lineTo(SkBits2Float(0x3f45a57e), SkBits2Float(0xc26ffaea));
@@ -10141,7 +10141,7 @@
static void battleOp2193(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e3881bc), SkBits2Float(0xc2a60000), SkBits2Float(0x3eb88238), SkBits2Float(0xc2a5ffb3), SkBits2Float(0x3f0a6190), SkBits2Float(0xc2a5ff19));
path.lineTo(SkBits2Float(0x3ec8119b), SkBits2Float(0xc26ffeb2));
@@ -10151,7 +10151,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f0a6183), SkBits2Float(0xc2a5ff19));
path.cubicTo(SkBits2Float(0x3f0efe46), SkBits2Float(0xc2a5ff0a), SkBits2Float(0x3f139b44), SkBits2Float(0xc2a5fef9), SkBits2Float(0x3f183842), SkBits2Float(0xc2a5fee9));
path.lineTo(SkBits2Float(0x3edc1349), SkBits2Float(0xc26ffe6c));
@@ -10166,7 +10166,7 @@
static void battleOp2194(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3629eed0), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e3881ab), SkBits2Float(0xc2a60000), SkBits2Float(0x3eb88227), SkBits2Float(0xc2a5ffb3), SkBits2Float(0x3f0a6183), SkBits2Float(0xc2a5ff19));
@@ -10180,7 +10180,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f183800), SkBits2Float(0xc2a5fee9));
path.cubicTo(SkBits2Float(0x3f62f7a2), SkBits2Float(0xc2a5fdd7), SkBits2Float(0x3f96db12), SkBits2Float(0xc2a5fbfa), SkBits2Float(0x3fbc3981), SkBits2Float(0xc2a5f954));
path.lineTo(SkBits2Float(0x3f8810cc), SkBits2Float(0xc26ff65b));
@@ -10194,7 +10194,7 @@
static void battleOp3368(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -10209,7 +10209,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -10228,7 +10228,7 @@
static void battleOp3369(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -10240,7 +10240,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -10255,7 +10255,7 @@
static void battleOp3370(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -10270,7 +10270,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -10289,7 +10289,7 @@
static void battleOp3371(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3c85f8a2), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3d05fda5), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3d48fefa), SkBits2Float(0xc2a5fffd));
path.lineTo(SkBits2Float(0x3d114e3a), SkBits2Float(0xc26ffffd));
@@ -10299,7 +10299,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3d49018c), SkBits2Float(0xc2a5fffe));
path.cubicTo(SkBits2Float(0x3d4fb7df), SkBits2Float(0xc2a5fffd), SkBits2Float(0x3d5667bf), SkBits2Float(0xc2a5fffd), SkBits2Float(0x3d5d179f), SkBits2Float(0xc2a5fffd));
path.lineTo(SkBits2Float(0x3d1fd60d), SkBits2Float(0xc26ffffd));
@@ -10314,7 +10314,7 @@
static void battleOp3372(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3c85f8a2), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3d05fda5), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3d48fefa), SkBits2Float(0xc2a5fffd));
@@ -10328,7 +10328,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3d5d1b4e), SkBits2Float(0xc2a5fffe));
path.cubicTo(SkBits2Float(0x3da4d661), SkBits2Float(0xc2a5fffc), SkBits2Float(0x3ddb1fb1), SkBits2Float(0xc2a5fff8), SkBits2Float(0x3e08b47e), SkBits2Float(0xc2a5fff2));
path.lineTo(SkBits2Float(0x3dc5a6e0), SkBits2Float(0xc26fffec));
@@ -10342,7 +10342,7 @@
static void battleOp4290(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -10357,7 +10357,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -10376,7 +10376,7 @@
static void battleOp4291(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -10388,7 +10388,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -10403,7 +10403,7 @@
static void battleOp4292(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -10418,7 +10418,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -10437,7 +10437,7 @@
static void battleOp4293(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
path.cubicTo(SkBits2Float(0x42b267e8), SkBits2Float(0xc05e90e8), SkBits2Float(0x42a6fcc7), SkBits2Float(0x41fcbc94), SkBits2Float(0x42757227), SkBits2Float(0x425f9011));
@@ -10449,7 +10449,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42757226), SkBits2Float(0x425f9012));
path.cubicTo(SkBits2Float(0x42643732), SkBits2Float(0x42727ac8), SkBits2Float(0x4250db30), SkBits2Float(0x4281abaa), SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.lineTo(SkBits2Float(0x4207b9a6), SkBits2Float(0x4245efa0));
@@ -10464,7 +10464,7 @@
static void battleOp4294(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x42037818), SkBits2Float(0xc2a60000), SkBits2Float(0x427a8dee), SkBits2Float(0xc27e6c10), SkBits2Float(0x4297d76f), SkBits2Float(0xc2062a8f));
@@ -10479,7 +10479,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x423bc0d1), SkBits2Float(0x4288e7e0));
path.cubicTo(SkBits2Float(0x418c17fd), SkBits2Float(0x42b142f1), SkBits2Float(0xc1ac24e4), SkBits2Float(0x42af7d09), SkBits2Float(0xc247fe03), SkBits2Float(0x42848083));
path.cubicTo(SkBits2Float(0xc29cf4c9), SkBits2Float(0x423307fa), SkBits2Float(0xc2b411ee), SkBits2Float(0x40eef84a), SkBits2Float(0xc29d6723), SkBits2Float(0xc1d2ea61));
@@ -10498,7 +10498,7 @@
static void battleOp4295(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e3881bc), SkBits2Float(0xc2a60000), SkBits2Float(0x3eb88238), SkBits2Float(0xc2a5ffb3), SkBits2Float(0x3f0a6190), SkBits2Float(0xc2a5ff19));
path.lineTo(SkBits2Float(0x3ec8119b), SkBits2Float(0xc26ffeb2));
@@ -10508,7 +10508,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f0a6183), SkBits2Float(0xc2a5ff19));
path.cubicTo(SkBits2Float(0x3f0efe46), SkBits2Float(0xc2a5ff0a), SkBits2Float(0x3f139b44), SkBits2Float(0xc2a5fef9), SkBits2Float(0x3f183842), SkBits2Float(0xc2a5fee9));
path.lineTo(SkBits2Float(0x3edc1349), SkBits2Float(0xc26ffe6c));
@@ -10523,7 +10523,7 @@
static void battleOp4296(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3629eed0), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e3881ab), SkBits2Float(0xc2a60000), SkBits2Float(0x3eb88227), SkBits2Float(0xc2a5ffb3), SkBits2Float(0x3f0a6183), SkBits2Float(0xc2a5ff19));
@@ -10537,7 +10537,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f183800), SkBits2Float(0xc2a5fee9));
path.cubicTo(SkBits2Float(0x3f62f7a2), SkBits2Float(0xc2a5fdd7), SkBits2Float(0x3f96db12), SkBits2Float(0xc2a5fbfa), SkBits2Float(0x3fbc3981), SkBits2Float(0xc2a5f954));
path.lineTo(SkBits2Float(0x3f8810cc), SkBits2Float(0xc26ff65b));
@@ -10551,7 +10551,7 @@
static void battleOp5193(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e0b17ea), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3e8b17df), SkBits2Float(0xc2a5ffd4), SkBits2Float(0x3ed0a399), SkBits2Float(0xc2a5ff7c));
path.lineTo(SkBits2Float(0x3e96d285), SkBits2Float(0xc26fff42));
@@ -10561,7 +10561,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3ed0a338), SkBits2Float(0xc2a5ff7d));
path.cubicTo(SkBits2Float(0x3ed797a0), SkBits2Float(0xc2a5ff73), SkBits2Float(0x3ede8c36), SkBits2Float(0xc2a5ff6a), SkBits2Float(0x3ee580cb), SkBits2Float(0xc2a5ff60));
path.lineTo(SkBits2Float(0x3ea5e78a), SkBits2Float(0xc26fff1b));
@@ -10576,7 +10576,7 @@
static void battleOp5194(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e0b17a8), SkBits2Float(0xc2a60000), SkBits2Float(0x3e8b179e), SkBits2Float(0xc2a5ffd4), SkBits2Float(0x3ed0a337), SkBits2Float(0xc2a5ff7c));
@@ -10590,7 +10590,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3ee58048), SkBits2Float(0xc2a5ff61));
path.cubicTo(SkBits2Float(0x3f2b1987), SkBits2Float(0xc2a5fec4), SkBits2Float(0x3f637253), SkBits2Float(0xc2a5fdb6), SkBits2Float(0x3f8de535), SkBits2Float(0xc2a5fc35));
path.lineTo(SkBits2Float(0x3f4d269a), SkBits2Float(0xc26ffa85));
@@ -10604,7 +10604,7 @@
static void battleOp402(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc2700000));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3e0b17a8), SkBits2Float(0xc2a60000), SkBits2Float(0x3e8b179e), SkBits2Float(0xc2a5ffd4), SkBits2Float(0x3ed0a337), SkBits2Float(0xc2a5ff7c));
@@ -10618,7 +10618,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3ee58048), SkBits2Float(0xc2a5ff61));
path.cubicTo(SkBits2Float(0x3f2b1987), SkBits2Float(0xc2a5fec4), SkBits2Float(0x3f637253), SkBits2Float(0xc2a5fdb6), SkBits2Float(0x3f8de535), SkBits2Float(0xc2a5fc35));
path.lineTo(SkBits2Float(0x3f4d269a), SkBits2Float(0xc26ffa85));
@@ -10632,7 +10632,7 @@
static void battleOp6000(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x27b71bcd), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3c9b2383), SkBits2Float(0xc2a60000), SkBits2Float(0x3d1b200b), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3d68ae54), SkBits2Float(0xc2a5fffd));
path.lineTo(SkBits2Float(0x3d283599), SkBits2Float(0xc26ffffc));
@@ -10642,7 +10642,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3d68b08b), SkBits2Float(0xc2a5fffd));
path.cubicTo(SkBits2Float(0x3d707589), SkBits2Float(0xc2a5fffd), SkBits2Float(0x3d783329), SkBits2Float(0xc2a5fffd), SkBits2Float(0x3d7ff0c9), SkBits2Float(0xc2a5fffd));
path.lineTo(SkBits2Float(0x3d3907c2), SkBits2Float(0xc26ffffc));
@@ -10656,7 +10656,7 @@
static void battleOp6001(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0xc26fffff));
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xc2a60000));
path.cubicTo(SkBits2Float(0x3c9b2383), SkBits2Float(0xc2a60000), SkBits2Float(0x3d1b200b), SkBits2Float(0xc2a5ffff), SkBits2Float(0x3d68ae54), SkBits2Float(0xc2a5fffd));
@@ -10669,7 +10669,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3d7ff566), SkBits2Float(0xc2a5fffd));
path.cubicTo(SkBits2Float(0x3dbed1a5), SkBits2Float(0xc2a5fffa), SkBits2Float(0x3dfda9cc), SkBits2Float(0xc2a5fff4), SkBits2Float(0x3e1e40f8), SkBits2Float(0xc2a5ffed));
path.lineTo(SkBits2Float(0x3de4ce81), SkBits2Float(0xc26fffe5));
diff --git a/tests/PathOpsBuildUseTest.cpp b/tests/PathOpsBuildUseTest.cpp
index da17067..4ad239d 100644
--- a/tests/PathOpsBuildUseTest.cpp
+++ b/tests/PathOpsBuildUseTest.cpp
@@ -13,6 +13,7 @@
SkOpBuilder builder;
SkPath path;
path.reset();
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x436ae68e), SkBits2Float(0x43adff26)); // 234.901f, 347.993f
path.quadTo(SkBits2Float(0x436ae68e), SkBits2Float(0x43b32ca2), SkBits2Float(0x4363940a), SkBits2Float(0x43b6d5e4)); // 234.901f, 358.349f, 227.578f, 365.671f
path.quadTo(SkBits2Float(0x435c4186), SkBits2Float(0x43ba7f26), SkBits2Float(0x4351e68e), SkBits2Float(0x43ba7f26)); // 220.256f, 372.993f, 209.901f, 372.993f
@@ -27,6 +28,7 @@
builder.add(path0, (SkPathOp) 2);
path.reset();
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43ad0aca), SkBits2Float(0x432a0e2c)); // 346.084f, 170.055f
path.quadTo(SkBits2Float(0x43ad0aca), SkBits2Float(0x43346924), SkBits2Float(0x43a96188), SkBits2Float(0x433bbba8)); // 346.084f, 180.411f, 338.762f, 187.733f
path.quadTo(SkBits2Float(0x43a5b846), SkBits2Float(0x43430e2c), SkBits2Float(0x43a08aca), SkBits2Float(0x43430e2c)); // 331.44f, 195.055f, 321.084f, 195.055f
@@ -41,6 +43,7 @@
builder.add(path1, (SkPathOp) 2);
path.reset();
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x431f14f9), SkBits2Float(0x433943fd)); // 159.082f, 185.266f
path.quadTo(SkBits2Float(0x431f14f9), SkBits2Float(0x43439ef4), SkBits2Float(0x4317c275), SkBits2Float(0x434af179)); // 159.082f, 195.621f, 151.76f, 202.943f
path.quadTo(SkBits2Float(0x43106ff0), SkBits2Float(0x435243fd), SkBits2Float(0x430614f9), SkBits2Float(0x435243fd)); // 144.437f, 210.266f, 134.082f, 210.266f
@@ -55,6 +58,7 @@
builder.add(path2, (SkPathOp) 2);
path.reset();
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x433ad67a), SkBits2Float(0x43abd585)); // 186.838f, 343.668f
path.quadTo(SkBits2Float(0x433ad67a), SkBits2Float(0x43b10301), SkBits2Float(0x433383f6), SkBits2Float(0x43b4ac43)); // 186.838f, 354.023f, 179.515f, 361.346f
path.quadTo(SkBits2Float(0x432c3172), SkBits2Float(0x43b85585), SkBits2Float(0x4321d67a), SkBits2Float(0x43b85585)); // 172.193f, 368.668f, 161.838f, 368.668f
@@ -69,7 +73,7 @@
builder.add(path3, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43bff91b), SkBits2Float(0x43973a57)); // 383.946f, 302.456f
path.quadTo(SkBits2Float(0x43bff91b), SkBits2Float(0x439c67d3), SkBits2Float(0x43bc4fd9), SkBits2Float(0x43a01115)); // 383.946f, 312.811f, 376.624f, 320.133f
path.quadTo(SkBits2Float(0x43b8a697), SkBits2Float(0x43a3ba57), SkBits2Float(0x43b3791b), SkBits2Float(0x43a3ba57)); // 369.301f, 327.456f, 358.946f, 327.456f
@@ -84,7 +88,7 @@
builder.add(path4, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43374c2c), SkBits2Float(0x437e8a30)); // 183.298f, 254.54f
path.quadTo(SkBits2Float(0x43374c2c), SkBits2Float(0x43847294), SkBits2Float(0x432ff9a8), SkBits2Float(0x43881bd6)); // 183.298f, 264.895f, 175.975f, 272.217f
path.quadTo(SkBits2Float(0x4328a724), SkBits2Float(0x438bc518), SkBits2Float(0x431e4c2c), SkBits2Float(0x438bc518)); // 168.653f, 279.54f, 158.298f, 279.54f
@@ -99,7 +103,7 @@
builder.add(path5, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x430e01e8), SkBits2Float(0x435c8671)); // 142.007f, 220.525f
path.quadTo(SkBits2Float(0x430e01e8), SkBits2Float(0x4366e168), SkBits2Float(0x4306af64), SkBits2Float(0x436e33ed)); // 142.007f, 230.88f, 134.685f, 238.203f
path.quadTo(SkBits2Float(0x42feb9bf), SkBits2Float(0x43758671), SkBits2Float(0x42ea03d0), SkBits2Float(0x43758671)); // 127.363f, 245.525f, 117.007f, 245.525f
@@ -114,7 +118,7 @@
builder.add(path6, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x438b7062), SkBits2Float(0x42d54bf2)); // 278.878f, 106.648f
path.quadTo(SkBits2Float(0x438b7062), SkBits2Float(0x42ea01e1), SkBits2Float(0x4387c720), SkBits2Float(0x42f8a6ea)); // 278.878f, 117.004f, 271.556f, 124.326f
path.quadTo(SkBits2Float(0x43841dde), SkBits2Float(0x4303a5f9), SkBits2Float(0x437de0c4), SkBits2Float(0x4303a5f9)); // 264.233f, 131.648f, 253.878f, 131.648f
@@ -129,7 +133,7 @@
builder.add(path7, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43de3ff6), SkBits2Float(0x43963745)); // 444.5f, 300.432f
path.quadTo(SkBits2Float(0x43de3ff6), SkBits2Float(0x439b64c1), SkBits2Float(0x43da96b4), SkBits2Float(0x439f0e03)); // 444.5f, 310.787f, 437.177f, 318.109f
path.quadTo(SkBits2Float(0x43d6ed72), SkBits2Float(0x43a2b745), SkBits2Float(0x43d1bff6), SkBits2Float(0x43a2b745)); // 429.855f, 325.432f, 419.5f, 325.432f
@@ -144,7 +148,7 @@
builder.add(path8, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43aae79c), SkBits2Float(0x438d0cbc)); // 341.809f, 282.099f
path.quadTo(SkBits2Float(0x43aae79c), SkBits2Float(0x43923a38), SkBits2Float(0x43a73e5a), SkBits2Float(0x4395e37a)); // 341.809f, 292.455f, 334.487f, 299.777f
path.quadTo(SkBits2Float(0x43a39518), SkBits2Float(0x43998cbc), SkBits2Float(0x439e679c), SkBits2Float(0x43998cbc)); // 327.165f, 307.099f, 316.809f, 307.099f
@@ -159,7 +163,7 @@
builder.add(path9, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4354ce7d), SkBits2Float(0x43842ec9)); // 212.807f, 264.366f
path.quadTo(SkBits2Float(0x4354ce7d), SkBits2Float(0x43895c45), SkBits2Float(0x434d7bf9), SkBits2Float(0x438d0587)); // 212.807f, 274.721f, 205.484f, 282.043f
path.quadTo(SkBits2Float(0x43462974), SkBits2Float(0x4390aec9), SkBits2Float(0x433bce7d), SkBits2Float(0x4390aec9)); // 198.162f, 289.366f, 187.807f, 289.366f
@@ -174,7 +178,7 @@
builder.add(path10, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43a8c299), SkBits2Float(0x432fce08)); // 337.52f, 175.805f
path.quadTo(SkBits2Float(0x43a8c299), SkBits2Float(0x433a2900), SkBits2Float(0x43a51957), SkBits2Float(0x43417b84)); // 337.52f, 186.16f, 330.198f, 193.482f
path.quadTo(SkBits2Float(0x43a17015), SkBits2Float(0x4348ce08), SkBits2Float(0x439c4299), SkBits2Float(0x4348ce08)); // 322.876f, 200.805f, 312.52f, 200.805f
@@ -189,7 +193,7 @@
builder.add(path11, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43d7486e), SkBits2Float(0x430ebc47)); // 430.566f, 142.735f
path.quadTo(SkBits2Float(0x43d7486e), SkBits2Float(0x4319173e), SkBits2Float(0x43d39f2c), SkBits2Float(0x432069c3)); // 430.566f, 153.091f, 423.244f, 160.413f
path.quadTo(SkBits2Float(0x43cff5ea), SkBits2Float(0x4327bc47), SkBits2Float(0x43cac86e), SkBits2Float(0x4327bc47)); // 415.921f, 167.735f, 405.566f, 167.735f
@@ -204,7 +208,7 @@
builder.add(path12, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43484ac4), SkBits2Float(0x43421f09)); // 200.292f, 194.121f
path.quadTo(SkBits2Float(0x43484ac4), SkBits2Float(0x434c7a00), SkBits2Float(0x4340f840), SkBits2Float(0x4353cc85)); // 200.292f, 204.477f, 192.97f, 211.799f
path.quadTo(SkBits2Float(0x4339a5bc), SkBits2Float(0x435b1f09), SkBits2Float(0x432f4ac4), SkBits2Float(0x435b1f09)); // 185.647f, 219.121f, 175.292f, 219.121f
@@ -219,7 +223,7 @@
builder.add(path13, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4328883e), SkBits2Float(0x42fb0be0)); // 168.532f, 125.523f
path.quadTo(SkBits2Float(0x4328883e), SkBits2Float(0x4307e0e7), SkBits2Float(0x432135ba), SkBits2Float(0x430f336c)); // 168.532f, 135.879f, 161.21f, 143.201f
path.quadTo(SkBits2Float(0x4319e336), SkBits2Float(0x431685f0), SkBits2Float(0x430f883e), SkBits2Float(0x431685f0)); // 153.888f, 150.523f, 143.532f, 150.523f
@@ -234,7 +238,7 @@
builder.add(path14, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43b2bff8), SkBits2Float(0x439bb140)); // 357.5f, 311.385f
path.quadTo(SkBits2Float(0x43b2bff8), SkBits2Float(0x43a0debc), SkBits2Float(0x43af16b6), SkBits2Float(0x43a487fe)); // 357.5f, 321.74f, 350.177f, 329.062f
path.quadTo(SkBits2Float(0x43ab6d74), SkBits2Float(0x43a83140), SkBits2Float(0x43a63ff8), SkBits2Float(0x43a83140)); // 342.855f, 336.385f, 332.5f, 336.385f
@@ -249,7 +253,7 @@
builder.add(path15, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x435ae426), SkBits2Float(0x4341f066)); // 218.891f, 193.939f
path.quadTo(SkBits2Float(0x435ae426), SkBits2Float(0x434c4b5e), SkBits2Float(0x435391a2), SkBits2Float(0x43539de2)); // 218.891f, 204.294f, 211.569f, 211.617f
path.quadTo(SkBits2Float(0x434c3f1e), SkBits2Float(0x435af066), SkBits2Float(0x4341e426), SkBits2Float(0x435af066)); // 204.247f, 218.939f, 193.891f, 218.939f
@@ -264,7 +268,7 @@
builder.add(path16, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x439817ba), SkBits2Float(0x42e83ba4)); // 304.185f, 116.116f
path.quadTo(SkBits2Float(0x439817ba), SkBits2Float(0x42fcf193), SkBits2Float(0x43946e78), SkBits2Float(0x4305cb4e)); // 304.185f, 126.472f, 296.863f, 133.794f
path.quadTo(SkBits2Float(0x4390c536), SkBits2Float(0x430d1dd2), SkBits2Float(0x438b97ba), SkBits2Float(0x430d1dd2)); // 289.541f, 141.116f, 279.185f, 141.116f
@@ -279,7 +283,7 @@
builder.add(path17, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4350558c), SkBits2Float(0x4382efb0)); // 208.334f, 261.873f
path.quadTo(SkBits2Float(0x4350558c), SkBits2Float(0x43881d2c), SkBits2Float(0x43490308), SkBits2Float(0x438bc66e)); // 208.334f, 272.228f, 201.012f, 279.55f
path.quadTo(SkBits2Float(0x4341b084), SkBits2Float(0x438f6fb0), SkBits2Float(0x4337558c), SkBits2Float(0x438f6fb0)); // 193.69f, 286.873f, 183.334f, 286.873f
@@ -294,7 +298,7 @@
builder.add(path18, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a8ec1a), SkBits2Float(0x43a51083)); // 84.4611f, 330.129f
path.quadTo(SkBits2Float(0x42a8ec1a), SkBits2Float(0x43aa3dff), SkBits2Float(0x429a4711), SkBits2Float(0x43ade741)); // 84.4611f, 340.484f, 77.1388f, 347.807f
path.quadTo(SkBits2Float(0x428ba209), SkBits2Float(0x43b19083), SkBits2Float(0x426dd834), SkBits2Float(0x43b19083)); // 69.8165f, 355.129f, 59.4611f, 355.129f
@@ -309,7 +313,7 @@
builder.add(path19, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43aca5fa), SkBits2Float(0x438f0f1d)); // 345.297f, 286.118f
path.quadTo(SkBits2Float(0x43aca5fa), SkBits2Float(0x43943c99), SkBits2Float(0x43a8fcb8), SkBits2Float(0x4397e5db)); // 345.297f, 296.473f, 337.974f, 303.796f
path.quadTo(SkBits2Float(0x43a55376), SkBits2Float(0x439b8f1d), SkBits2Float(0x43a025fa), SkBits2Float(0x439b8f1d)); // 330.652f, 311.118f, 320.297f, 311.118f
@@ -324,7 +328,7 @@
builder.add(path20, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43846cfc), SkBits2Float(0x431b61f0)); // 264.851f, 155.383f
path.quadTo(SkBits2Float(0x43846cfc), SkBits2Float(0x4325bce8), SkBits2Float(0x4380c3ba), SkBits2Float(0x432d0f6c)); // 264.851f, 165.738f, 257.529f, 173.06f
path.quadTo(SkBits2Float(0x437a34f0), SkBits2Float(0x433461f0), SkBits2Float(0x436fd9f8), SkBits2Float(0x433461f0)); // 250.207f, 180.383f, 239.851f, 180.383f
@@ -339,7 +343,7 @@
builder.add(path21, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x439597be), SkBits2Float(0x438dc3e1)); // 299.185f, 283.53f
path.quadTo(SkBits2Float(0x439597be), SkBits2Float(0x4392f15d), SkBits2Float(0x4391ee7c), SkBits2Float(0x43969a9f)); // 299.185f, 293.886f, 291.863f, 301.208f
path.quadTo(SkBits2Float(0x438e453a), SkBits2Float(0x439a43e1), SkBits2Float(0x438917be), SkBits2Float(0x439a43e1)); // 284.541f, 308.53f, 274.185f, 308.53f
@@ -354,7 +358,7 @@
builder.add(path22, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42db7a2b), SkBits2Float(0x43699568)); // 109.739f, 233.584f
path.quadTo(SkBits2Float(0x42db7a2b), SkBits2Float(0x4373f05f), SkBits2Float(0x42ccd522), SkBits2Float(0x437b42e3)); // 109.739f, 243.939f, 102.416f, 251.261f
path.quadTo(SkBits2Float(0x42be301a), SkBits2Float(0x43814ab4), SkBits2Float(0x42a97a2b), SkBits2Float(0x43814ab4)); // 95.0939f, 258.584f, 84.7386f, 258.584f
@@ -369,7 +373,7 @@
builder.add(path23, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x433bea80), SkBits2Float(0x43861662)); // 187.916f, 268.175f
path.quadTo(SkBits2Float(0x433bea80), SkBits2Float(0x438b43de), SkBits2Float(0x433497fc), SkBits2Float(0x438eed20)); // 187.916f, 278.53f, 180.594f, 285.853f
path.quadTo(SkBits2Float(0x432d4578), SkBits2Float(0x43929662), SkBits2Float(0x4322ea80), SkBits2Float(0x43929662)); // 173.271f, 293.175f, 162.916f, 293.175f
@@ -384,7 +388,7 @@
builder.add(path24, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4386aaee), SkBits2Float(0x43991356)); // 269.335f, 306.151f
path.quadTo(SkBits2Float(0x4386aaee), SkBits2Float(0x439e40d2), SkBits2Float(0x438301ac), SkBits2Float(0x43a1ea14)); // 269.335f, 316.506f, 262.013f, 323.829f
path.quadTo(SkBits2Float(0x437eb0d4), SkBits2Float(0x43a59356), SkBits2Float(0x437455dc), SkBits2Float(0x43a59356)); // 254.691f, 331.151f, 244.335f, 331.151f
@@ -399,7 +403,7 @@
builder.add(path25, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43b0a7ab), SkBits2Float(0x42d6b25c)); // 353.31f, 107.348f
path.quadTo(SkBits2Float(0x43b0a7ab), SkBits2Float(0x42eb684b), SkBits2Float(0x43acfe69), SkBits2Float(0x42fa0d53)); // 353.31f, 117.704f, 345.988f, 125.026f
path.quadTo(SkBits2Float(0x43a95527), SkBits2Float(0x4304592e), SkBits2Float(0x43a427ab), SkBits2Float(0x4304592e)); // 338.665f, 132.348f, 328.31f, 132.348f
@@ -414,7 +418,7 @@
builder.add(path26, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43d478db), SkBits2Float(0x4301c45a)); // 424.944f, 129.767f
path.quadTo(SkBits2Float(0x43d478db), SkBits2Float(0x430c1f52), SkBits2Float(0x43d0cf99), SkBits2Float(0x431371d6)); // 424.944f, 140.122f, 417.622f, 147.445f
path.quadTo(SkBits2Float(0x43cd2657), SkBits2Float(0x431ac45a), SkBits2Float(0x43c7f8db), SkBits2Float(0x431ac45a)); // 410.3f, 154.767f, 399.944f, 154.767f
@@ -429,7 +433,7 @@
builder.add(path27, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4370d681), SkBits2Float(0x4375fc44)); // 240.838f, 245.985f
path.quadTo(SkBits2Float(0x4370d681), SkBits2Float(0x43802b9e), SkBits2Float(0x436983fd), SkBits2Float(0x4383d4e0)); // 240.838f, 256.341f, 233.516f, 263.663f
path.quadTo(SkBits2Float(0x43623178), SkBits2Float(0x43877e22), SkBits2Float(0x4357d681), SkBits2Float(0x43877e22)); // 226.193f, 270.985f, 215.838f, 270.985f
@@ -444,7 +448,7 @@
builder.add(path28, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43883c1d), SkBits2Float(0x438a9227)); // 272.47f, 277.142f
path.quadTo(SkBits2Float(0x43883c1d), SkBits2Float(0x438fbfa3), SkBits2Float(0x438492db), SkBits2Float(0x439368e5)); // 272.47f, 287.497f, 265.147f, 294.819f
path.quadTo(SkBits2Float(0x4380e999), SkBits2Float(0x43971227), SkBits2Float(0x4377783a), SkBits2Float(0x43971227)); // 257.825f, 302.142f, 247.47f, 302.142f
@@ -459,7 +463,7 @@
builder.add(path29, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43b5b3a4), SkBits2Float(0x43a2dbb0)); // 363.403f, 325.716f
path.quadTo(SkBits2Float(0x43b5b3a4), SkBits2Float(0x43a8092c), SkBits2Float(0x43b20a62), SkBits2Float(0x43abb26e)); // 363.403f, 336.072f, 356.081f, 343.394f
path.quadTo(SkBits2Float(0x43ae6120), SkBits2Float(0x43af5bb0), SkBits2Float(0x43a933a4), SkBits2Float(0x43af5bb0)); // 348.759f, 350.716f, 338.403f, 350.716f
@@ -474,7 +478,7 @@
builder.add(path30, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43a81cf4), SkBits2Float(0x431b2abc)); // 336.226f, 155.167f
path.quadTo(SkBits2Float(0x43a81cf4), SkBits2Float(0x432585b4), SkBits2Float(0x43a473b2), SkBits2Float(0x432cd838)); // 336.226f, 165.522f, 328.904f, 172.845f
path.quadTo(SkBits2Float(0x43a0ca70), SkBits2Float(0x43342abc), SkBits2Float(0x439b9cf4), SkBits2Float(0x43342abc)); // 321.582f, 180.167f, 311.226f, 180.167f
@@ -489,7 +493,7 @@
builder.add(path31, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x435e092f), SkBits2Float(0x43698168)); // 222.036f, 233.505f
path.quadTo(SkBits2Float(0x435e092f), SkBits2Float(0x4373dc5f), SkBits2Float(0x4356b6ab), SkBits2Float(0x437b2ee3)); // 222.036f, 243.861f, 214.714f, 251.183f
path.quadTo(SkBits2Float(0x434f6426), SkBits2Float(0x438140b4), SkBits2Float(0x4345092f), SkBits2Float(0x438140b4)); // 207.391f, 258.505f, 197.036f, 258.505f
@@ -504,7 +508,7 @@
builder.add(path32, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43b29d51), SkBits2Float(0x434f504b)); // 357.229f, 207.314f
path.quadTo(SkBits2Float(0x43b29d51), SkBits2Float(0x4359ab42), SkBits2Float(0x43aef40f), SkBits2Float(0x4360fdc7)); // 357.229f, 217.669f, 349.907f, 224.991f
path.quadTo(SkBits2Float(0x43ab4acd), SkBits2Float(0x4368504b), SkBits2Float(0x43a61d51), SkBits2Float(0x4368504b)); // 342.584f, 232.314f, 332.229f, 232.314f
@@ -519,7 +523,7 @@
builder.add(path33, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x439022b6), SkBits2Float(0x434132a3)); // 288.271f, 193.198f
path.quadTo(SkBits2Float(0x439022b6), SkBits2Float(0x434b8d9a), SkBits2Float(0x438c7974), SkBits2Float(0x4352e01f)); // 288.271f, 203.553f, 280.949f, 210.875f
path.quadTo(SkBits2Float(0x4388d032), SkBits2Float(0x435a32a3), SkBits2Float(0x4383a2b6), SkBits2Float(0x435a32a3)); // 273.627f, 218.198f, 263.271f, 218.198f
@@ -534,7 +538,7 @@
builder.add(path34, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x434c6e1b), SkBits2Float(0x4386bd38)); // 204.43f, 269.478f
path.quadTo(SkBits2Float(0x434c6e1b), SkBits2Float(0x438beab4), SkBits2Float(0x43451b97), SkBits2Float(0x438f93f6)); // 204.43f, 279.834f, 197.108f, 287.156f
path.quadTo(SkBits2Float(0x433dc912), SkBits2Float(0x43933d38), SkBits2Float(0x43336e1b), SkBits2Float(0x43933d38)); // 189.785f, 294.478f, 179.43f, 294.478f
@@ -549,7 +553,7 @@
builder.add(path35, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43926b36), SkBits2Float(0x43b08773)); // 292.838f, 353.058f
path.quadTo(SkBits2Float(0x43926b36), SkBits2Float(0x43b5b4ef), SkBits2Float(0x438ec1f4), SkBits2Float(0x43b95e31)); // 292.838f, 363.414f, 285.515f, 370.736f
path.quadTo(SkBits2Float(0x438b18b2), SkBits2Float(0x43bd0773), SkBits2Float(0x4385eb36), SkBits2Float(0x43bd0773)); // 278.193f, 378.058f, 267.838f, 378.058f
@@ -564,7 +568,7 @@
builder.add(path36, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43ea874d), SkBits2Float(0x4382542c)); // 469.057f, 260.658f
path.quadTo(SkBits2Float(0x43ea874d), SkBits2Float(0x438781a8), SkBits2Float(0x43e6de0b), SkBits2Float(0x438b2aea)); // 469.057f, 271.013f, 461.735f, 278.335f
path.quadTo(SkBits2Float(0x43e334c9), SkBits2Float(0x438ed42c), SkBits2Float(0x43de074d), SkBits2Float(0x438ed42c)); // 454.412f, 285.658f, 444.057f, 285.658f
@@ -579,7 +583,7 @@
builder.add(path37, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42e7d715), SkBits2Float(0x436cecfc)); // 115.92f, 236.926f
path.quadTo(SkBits2Float(0x42e7d715), SkBits2Float(0x437747f3), SkBits2Float(0x42d9320c), SkBits2Float(0x437e9a77)); // 115.92f, 247.281f, 108.598f, 254.603f
path.quadTo(SkBits2Float(0x42ca8d04), SkBits2Float(0x4382f67e), SkBits2Float(0x42b5d715), SkBits2Float(0x4382f67e)); // 101.275f, 261.926f, 90.9201f, 261.926f
@@ -594,7 +598,7 @@
builder.add(path38, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43545413), SkBits2Float(0x4333cfcf)); // 212.328f, 179.812f
path.quadTo(SkBits2Float(0x43545413), SkBits2Float(0x433e2ac6), SkBits2Float(0x434d018f), SkBits2Float(0x43457d4b)); // 212.328f, 190.167f, 205.006f, 197.489f
path.quadTo(SkBits2Float(0x4345af0a), SkBits2Float(0x434ccfcf), SkBits2Float(0x433b5413), SkBits2Float(0x434ccfcf)); // 197.684f, 204.812f, 187.328f, 204.812f
@@ -609,7 +613,7 @@
builder.add(path39, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43c9b16c), SkBits2Float(0x41823be6)); // 403.386f, 16.2792f
path.quadTo(SkBits2Float(0x43c9b16c), SkBits2Float(0x41d513a2), SkBits2Float(0x43c6082a), SkBits2Float(0x4207d3e2)); // 403.386f, 26.6346f, 396.064f, 33.9569f
path.quadTo(SkBits2Float(0x43c25ee8), SkBits2Float(0x42251df3), SkBits2Float(0x43bd316c), SkBits2Float(0x42251df3)); // 388.741f, 41.2792f, 378.386f, 41.2792f
@@ -624,7 +628,7 @@
builder.add(path40, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43747fcb), SkBits2Float(0x43805e9d)); // 244.499f, 256.739f
path.quadTo(SkBits2Float(0x43747fcb), SkBits2Float(0x43858c19), SkBits2Float(0x436d2d47), SkBits2Float(0x4389355b)); // 244.499f, 267.095f, 237.177f, 274.417f
path.quadTo(SkBits2Float(0x4365dac2), SkBits2Float(0x438cde9d), SkBits2Float(0x435b7fcb), SkBits2Float(0x438cde9d)); // 229.855f, 281.739f, 219.499f, 281.739f
@@ -639,7 +643,7 @@
builder.add(path41, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43910318), SkBits2Float(0x43826a1e)); // 290.024f, 260.829f
path.quadTo(SkBits2Float(0x43910318), SkBits2Float(0x4387979a), SkBits2Float(0x438d59d6), SkBits2Float(0x438b40dc)); // 290.024f, 271.184f, 282.702f, 278.507f
path.quadTo(SkBits2Float(0x4389b094), SkBits2Float(0x438eea1e), SkBits2Float(0x43848318), SkBits2Float(0x438eea1e)); // 275.38f, 285.829f, 265.024f, 285.829f
@@ -654,7 +658,7 @@
builder.add(path42, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41c80000), SkBits2Float(0x436edb04)); // 25, 238.856f
path.quadTo(SkBits2Float(0x41c80000), SkBits2Float(0x437935fb), SkBits2Float(0x418d6bde), SkBits2Float(0x43804440)); // 25, 249.211f, 17.6777f, 256.533f
path.quadTo(SkBits2Float(0x4125af78), SkBits2Float(0x4383ed82), SkBits2Float(0x00000000), SkBits2Float(0x4383ed82)); // 10.3553f, 263.856f, 0, 263.856f
@@ -669,7 +673,7 @@
builder.add(path43, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x435d07bd), SkBits2Float(0x4395fbb5)); // 221.03f, 299.966f
path.quadTo(SkBits2Float(0x435d07bd), SkBits2Float(0x439b2931), SkBits2Float(0x4355b539), SkBits2Float(0x439ed273)); // 221.03f, 310.322f, 213.708f, 317.644f
path.quadTo(SkBits2Float(0x434e62b4), SkBits2Float(0x43a27bb5), SkBits2Float(0x434407bd), SkBits2Float(0x43a27bb5)); // 206.386f, 324.966f, 196.03f, 324.966f
@@ -684,7 +688,7 @@
builder.add(path44, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43a3ec29), SkBits2Float(0x434ac5a3)); // 327.845f, 202.772f
path.quadTo(SkBits2Float(0x43a3ec29), SkBits2Float(0x4355209a), SkBits2Float(0x43a042e7), SkBits2Float(0x435c731f)); // 327.845f, 213.127f, 320.523f, 220.45f
path.quadTo(SkBits2Float(0x439c99a5), SkBits2Float(0x4363c5a3), SkBits2Float(0x43976c29), SkBits2Float(0x4363c5a3)); // 313.2f, 227.772f, 302.845f, 227.772f
@@ -699,7 +703,7 @@
builder.add(path45, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4380585e), SkBits2Float(0x43199f0e)); // 256.69f, 153.621f
path.quadTo(SkBits2Float(0x4380585e), SkBits2Float(0x4323fa06), SkBits2Float(0x43795e38), SkBits2Float(0x432b4c8a)); // 256.69f, 163.977f, 249.368f, 171.299f
path.quadTo(SkBits2Float(0x43720bb4), SkBits2Float(0x43329f0e), SkBits2Float(0x4367b0bc), SkBits2Float(0x43329f0e)); // 242.046f, 178.621f, 231.69f, 178.621f
@@ -714,7 +718,7 @@
builder.add(path46, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43599e4b), SkBits2Float(0x43c5e452)); // 217.618f, 395.784f
path.quadTo(SkBits2Float(0x43599e4b), SkBits2Float(0x43cb11ce), SkBits2Float(0x43524bc7), SkBits2Float(0x43cebb10)); // 217.618f, 406.139f, 210.296f, 413.461f
path.quadTo(SkBits2Float(0x434af942), SkBits2Float(0x43d26452), SkBits2Float(0x43409e4b), SkBits2Float(0x43d26452)); // 202.974f, 420.784f, 192.618f, 420.784f
@@ -729,7 +733,7 @@
builder.add(path47, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x435e28dc), SkBits2Float(0x43a32a69)); // 222.16f, 326.331f
path.quadTo(SkBits2Float(0x435e28dc), SkBits2Float(0x43a857e5), SkBits2Float(0x4356d658), SkBits2Float(0x43ac0127)); // 222.16f, 336.687f, 214.837f, 344.009f
path.quadTo(SkBits2Float(0x434f83d4), SkBits2Float(0x43afaa69), SkBits2Float(0x434528dc), SkBits2Float(0x43afaa69)); // 207.515f, 351.331f, 197.16f, 351.331f
@@ -744,7 +748,7 @@
builder.add(path48, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x433b4ff9), SkBits2Float(0x438034ac)); // 187.312f, 256.411f
path.quadTo(SkBits2Float(0x433b4ff9), SkBits2Float(0x43856228), SkBits2Float(0x4333fd75), SkBits2Float(0x43890b6a)); // 187.312f, 266.767f, 179.99f, 274.089f
path.quadTo(SkBits2Float(0x432caaf0), SkBits2Float(0x438cb4ac), SkBits2Float(0x43224ff9), SkBits2Float(0x438cb4ac)); // 172.668f, 281.411f, 162.312f, 281.411f
@@ -759,7 +763,7 @@
builder.add(path49, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4346c2ee), SkBits2Float(0x435b284b)); // 198.761f, 219.157f
path.quadTo(SkBits2Float(0x4346c2ee), SkBits2Float(0x43658342), SkBits2Float(0x433f706a), SkBits2Float(0x436cd5c7)); // 198.761f, 229.513f, 191.439f, 236.835f
path.quadTo(SkBits2Float(0x43381de6), SkBits2Float(0x4374284b), SkBits2Float(0x432dc2ee), SkBits2Float(0x4374284b)); // 184.117f, 244.157f, 173.761f, 244.157f
@@ -774,7 +778,7 @@
builder.add(path50, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43fb0cf6), SkBits2Float(0x438812a5)); // 502.101f, 272.146f
path.quadTo(SkBits2Float(0x43fb0cf6), SkBits2Float(0x438d4021), SkBits2Float(0x43f763b4), SkBits2Float(0x4390e963)); // 502.101f, 282.501f, 494.779f, 289.823f
path.quadTo(SkBits2Float(0x43f3ba72), SkBits2Float(0x439492a5), SkBits2Float(0x43ee8cf6), SkBits2Float(0x439492a5)); // 487.457f, 297.146f, 477.101f, 297.146f
@@ -789,7 +793,7 @@
builder.add(path51, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x438f42d6), SkBits2Float(0x435a09d4)); // 286.522f, 218.038f
path.quadTo(SkBits2Float(0x438f42d6), SkBits2Float(0x436464cc), SkBits2Float(0x438b9994), SkBits2Float(0x436bb750)); // 286.522f, 228.394f, 279.2f, 235.716f
path.quadTo(SkBits2Float(0x4387f052), SkBits2Float(0x437309d4), SkBits2Float(0x4382c2d6), SkBits2Float(0x437309d4)); // 271.878f, 243.038f, 261.522f, 243.038f
@@ -804,7 +808,7 @@
builder.add(path52, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43ac18fb), SkBits2Float(0x43378440)); // 344.195f, 183.517f
path.quadTo(SkBits2Float(0x43ac18fb), SkBits2Float(0x4341df38), SkBits2Float(0x43a86fb9), SkBits2Float(0x434931bc)); // 344.195f, 193.872f, 336.873f, 201.194f
path.quadTo(SkBits2Float(0x43a4c677), SkBits2Float(0x43508440), SkBits2Float(0x439f98fb), SkBits2Float(0x43508440)); // 329.551f, 208.517f, 319.195f, 208.517f
@@ -819,7 +823,7 @@
builder.add(path53, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42ef12a3), SkBits2Float(0x430c5faa)); // 119.536f, 140.374f
path.quadTo(SkBits2Float(0x42ef12a3), SkBits2Float(0x4316baa2), SkBits2Float(0x42e06d9a), SkBits2Float(0x431e0d26)); // 119.536f, 150.729f, 112.214f, 158.051f
path.quadTo(SkBits2Float(0x42d1c892), SkBits2Float(0x43255faa), SkBits2Float(0x42bd12a3), SkBits2Float(0x43255faa)); // 104.892f, 165.374f, 94.5364f, 165.374f
@@ -834,7 +838,7 @@
builder.add(path54, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43f569c1), SkBits2Float(0x43463314)); // 490.826f, 198.2f
path.quadTo(SkBits2Float(0x43f569c1), SkBits2Float(0x43508e0c), SkBits2Float(0x43f1c07f), SkBits2Float(0x4357e090)); // 490.826f, 208.555f, 483.504f, 215.877f
path.quadTo(SkBits2Float(0x43ee173d), SkBits2Float(0x435f3314), SkBits2Float(0x43e8e9c1), SkBits2Float(0x435f3314)); // 476.182f, 223.2f, 465.826f, 223.2f
@@ -849,7 +853,7 @@
builder.add(path55, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4346ee50), SkBits2Float(0x4386bdd6)); // 198.931f, 269.483f
path.quadTo(SkBits2Float(0x4346ee50), SkBits2Float(0x438beb52), SkBits2Float(0x433f9bcc), SkBits2Float(0x438f9494)); // 198.931f, 279.838f, 191.609f, 287.161f
path.quadTo(SkBits2Float(0x43384948), SkBits2Float(0x43933dd6), SkBits2Float(0x432dee50), SkBits2Float(0x43933dd6)); // 184.286f, 294.483f, 173.931f, 294.483f
@@ -864,7 +868,7 @@
builder.add(path56, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4403bd60), SkBits2Float(0x438666a7)); // 526.959f, 268.802f
path.quadTo(SkBits2Float(0x4403bd60), SkBits2Float(0x438b9423), SkBits2Float(0x4401e8bf), SkBits2Float(0x438f3d65)); // 526.959f, 279.157f, 519.637f, 286.48f
path.quadTo(SkBits2Float(0x4400141e), SkBits2Float(0x4392e6a7), SkBits2Float(0x43fafac0), SkBits2Float(0x4392e6a7)); // 512.314f, 293.802f, 501.959f, 293.802f
@@ -879,7 +883,7 @@
builder.add(path57, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x433c6aff), SkBits2Float(0x439bf9f9)); // 188.418f, 311.953f
path.quadTo(SkBits2Float(0x433c6aff), SkBits2Float(0x43a12775), SkBits2Float(0x4335187b), SkBits2Float(0x43a4d0b7)); // 188.418f, 322.308f, 181.096f, 329.631f
path.quadTo(SkBits2Float(0x432dc5f6), SkBits2Float(0x43a879f9), SkBits2Float(0x43236aff), SkBits2Float(0x43a879f9)); // 173.773f, 336.953f, 163.418f, 336.953f
@@ -894,7 +898,7 @@
builder.add(path58, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4397b4f8), SkBits2Float(0x43598b8a)); // 303.414f, 217.545f
path.quadTo(SkBits2Float(0x4397b4f8), SkBits2Float(0x4363e682), SkBits2Float(0x43940bb6), SkBits2Float(0x436b3906)); // 303.414f, 227.9f, 296.091f, 235.223f
path.quadTo(SkBits2Float(0x43906274), SkBits2Float(0x43728b8a), SkBits2Float(0x438b34f8), SkBits2Float(0x43728b8a)); // 288.769f, 242.545f, 278.414f, 242.545f
@@ -909,7 +913,7 @@
builder.add(path59, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x430d7c0c), SkBits2Float(0x435ebbfb)); // 141.485f, 222.734f
path.quadTo(SkBits2Float(0x430d7c0c), SkBits2Float(0x436916f2), SkBits2Float(0x43062988), SkBits2Float(0x43706977)); // 141.485f, 233.09f, 134.162f, 240.412f
path.quadTo(SkBits2Float(0x42fdae07), SkBits2Float(0x4377bbfb), SkBits2Float(0x42e8f818), SkBits2Float(0x4377bbfb)); // 126.84f, 247.734f, 116.485f, 247.734f
@@ -924,7 +928,7 @@
builder.add(path60, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43b7303b), SkBits2Float(0x42e664c0)); // 366.377f, 115.197f
path.quadTo(SkBits2Float(0x43b7303b), SkBits2Float(0x42fb1aaf), SkBits2Float(0x43b386f9), SkBits2Float(0x4304dfdc)); // 366.377f, 125.552f, 359.054f, 132.874f
path.quadTo(SkBits2Float(0x43afddb7), SkBits2Float(0x430c3260), SkBits2Float(0x43aab03b), SkBits2Float(0x430c3260)); // 351.732f, 140.197f, 341.377f, 140.197f
@@ -939,7 +943,7 @@
builder.add(path61, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43ded748), SkBits2Float(0x43786398)); // 445.682f, 248.389f
path.quadTo(SkBits2Float(0x43ded748), SkBits2Float(0x43815f48), SkBits2Float(0x43db2e06), SkBits2Float(0x4385088a)); // 445.682f, 258.744f, 438.36f, 266.067f
path.quadTo(SkBits2Float(0x43d784c4), SkBits2Float(0x4388b1cc), SkBits2Float(0x43d25748), SkBits2Float(0x4388b1cc)); // 431.037f, 273.389f, 420.682f, 273.389f
@@ -954,7 +958,7 @@
builder.add(path62, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43bbf04d), SkBits2Float(0x4397997d)); // 375.877f, 303.199f
path.quadTo(SkBits2Float(0x43bbf04d), SkBits2Float(0x439cc6f9), SkBits2Float(0x43b8470b), SkBits2Float(0x43a0703b)); // 375.877f, 313.554f, 368.555f, 320.877f
path.quadTo(SkBits2Float(0x43b49dc9), SkBits2Float(0x43a4197d), SkBits2Float(0x43af704d), SkBits2Float(0x43a4197d)); // 361.233f, 328.199f, 350.877f, 328.199f
@@ -969,7 +973,7 @@
builder.add(path63, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43b62e97), SkBits2Float(0x4313ec95)); // 364.364f, 147.924f
path.quadTo(SkBits2Float(0x43b62e97), SkBits2Float(0x431e478c), SkBits2Float(0x43b28555), SkBits2Float(0x43259a11)); // 364.364f, 158.279f, 357.042f, 165.602f
path.quadTo(SkBits2Float(0x43aedc13), SkBits2Float(0x432cec95), SkBits2Float(0x43a9ae97), SkBits2Float(0x432cec95)); // 349.719f, 172.924f, 339.364f, 172.924f
@@ -984,7 +988,7 @@
builder.add(path64, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43ec86f7), SkBits2Float(0x43b37791)); // 473.054f, 358.934f
path.quadTo(SkBits2Float(0x43ec86f7), SkBits2Float(0x43b8a50d), SkBits2Float(0x43e8ddb5), SkBits2Float(0x43bc4e4f)); // 473.054f, 369.289f, 465.732f, 376.612f
path.quadTo(SkBits2Float(0x43e53473), SkBits2Float(0x43bff791), SkBits2Float(0x43e006f7), SkBits2Float(0x43bff791)); // 458.41f, 383.934f, 448.054f, 383.934f
@@ -999,7 +1003,7 @@
builder.add(path65, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43840826), SkBits2Float(0x43927b24)); // 264.064f, 292.962f
path.quadTo(SkBits2Float(0x43840826), SkBits2Float(0x4397a8a0), SkBits2Float(0x43805ee4), SkBits2Float(0x439b51e2)); // 264.064f, 303.317f, 256.741f, 310.64f
path.quadTo(SkBits2Float(0x43796b44), SkBits2Float(0x439efb24), SkBits2Float(0x436f104c), SkBits2Float(0x439efb24)); // 249.419f, 317.962f, 239.064f, 317.962f
@@ -1014,7 +1018,7 @@
builder.add(path66, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4387c794), SkBits2Float(0x43567a78)); // 271.559f, 214.478f
path.quadTo(SkBits2Float(0x4387c794), SkBits2Float(0x4360d570), SkBits2Float(0x43841e52), SkBits2Float(0x436827f4)); // 271.559f, 224.834f, 264.237f, 232.156f
path.quadTo(SkBits2Float(0x43807510), SkBits2Float(0x436f7a78), SkBits2Float(0x43768f28), SkBits2Float(0x436f7a78)); // 256.915f, 239.478f, 246.559f, 239.478f
@@ -1029,7 +1033,7 @@
builder.add(path67, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43cfc71f), SkBits2Float(0x4314ea3c)); // 415.556f, 148.915f
path.quadTo(SkBits2Float(0x43cfc71f), SkBits2Float(0x431f4534), SkBits2Float(0x43cc1ddd), SkBits2Float(0x432697b8)); // 415.556f, 159.27f, 408.233f, 166.593f
path.quadTo(SkBits2Float(0x43c8749b), SkBits2Float(0x432dea3c), SkBits2Float(0x43c3471f), SkBits2Float(0x432dea3c)); // 400.911f, 173.915f, 390.556f, 173.915f
@@ -1044,7 +1048,7 @@
builder.add(path68, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43a48336), SkBits2Float(0x4336f503)); // 329.025f, 182.957f
path.quadTo(SkBits2Float(0x43a48336), SkBits2Float(0x43414ffa), SkBits2Float(0x43a0d9f4), SkBits2Float(0x4348a27f)); // 329.025f, 193.312f, 321.703f, 200.635f
path.quadTo(SkBits2Float(0x439d30b2), SkBits2Float(0x434ff503), SkBits2Float(0x43980336), SkBits2Float(0x434ff503)); // 314.38f, 207.957f, 304.025f, 207.957f
@@ -1059,7 +1063,7 @@
builder.add(path69, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x439a774e), SkBits2Float(0x43a57837)); // 308.932f, 330.939f
path.quadTo(SkBits2Float(0x439a774e), SkBits2Float(0x43aaa5b3), SkBits2Float(0x4396ce0c), SkBits2Float(0x43ae4ef5)); // 308.932f, 341.295f, 301.61f, 348.617f
path.quadTo(SkBits2Float(0x439324ca), SkBits2Float(0x43b1f837), SkBits2Float(0x438df74e), SkBits2Float(0x43b1f837)); // 294.287f, 355.939f, 283.932f, 355.939f
@@ -1074,7 +1078,7 @@
builder.add(path70, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x439be624), SkBits2Float(0x438cec6f)); // 311.798f, 281.847f
path.quadTo(SkBits2Float(0x439be624), SkBits2Float(0x439219eb), SkBits2Float(0x43983ce2), SkBits2Float(0x4395c32d)); // 311.798f, 292.202f, 304.476f, 299.525f
path.quadTo(SkBits2Float(0x439493a0), SkBits2Float(0x43996c6f), SkBits2Float(0x438f6624), SkBits2Float(0x43996c6f)); // 297.153f, 306.847f, 286.798f, 306.847f
@@ -1089,7 +1093,7 @@
builder.add(path71, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43714851), SkBits2Float(0x43aff2c0)); // 241.282f, 351.896f
path.quadTo(SkBits2Float(0x43714851), SkBits2Float(0x43b5203c), SkBits2Float(0x4369f5cd), SkBits2Float(0x43b8c97e)); // 241.282f, 362.252f, 233.96f, 369.574f
path.quadTo(SkBits2Float(0x4362a348), SkBits2Float(0x43bc72c0), SkBits2Float(0x43584851), SkBits2Float(0x43bc72c0)); // 226.638f, 376.896f, 216.282f, 376.896f
@@ -1104,7 +1108,7 @@
builder.add(path72, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43e644d3), SkBits2Float(0x43041b70)); // 460.538f, 132.107f
path.quadTo(SkBits2Float(0x43e644d3), SkBits2Float(0x430e7668), SkBits2Float(0x43e29b91), SkBits2Float(0x4315c8ec)); // 460.538f, 142.463f, 453.215f, 149.785f
path.quadTo(SkBits2Float(0x43def24f), SkBits2Float(0x431d1b70), SkBits2Float(0x43d9c4d3), SkBits2Float(0x431d1b70)); // 445.893f, 157.107f, 435.538f, 157.107f
@@ -1119,7 +1123,7 @@
builder.add(path73, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43c29be7), SkBits2Float(0x4366bcd5)); // 389.218f, 230.738f
path.quadTo(SkBits2Float(0x43c29be7), SkBits2Float(0x437117cc), SkBits2Float(0x43bef2a5), SkBits2Float(0x43786a51)); // 389.218f, 241.093f, 381.896f, 248.415f
path.quadTo(SkBits2Float(0x43bb4963), SkBits2Float(0x437fbcd5), SkBits2Float(0x43b61be7), SkBits2Float(0x437fbcd5)); // 374.573f, 255.738f, 364.218f, 255.738f
@@ -1134,7 +1138,7 @@
builder.add(path74, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43b8637d), SkBits2Float(0x435f209d)); // 368.777f, 223.127f
path.quadTo(SkBits2Float(0x43b8637d), SkBits2Float(0x43697b94), SkBits2Float(0x43b4ba3b), SkBits2Float(0x4370ce19)); // 368.777f, 233.483f, 361.455f, 240.805f
path.quadTo(SkBits2Float(0x43b110f9), SkBits2Float(0x4378209d), SkBits2Float(0x43abe37d), SkBits2Float(0x4378209d)); // 354.133f, 248.127f, 343.777f, 248.127f
@@ -1149,7 +1153,7 @@
builder.add(path75, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43a3ec8f), SkBits2Float(0x435dba35)); // 327.848f, 221.727f
path.quadTo(SkBits2Float(0x43a3ec8f), SkBits2Float(0x4368152c), SkBits2Float(0x43a0434d), SkBits2Float(0x436f67b1)); // 327.848f, 232.083f, 320.526f, 239.405f
path.quadTo(SkBits2Float(0x439c9a0b), SkBits2Float(0x4376ba35), SkBits2Float(0x43976c8f), SkBits2Float(0x4376ba35)); // 313.203f, 246.727f, 302.848f, 246.727f
@@ -1164,7 +1168,7 @@
builder.add(path76, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4408ede5), SkBits2Float(0x436af388)); // 547.717f, 234.951f
path.quadTo(SkBits2Float(0x4408ede5), SkBits2Float(0x43754e7f), SkBits2Float(0x44071944), SkBits2Float(0x437ca103)); // 547.717f, 245.307f, 540.395f, 252.629f
path.quadTo(SkBits2Float(0x440544a3), SkBits2Float(0x4381f9c4), SkBits2Float(0x4402ade5), SkBits2Float(0x4381f9c4)); // 533.072f, 259.951f, 522.717f, 259.951f
@@ -1179,7 +1183,7 @@
builder.add(path77, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43a06718), SkBits2Float(0x43848d47)); // 320.805f, 265.104f
path.quadTo(SkBits2Float(0x43a06718), SkBits2Float(0x4389bac3), SkBits2Float(0x439cbdd6), SkBits2Float(0x438d6405)); // 320.805f, 275.459f, 313.483f, 282.781f
path.quadTo(SkBits2Float(0x43991494), SkBits2Float(0x43910d47), SkBits2Float(0x4393e718), SkBits2Float(0x43910d47)); // 306.161f, 290.104f, 295.805f, 290.104f
@@ -1194,7 +1198,7 @@
builder.add(path78, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43a4f721), SkBits2Float(0x439dea2f)); // 329.931f, 315.83f
path.quadTo(SkBits2Float(0x43a4f721), SkBits2Float(0x43a317ab), SkBits2Float(0x43a14ddf), SkBits2Float(0x43a6c0ed)); // 329.931f, 326.185f, 322.608f, 333.507f
path.quadTo(SkBits2Float(0x439da49d), SkBits2Float(0x43aa6a2f), SkBits2Float(0x43987721), SkBits2Float(0x43aa6a2f)); // 315.286f, 340.83f, 304.931f, 340.83f
@@ -1209,7 +1213,7 @@
builder.add(path79, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4343f4a9), SkBits2Float(0x434a2b20)); // 195.956f, 202.168f
path.quadTo(SkBits2Float(0x4343f4a9), SkBits2Float(0x43548618), SkBits2Float(0x433ca225), SkBits2Float(0x435bd89c)); // 195.956f, 212.524f, 188.633f, 219.846f
path.quadTo(SkBits2Float(0x43354fa0), SkBits2Float(0x43632b20), SkBits2Float(0x432af4a9), SkBits2Float(0x43632b20)); // 181.311f, 227.168f, 170.956f, 227.168f
@@ -1224,7 +1228,7 @@
builder.add(path80, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4281a60e), SkBits2Float(0x42f78d6e)); // 64.8243f, 123.776f
path.quadTo(SkBits2Float(0x4281a60e), SkBits2Float(0x430621ae), SkBits2Float(0x4266020c), SkBits2Float(0x430d7433)); // 64.8243f, 134.132f, 57.502f, 141.454f
path.quadTo(SkBits2Float(0x4248b7fa), SkBits2Float(0x4314c6b7), SkBits2Float(0x421f4c1c), SkBits2Float(0x4314c6b7)); // 50.1797f, 148.776f, 39.8243f, 148.776f
@@ -1239,7 +1243,7 @@
builder.add(path81, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43740113), SkBits2Float(0x4363dcf0)); // 244.004f, 227.863f
path.quadTo(SkBits2Float(0x43740113), SkBits2Float(0x436e37e8), SkBits2Float(0x436cae8f), SkBits2Float(0x43758a6c)); // 244.004f, 238.218f, 236.682f, 245.541f
path.quadTo(SkBits2Float(0x43655c0a), SkBits2Float(0x437cdcf0), SkBits2Float(0x435b0113), SkBits2Float(0x437cdcf0)); // 229.36f, 252.863f, 219.004f, 252.863f
@@ -1254,7 +1258,7 @@
builder.add(path82, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43bf0464), SkBits2Float(0x431e17ca)); // 382.034f, 158.093f
path.quadTo(SkBits2Float(0x43bf0464), SkBits2Float(0x432872c2), SkBits2Float(0x43bb5b22), SkBits2Float(0x432fc546)); // 382.034f, 168.448f, 374.712f, 175.771f
path.quadTo(SkBits2Float(0x43b7b1e0), SkBits2Float(0x433717ca), SkBits2Float(0x43b28464), SkBits2Float(0x433717ca)); // 367.39f, 183.093f, 357.034f, 183.093f
@@ -1269,7 +1273,7 @@
builder.add(path83, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43a72678), SkBits2Float(0x438273e0)); // 334.301f, 260.905f
path.quadTo(SkBits2Float(0x43a72678), SkBits2Float(0x4387a15c), SkBits2Float(0x43a37d36), SkBits2Float(0x438b4a9e)); // 334.301f, 271.261f, 326.978f, 278.583f
path.quadTo(SkBits2Float(0x439fd3f4), SkBits2Float(0x438ef3e0), SkBits2Float(0x439aa678), SkBits2Float(0x438ef3e0)); // 319.656f, 285.905f, 309.301f, 285.905f
@@ -1284,7 +1288,7 @@
builder.add(path84, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4361bf09), SkBits2Float(0x43464372)); // 225.746f, 198.263f
path.quadTo(SkBits2Float(0x4361bf09), SkBits2Float(0x43509e6a), SkBits2Float(0x435a6c85), SkBits2Float(0x4357f0ee)); // 225.746f, 208.619f, 218.424f, 215.941f
path.quadTo(SkBits2Float(0x43531a00), SkBits2Float(0x435f4372), SkBits2Float(0x4348bf09), SkBits2Float(0x435f4372)); // 211.102f, 223.263f, 200.746f, 223.263f
@@ -1299,7 +1303,7 @@
builder.add(path85, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4377220b), SkBits2Float(0x4392653c)); // 247.133f, 292.791f
path.quadTo(SkBits2Float(0x4377220b), SkBits2Float(0x439792b8), SkBits2Float(0x436fcf87), SkBits2Float(0x439b3bfa)); // 247.133f, 303.146f, 239.811f, 310.469f
path.quadTo(SkBits2Float(0x43687d02), SkBits2Float(0x439ee53c), SkBits2Float(0x435e220b), SkBits2Float(0x439ee53c)); // 232.488f, 317.791f, 222.133f, 317.791f
@@ -1314,7 +1318,7 @@
builder.add(path86, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4402a250), SkBits2Float(0x4331ae72)); // 522.536f, 177.681f
path.quadTo(SkBits2Float(0x4402a250), SkBits2Float(0x433c096a), SkBits2Float(0x4400cdaf), SkBits2Float(0x43435bee)); // 522.536f, 188.037f, 515.214f, 195.359f
path.quadTo(SkBits2Float(0x43fdf21c), SkBits2Float(0x434aae72), SkBits2Float(0x43f8c4a0), SkBits2Float(0x434aae72)); // 507.891f, 202.681f, 497.536f, 202.681f
@@ -1329,7 +1333,7 @@
builder.add(path87, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x439cfd65), SkBits2Float(0x4331c20a)); // 313.98f, 177.758f
path.quadTo(SkBits2Float(0x439cfd65), SkBits2Float(0x433c1d02), SkBits2Float(0x43995423), SkBits2Float(0x43436f86)); // 313.98f, 188.113f, 306.657f, 195.436f
path.quadTo(SkBits2Float(0x4395aae1), SkBits2Float(0x434ac20a), SkBits2Float(0x43907d65), SkBits2Float(0x434ac20a)); // 299.335f, 202.758f, 288.98f, 202.758f
@@ -1344,7 +1348,7 @@
builder.add(path88, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43c6cc0f), SkBits2Float(0x430c1343)); // 397.594f, 140.075f
path.quadTo(SkBits2Float(0x43c6cc0f), SkBits2Float(0x43166e3a), SkBits2Float(0x43c322cd), SkBits2Float(0x431dc0bf)); // 397.594f, 150.431f, 390.272f, 157.753f
path.quadTo(SkBits2Float(0x43bf798b), SkBits2Float(0x43251343), SkBits2Float(0x43ba4c0f), SkBits2Float(0x43251343)); // 382.95f, 165.075f, 372.594f, 165.075f
@@ -1359,7 +1363,7 @@
builder.add(path89, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43453a6b), SkBits2Float(0x438ed8e3)); // 197.228f, 285.694f
path.quadTo(SkBits2Float(0x43453a6b), SkBits2Float(0x4394065f), SkBits2Float(0x433de7e7), SkBits2Float(0x4397afa1)); // 197.228f, 296.05f, 189.906f, 303.372f
path.quadTo(SkBits2Float(0x43369562), SkBits2Float(0x439b58e3), SkBits2Float(0x432c3a6b), SkBits2Float(0x439b58e3)); // 182.584f, 310.694f, 172.228f, 310.694f
@@ -1374,7 +1378,7 @@
builder.add(path90, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43a452ad), SkBits2Float(0x434c38a8)); // 328.646f, 204.221f
path.quadTo(SkBits2Float(0x43a452ad), SkBits2Float(0x435693a0), SkBits2Float(0x43a0a96b), SkBits2Float(0x435de624)); // 328.646f, 214.577f, 321.324f, 221.899f
path.quadTo(SkBits2Float(0x439d0029), SkBits2Float(0x436538a8), SkBits2Float(0x4397d2ad), SkBits2Float(0x436538a8)); // 314.001f, 229.221f, 303.646f, 229.221f
@@ -1389,7 +1393,7 @@
builder.add(path91, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x44002d54), SkBits2Float(0x4339e9e8)); // 512.708f, 185.914f
path.quadTo(SkBits2Float(0x44002d54), SkBits2Float(0x434444e0), SkBits2Float(0x43fcb166), SkBits2Float(0x434b9764)); // 512.708f, 196.269f, 505.386f, 203.591f
path.quadTo(SkBits2Float(0x43f90824), SkBits2Float(0x4352e9e8), SkBits2Float(0x43f3daa8), SkBits2Float(0x4352e9e8)); // 498.064f, 210.914f, 487.708f, 210.914f
@@ -1404,7 +1408,7 @@
builder.add(path92, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4385d99d), SkBits2Float(0x4302a8cd)); // 267.7f, 130.659f
path.quadTo(SkBits2Float(0x4385d99d), SkBits2Float(0x430d03c4), SkBits2Float(0x4382305b), SkBits2Float(0x43145649)); // 267.7f, 141.015f, 260.378f, 148.337f
path.quadTo(SkBits2Float(0x437d0e32), SkBits2Float(0x431ba8cd), SkBits2Float(0x4372b33a), SkBits2Float(0x431ba8cd)); // 253.055f, 155.659f, 242.7f, 155.659f
@@ -1419,7 +1423,7 @@
builder.add(path93, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42f92820), SkBits2Float(0x435b1722)); // 124.578f, 219.09f
path.quadTo(SkBits2Float(0x42f92820), SkBits2Float(0x4365721a), SkBits2Float(0x42ea8318), SkBits2Float(0x436cc49e)); // 124.578f, 229.446f, 117.256f, 236.768f
path.quadTo(SkBits2Float(0x42dbde0f), SkBits2Float(0x43741722), SkBits2Float(0x42c72820), SkBits2Float(0x43741722)); // 109.934f, 244.09f, 99.5784f, 244.09f
@@ -1434,7 +1438,7 @@
builder.add(path94, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43b70d86), SkBits2Float(0x435cf621)); // 366.106f, 220.961f
path.quadTo(SkBits2Float(0x43b70d86), SkBits2Float(0x43675118), SkBits2Float(0x43b36444), SkBits2Float(0x436ea39d)); // 366.106f, 231.317f, 358.783f, 238.639f
path.quadTo(SkBits2Float(0x43afbb02), SkBits2Float(0x4375f621), SkBits2Float(0x43aa8d86), SkBits2Float(0x4375f621)); // 351.461f, 245.961f, 341.106f, 245.961f
@@ -1449,7 +1453,7 @@
builder.add(path95, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x436d80e1), SkBits2Float(0x43885efa)); // 237.503f, 272.742f
path.quadTo(SkBits2Float(0x436d80e1), SkBits2Float(0x438d8c76), SkBits2Float(0x43662e5d), SkBits2Float(0x439135b8)); // 237.503f, 283.097f, 230.181f, 290.42f
path.quadTo(SkBits2Float(0x435edbd8), SkBits2Float(0x4394defa), SkBits2Float(0x435480e1), SkBits2Float(0x4394defa)); // 222.859f, 297.742f, 212.503f, 297.742f
@@ -1464,7 +1468,7 @@
builder.add(path96, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43e54635), SkBits2Float(0x43794ba0)); // 458.548f, 249.295f
path.quadTo(SkBits2Float(0x43e54635), SkBits2Float(0x4381d34c), SkBits2Float(0x43e19cf3), SkBits2Float(0x43857c8e)); // 458.548f, 259.651f, 451.226f, 266.973f
path.quadTo(SkBits2Float(0x43ddf3b1), SkBits2Float(0x438925d0), SkBits2Float(0x43d8c635), SkBits2Float(0x438925d0)); // 443.904f, 274.295f, 433.548f, 274.295f
@@ -1479,7 +1483,7 @@
builder.add(path97, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42596ac0), SkBits2Float(0x42f09a24)); // 54.3542f, 120.301f
path.quadTo(SkBits2Float(0x42596ac0), SkBits2Float(0x4302a809), SkBits2Float(0x423c20af), SkBits2Float(0x4309fa8e)); // 54.3542f, 130.656f, 47.0319f, 137.979f
path.quadTo(SkBits2Float(0x421ed69e), SkBits2Float(0x43114d12), SkBits2Float(0x41ead580), SkBits2Float(0x43114d12)); // 39.7096f, 145.301f, 29.3542f, 145.301f
@@ -1494,7 +1498,7 @@
builder.add(path98, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43ab48a8), SkBits2Float(0x438703b7)); // 342.568f, 270.029f
path.quadTo(SkBits2Float(0x43ab48a8), SkBits2Float(0x438c3133), SkBits2Float(0x43a79f66), SkBits2Float(0x438fda75)); // 342.568f, 280.384f, 335.245f, 287.707f
path.quadTo(SkBits2Float(0x43a3f624), SkBits2Float(0x439383b7), SkBits2Float(0x439ec8a8), SkBits2Float(0x439383b7)); // 327.923f, 295.029f, 317.568f, 295.029f
@@ -1509,7 +1513,7 @@
builder.add(path99, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43b3d091), SkBits2Float(0x4394a1fa)); // 359.629f, 297.265f
path.quadTo(SkBits2Float(0x43b3d091), SkBits2Float(0x4399cf76), SkBits2Float(0x43b0274f), SkBits2Float(0x439d78b8)); // 359.629f, 307.621f, 352.307f, 314.943f
path.quadTo(SkBits2Float(0x43ac7e0d), SkBits2Float(0x43a121fa), SkBits2Float(0x43a75091), SkBits2Float(0x43a121fa)); // 344.985f, 322.265f, 334.629f, 322.265f
@@ -1524,7 +1528,7 @@
builder.add(path100, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42a153aa), SkBits2Float(0x4387c2b8)); // 80.6634f, 271.521f
path.quadTo(SkBits2Float(0x42a153aa), SkBits2Float(0x438cf034), SkBits2Float(0x4292aea2), SkBits2Float(0x43909976)); // 80.6634f, 281.877f, 73.3411f, 289.199f
path.quadTo(SkBits2Float(0x42840999), SkBits2Float(0x439442b8), SkBits2Float(0x425ea754), SkBits2Float(0x439442b8)); // 66.0187f, 296.521f, 55.6634f, 296.521f
@@ -1539,7 +1543,7 @@
builder.add(path101, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x436da8c1), SkBits2Float(0x434950e1)); // 237.659f, 201.316f
path.quadTo(SkBits2Float(0x436da8c1), SkBits2Float(0x4353abd8), SkBits2Float(0x4366563d), SkBits2Float(0x435afe5d)); // 237.659f, 211.671f, 230.337f, 218.994f
path.quadTo(SkBits2Float(0x435f03b8), SkBits2Float(0x436250e1), SkBits2Float(0x4354a8c1), SkBits2Float(0x436250e1)); // 223.015f, 226.316f, 212.659f, 226.316f
@@ -1554,7 +1558,7 @@
builder.add(path102, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43ba530a), SkBits2Float(0x4376baae)); // 372.649f, 246.729f
path.quadTo(SkBits2Float(0x43ba530a), SkBits2Float(0x43808ad3), SkBits2Float(0x43b6a9c8), SkBits2Float(0x43843415)); // 372.649f, 257.085f, 365.326f, 264.407f
path.quadTo(SkBits2Float(0x43b30086), SkBits2Float(0x4387dd57), SkBits2Float(0x43add30a), SkBits2Float(0x4387dd57)); // 358.004f, 271.729f, 347.649f, 271.729f
@@ -1569,7 +1573,7 @@
builder.add(path103, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4399286a), SkBits2Float(0x435887a5)); // 306.316f, 216.53f
path.quadTo(SkBits2Float(0x4399286a), SkBits2Float(0x4362e29c), SkBits2Float(0x43957f28), SkBits2Float(0x436a3521)); // 306.316f, 226.885f, 298.993f, 234.208f
path.quadTo(SkBits2Float(0x4391d5e6), SkBits2Float(0x437187a5), SkBits2Float(0x438ca86a), SkBits2Float(0x437187a5)); // 291.671f, 241.53f, 281.316f, 241.53f
@@ -1584,7 +1588,7 @@
builder.add(path104, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43a08755), SkBits2Float(0x43120238)); // 321.057f, 146.009f
path.quadTo(SkBits2Float(0x43a08755), SkBits2Float(0x431c5d30), SkBits2Float(0x439cde13), SkBits2Float(0x4323afb4)); // 321.057f, 156.364f, 313.735f, 163.686f
path.quadTo(SkBits2Float(0x439934d1), SkBits2Float(0x432b0238), SkBits2Float(0x43940755), SkBits2Float(0x432b0238)); // 306.413f, 171.009f, 296.057f, 171.009f
@@ -1599,7 +1603,7 @@
builder.add(path105, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43e31764), SkBits2Float(0x438e240b)); // 454.183f, 284.282f
path.quadTo(SkBits2Float(0x43e31764), SkBits2Float(0x43935187), SkBits2Float(0x43df6e22), SkBits2Float(0x4396fac9)); // 454.183f, 294.637f, 446.86f, 301.959f
path.quadTo(SkBits2Float(0x43dbc4e0), SkBits2Float(0x439aa40b), SkBits2Float(0x43d69764), SkBits2Float(0x439aa40b)); // 439.538f, 309.282f, 429.183f, 309.282f
@@ -1614,7 +1618,7 @@
builder.add(path106, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43430483), SkBits2Float(0x4345764d)); // 195.018f, 197.462f
path.quadTo(SkBits2Float(0x43430483), SkBits2Float(0x434fd144), SkBits2Float(0x433bb1ff), SkBits2Float(0x435723c9)); // 195.018f, 207.817f, 187.695f, 215.14f
path.quadTo(SkBits2Float(0x43345f7a), SkBits2Float(0x435e764d), SkBits2Float(0x432a0483), SkBits2Float(0x435e764d)); // 180.373f, 222.462f, 170.018f, 222.462f
@@ -1629,7 +1633,7 @@
builder.add(path107, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x439a55b2), SkBits2Float(0x4370a1cc)); // 308.669f, 240.632f
path.quadTo(SkBits2Float(0x439a55b2), SkBits2Float(0x437afcc3), SkBits2Float(0x4396ac70), SkBits2Float(0x438127a4)); // 308.669f, 250.987f, 301.347f, 258.31f
path.quadTo(SkBits2Float(0x4393032e), SkBits2Float(0x4384d0e6), SkBits2Float(0x438dd5b2), SkBits2Float(0x4384d0e6)); // 294.025f, 265.632f, 283.669f, 265.632f
@@ -1644,7 +1648,7 @@
builder.add(path108, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42fcf02d), SkBits2Float(0x4327ee31)); // 126.469f, 167.93f
path.quadTo(SkBits2Float(0x42fcf02d), SkBits2Float(0x43324928), SkBits2Float(0x42ee4b24), SkBits2Float(0x43399bad)); // 126.469f, 178.286f, 119.147f, 185.608f
path.quadTo(SkBits2Float(0x42dfa61c), SkBits2Float(0x4340ee31), SkBits2Float(0x42caf02d), SkBits2Float(0x4340ee31)); // 111.824f, 192.93f, 101.469f, 192.93f
@@ -1659,7 +1663,7 @@
builder.add(path109, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4408a32e), SkBits2Float(0x438aadd7)); // 546.55f, 277.358f
path.quadTo(SkBits2Float(0x4408a32e), SkBits2Float(0x438fdb53), SkBits2Float(0x4406ce8d), SkBits2Float(0x43938495)); // 546.55f, 287.713f, 539.227f, 295.036f
path.quadTo(SkBits2Float(0x4404f9ec), SkBits2Float(0x43972dd7), SkBits2Float(0x4402632e), SkBits2Float(0x43972dd7)); // 531.905f, 302.358f, 521.55f, 302.358f
@@ -1674,7 +1678,7 @@
builder.add(path110, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43ae6436), SkBits2Float(0x4399c25d)); // 348.783f, 307.518f
path.quadTo(SkBits2Float(0x43ae6436), SkBits2Float(0x439eefd9), SkBits2Float(0x43aabaf4), SkBits2Float(0x43a2991b)); // 348.783f, 317.874f, 341.461f, 325.196f
path.quadTo(SkBits2Float(0x43a711b2), SkBits2Float(0x43a6425d), SkBits2Float(0x43a1e436), SkBits2Float(0x43a6425d)); // 334.138f, 332.518f, 323.783f, 332.518f
@@ -1689,7 +1693,7 @@
builder.add(path111, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x437ef735), SkBits2Float(0x43a4d766)); // 254.966f, 329.683f
path.quadTo(SkBits2Float(0x437ef735), SkBits2Float(0x43aa04e2), SkBits2Float(0x4377a4b1), SkBits2Float(0x43adae24)); // 254.966f, 340.038f, 247.643f, 347.36f
path.quadTo(SkBits2Float(0x4370522c), SkBits2Float(0x43b15766), SkBits2Float(0x4365f735), SkBits2Float(0x43b15766)); // 240.321f, 354.683f, 229.966f, 354.683f
@@ -1704,7 +1708,7 @@
builder.add(path112, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4323b1dd), SkBits2Float(0x433e57b5)); // 163.695f, 190.343f
path.quadTo(SkBits2Float(0x4323b1dd), SkBits2Float(0x4348b2ac), SkBits2Float(0x431c5f59), SkBits2Float(0x43500531)); // 163.695f, 200.698f, 156.372f, 208.02f
path.quadTo(SkBits2Float(0x43150cd4), SkBits2Float(0x435757b5), SkBits2Float(0x430ab1dd), SkBits2Float(0x435757b5)); // 149.05f, 215.343f, 138.695f, 215.343f
@@ -1719,7 +1723,7 @@
builder.add(path113, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x436e6f43), SkBits2Float(0x435d1aaa)); // 238.435f, 221.104f
path.quadTo(SkBits2Float(0x436e6f43), SkBits2Float(0x436775a2), SkBits2Float(0x43671cbf), SkBits2Float(0x436ec826)); // 238.435f, 231.46f, 231.112f, 238.782f
path.quadTo(SkBits2Float(0x435fca3a), SkBits2Float(0x43761aaa), SkBits2Float(0x43556f43), SkBits2Float(0x43761aaa)); // 223.79f, 246.104f, 213.435f, 246.104f
@@ -1734,7 +1738,7 @@
builder.add(path114, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43699f20), SkBits2Float(0x43b74967)); // 233.622f, 366.573f
path.quadTo(SkBits2Float(0x43699f20), SkBits2Float(0x43bc76e3), SkBits2Float(0x43624c9c), SkBits2Float(0x43c02025)); // 233.622f, 376.929f, 226.299f, 384.251f
path.quadTo(SkBits2Float(0x435afa18), SkBits2Float(0x43c3c967), SkBits2Float(0x43509f20), SkBits2Float(0x43c3c967)); // 218.977f, 391.573f, 208.622f, 391.573f
@@ -1749,7 +1753,7 @@
builder.add(path115, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4372b5ce), SkBits2Float(0x434919ea)); // 242.71f, 201.101f
path.quadTo(SkBits2Float(0x4372b5ce), SkBits2Float(0x435374e2), SkBits2Float(0x436b634a), SkBits2Float(0x435ac766)); // 242.71f, 211.457f, 235.388f, 218.779f
path.quadTo(SkBits2Float(0x436410c6), SkBits2Float(0x436219ea), SkBits2Float(0x4359b5ce), SkBits2Float(0x436219ea)); // 228.066f, 226.101f, 217.71f, 226.101f
@@ -1764,7 +1768,7 @@
builder.add(path116, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43212033), SkBits2Float(0x433c0771)); // 161.126f, 188.029f
path.quadTo(SkBits2Float(0x43212033), SkBits2Float(0x43466268), SkBits2Float(0x4319cdaf), SkBits2Float(0x434db4ed)); // 161.126f, 198.384f, 153.803f, 205.707f
path.quadTo(SkBits2Float(0x43127b2a), SkBits2Float(0x43550771), SkBits2Float(0x43082033), SkBits2Float(0x43550771)); // 146.481f, 213.029f, 136.126f, 213.029f
@@ -1779,7 +1783,7 @@
builder.add(path117, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x434d1191), SkBits2Float(0x431c5cdf)); // 205.069f, 156.363f
path.quadTo(SkBits2Float(0x434d1191), SkBits2Float(0x4326b7d6), SkBits2Float(0x4345bf0d), SkBits2Float(0x432e0a5b)); // 205.069f, 166.718f, 197.746f, 174.04f
path.quadTo(SkBits2Float(0x433e6c88), SkBits2Float(0x43355cdf), SkBits2Float(0x43341191), SkBits2Float(0x43355cdf)); // 190.424f, 181.363f, 180.069f, 181.363f
@@ -1794,7 +1798,7 @@
builder.add(path118, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43f7761c), SkBits2Float(0x43ba1964)); // 494.923f, 372.198f
path.quadTo(SkBits2Float(0x43f7761c), SkBits2Float(0x43bf46e0), SkBits2Float(0x43f3ccda), SkBits2Float(0x43c2f022)); // 494.923f, 382.554f, 487.6f, 389.876f
path.quadTo(SkBits2Float(0x43f02398), SkBits2Float(0x43c69964), SkBits2Float(0x43eaf61c), SkBits2Float(0x43c69964)); // 480.278f, 397.198f, 469.923f, 397.198f
@@ -1809,7 +1813,7 @@
builder.add(path119, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4387b4f4), SkBits2Float(0x4382767e)); // 271.414f, 260.926f
path.quadTo(SkBits2Float(0x4387b4f4), SkBits2Float(0x4387a3fa), SkBits2Float(0x43840bb2), SkBits2Float(0x438b4d3c)); // 271.414f, 271.281f, 264.091f, 278.603f
path.quadTo(SkBits2Float(0x43806270), SkBits2Float(0x438ef67e), SkBits2Float(0x437669e8), SkBits2Float(0x438ef67e)); // 256.769f, 285.926f, 246.414f, 285.926f
@@ -1824,7 +1828,7 @@
builder.add(path120, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43f176b1), SkBits2Float(0x437ef3b8)); // 482.927f, 254.952f
path.quadTo(SkBits2Float(0x43f176b1), SkBits2Float(0x4384a758), SkBits2Float(0x43edcd6f), SkBits2Float(0x4388509a)); // 482.927f, 265.307f, 475.605f, 272.63f
path.quadTo(SkBits2Float(0x43ea242d), SkBits2Float(0x438bf9dc), SkBits2Float(0x43e4f6b1), SkBits2Float(0x438bf9dc)); // 468.283f, 279.952f, 457.927f, 279.952f
@@ -1839,7 +1843,7 @@
builder.add(path121, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x437bd45b), SkBits2Float(0x4361cf52)); // 251.83f, 225.81f
path.quadTo(SkBits2Float(0x437bd45b), SkBits2Float(0x436c2a4a), SkBits2Float(0x437481d7), SkBits2Float(0x43737cce)); // 251.83f, 236.165f, 244.507f, 243.488f
path.quadTo(SkBits2Float(0x436d2f52), SkBits2Float(0x437acf52), SkBits2Float(0x4362d45b), SkBits2Float(0x437acf52)); // 237.185f, 250.81f, 226.83f, 250.81f
@@ -1854,7 +1858,7 @@
builder.add(path122, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43bb783c), SkBits2Float(0x43d20000)); // 374.939f, 420
path.quadTo(SkBits2Float(0x43bb783c), SkBits2Float(0x43d72d7c), SkBits2Float(0x43b7cefa), SkBits2Float(0x43dad6be)); // 374.939f, 430.355f, 367.617f, 437.678f
path.quadTo(SkBits2Float(0x43b425b8), SkBits2Float(0x43de8000), SkBits2Float(0x43aef83c), SkBits2Float(0x43de8000)); // 360.295f, 445, 349.939f, 445
@@ -1869,7 +1873,7 @@
builder.add(path123, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43ca2436), SkBits2Float(0x435899a3)); // 404.283f, 216.6f
path.quadTo(SkBits2Float(0x43ca2436), SkBits2Float(0x4362f49a), SkBits2Float(0x43c67af4), SkBits2Float(0x436a471f)); // 404.283f, 226.955f, 396.961f, 234.278f
path.quadTo(SkBits2Float(0x43c2d1b2), SkBits2Float(0x437199a3), SkBits2Float(0x43bda436), SkBits2Float(0x437199a3)); // 389.638f, 241.6f, 379.283f, 241.6f
@@ -1884,7 +1888,7 @@
builder.add(path124, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x440faed8), SkBits2Float(0x43474968)); // 574.732f, 199.287f
path.quadTo(SkBits2Float(0x440faed8), SkBits2Float(0x4351a460), SkBits2Float(0x440dda37), SkBits2Float(0x4358f6e4)); // 574.732f, 209.642f, 567.41f, 216.964f
path.quadTo(SkBits2Float(0x440c0596), SkBits2Float(0x43604968), SkBits2Float(0x44096ed8), SkBits2Float(0x43604968)); // 560.087f, 224.287f, 549.732f, 224.287f
@@ -1899,7 +1903,7 @@
builder.add(path125, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x437055b3), SkBits2Float(0x438ae764)); // 240.335f, 277.808f
path.quadTo(SkBits2Float(0x437055b3), SkBits2Float(0x439014e0), SkBits2Float(0x4369032f), SkBits2Float(0x4393be22)); // 240.335f, 288.163f, 233.012f, 295.485f
path.quadTo(SkBits2Float(0x4361b0aa), SkBits2Float(0x43976764), SkBits2Float(0x435755b3), SkBits2Float(0x43976764)); // 225.69f, 302.808f, 215.335f, 302.808f
@@ -1914,7 +1918,7 @@
builder.add(path126, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43a201c9), SkBits2Float(0x43546e88)); // 324.014f, 212.432f
path.quadTo(SkBits2Float(0x43a201c9), SkBits2Float(0x435ec980), SkBits2Float(0x439e5887), SkBits2Float(0x43661c04)); // 324.014f, 222.787f, 316.692f, 230.109f
path.quadTo(SkBits2Float(0x439aaf45), SkBits2Float(0x436d6e88), SkBits2Float(0x439581c9), SkBits2Float(0x436d6e88)); // 309.369f, 237.432f, 299.014f, 237.432f
@@ -1929,7 +1933,7 @@
builder.add(path127, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42d10265), SkBits2Float(0x434da766)); // 104.505f, 205.654f
path.quadTo(SkBits2Float(0x42d10265), SkBits2Float(0x4358025e), SkBits2Float(0x42c25d5c), SkBits2Float(0x435f54e2)); // 104.505f, 216.009f, 97.1823f, 223.332f
path.quadTo(SkBits2Float(0x42b3b854), SkBits2Float(0x4366a766), SkBits2Float(0x429f0265), SkBits2Float(0x4366a766)); // 89.86f, 230.654f, 79.5047f, 230.654f
@@ -1944,7 +1948,7 @@
builder.add(path128, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4396e5f4), SkBits2Float(0x432540f2)); // 301.797f, 165.254f
path.quadTo(SkBits2Float(0x4396e5f4), SkBits2Float(0x432f9bea), SkBits2Float(0x43933cb2), SkBits2Float(0x4336ee6e)); // 301.797f, 175.609f, 294.474f, 182.931f
path.quadTo(SkBits2Float(0x438f9370), SkBits2Float(0x433e40f2), SkBits2Float(0x438a65f4), SkBits2Float(0x433e40f2)); // 287.152f, 190.254f, 276.797f, 190.254f
@@ -1959,7 +1963,7 @@
builder.add(path129, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43759ab0), SkBits2Float(0x43329c4b)); // 245.604f, 178.611f
path.quadTo(SkBits2Float(0x43759ab0), SkBits2Float(0x433cf742), SkBits2Float(0x436e482c), SkBits2Float(0x434449c7)); // 245.604f, 188.966f, 238.282f, 196.288f
path.quadTo(SkBits2Float(0x4366f5a8), SkBits2Float(0x434b9c4b), SkBits2Float(0x435c9ab0), SkBits2Float(0x434b9c4b)); // 230.96f, 203.611f, 220.604f, 203.611f
@@ -1974,7 +1978,7 @@
builder.add(path130, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43a6e3cc), SkBits2Float(0x43954ede)); // 333.78f, 298.616f
path.quadTo(SkBits2Float(0x43a6e3cc), SkBits2Float(0x439a7c5a), SkBits2Float(0x43a33a8a), SkBits2Float(0x439e259c)); // 333.78f, 308.971f, 326.457f, 316.294f
path.quadTo(SkBits2Float(0x439f9148), SkBits2Float(0x43a1cede), SkBits2Float(0x439a63cc), SkBits2Float(0x43a1cede)); // 319.135f, 323.616f, 308.78f, 323.616f
@@ -1989,7 +1993,7 @@
builder.add(path131, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x428e400e), SkBits2Float(0x43a02b61)); // 71.1251f, 320.339f
path.quadTo(SkBits2Float(0x428e400e), SkBits2Float(0x43a558dd), SkBits2Float(0x427f360c), SkBits2Float(0x43a9021f)); // 71.1251f, 330.694f, 63.8028f, 338.017f
path.quadTo(SkBits2Float(0x4261ebfa), SkBits2Float(0x43acab61), SkBits2Float(0x4238801c), SkBits2Float(0x43acab61)); // 56.4804f, 345.339f, 46.1251f, 345.339f
@@ -2004,7 +2008,7 @@
builder.add(path132, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4323b27c), SkBits2Float(0x4379f49c)); // 163.697f, 249.956f
path.quadTo(SkBits2Float(0x4323b27c), SkBits2Float(0x438227ca), SkBits2Float(0x431c5ff8), SkBits2Float(0x4385d10c)); // 163.697f, 260.311f, 156.375f, 267.633f
path.quadTo(SkBits2Float(0x43150d74), SkBits2Float(0x43897a4e), SkBits2Float(0x430ab27c), SkBits2Float(0x43897a4e)); // 149.053f, 274.956f, 138.697f, 274.956f
@@ -2019,7 +2023,7 @@
builder.add(path133, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43629af6), SkBits2Float(0x434de1f1)); // 226.605f, 205.883f
path.quadTo(SkBits2Float(0x43629af6), SkBits2Float(0x43583ce8), SkBits2Float(0x435b4872), SkBits2Float(0x435f8f6d)); // 226.605f, 216.238f, 219.283f, 223.56f
path.quadTo(SkBits2Float(0x4353f5ee), SkBits2Float(0x4366e1f1), SkBits2Float(0x43499af6), SkBits2Float(0x4366e1f1)); // 211.961f, 230.883f, 201.605f, 230.883f
@@ -2034,7 +2038,7 @@
builder.add(path134, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43969933), SkBits2Float(0x00000000)); // 301.197f, 0
path.quadTo(SkBits2Float(0x43969933), SkBits2Float(0x4125af78), SkBits2Float(0x4392eff1), SkBits2Float(0x418d6bde)); // 301.197f, 10.3553f, 293.875f, 17.6777f
path.quadTo(SkBits2Float(0x438f46af), SkBits2Float(0x41c80000), SkBits2Float(0x438a1933), SkBits2Float(0x41c80000)); // 286.552f, 25, 276.197f, 25
@@ -2049,7 +2053,7 @@
builder.add(path135, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43310d09), SkBits2Float(0x43ab2014)); // 177.051f, 342.251f
path.quadTo(SkBits2Float(0x43310d09), SkBits2Float(0x43b04d90), SkBits2Float(0x4329ba85), SkBits2Float(0x43b3f6d2)); // 177.051f, 352.606f, 169.729f, 359.928f
path.quadTo(SkBits2Float(0x43226800), SkBits2Float(0x43b7a014), SkBits2Float(0x43180d09), SkBits2Float(0x43b7a014)); // 162.406f, 367.251f, 152.051f, 367.251f
@@ -2064,7 +2068,7 @@
builder.add(path136, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43c19844), SkBits2Float(0x43818fc9)); // 387.19f, 259.123f
path.quadTo(SkBits2Float(0x43c19844), SkBits2Float(0x4386bd45), SkBits2Float(0x43bdef02), SkBits2Float(0x438a6687)); // 387.19f, 269.479f, 379.867f, 276.801f
path.quadTo(SkBits2Float(0x43ba45c0), SkBits2Float(0x438e0fc9), SkBits2Float(0x43b51844), SkBits2Float(0x438e0fc9)); // 372.545f, 284.123f, 362.19f, 284.123f
@@ -2079,7 +2083,7 @@
builder.add(path137, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43565ef5), SkBits2Float(0x42de6e20)); // 214.371f, 111.215f
path.quadTo(SkBits2Float(0x43565ef5), SkBits2Float(0x42f3240f), SkBits2Float(0x434f0c71), SkBits2Float(0x4300e48c)); // 214.371f, 121.57f, 207.049f, 128.893f
path.quadTo(SkBits2Float(0x4347b9ec), SkBits2Float(0x43083710), SkBits2Float(0x433d5ef5), SkBits2Float(0x43083710)); // 199.726f, 136.215f, 189.371f, 136.215f
@@ -2094,7 +2098,7 @@
builder.add(path138, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43e8a73d), SkBits2Float(0x439f6574)); // 465.307f, 318.793f
path.quadTo(SkBits2Float(0x43e8a73d), SkBits2Float(0x43a492f0), SkBits2Float(0x43e4fdfb), SkBits2Float(0x43a83c32)); // 465.307f, 329.148f, 457.984f, 336.47f
path.quadTo(SkBits2Float(0x43e154b9), SkBits2Float(0x43abe574), SkBits2Float(0x43dc273d), SkBits2Float(0x43abe574)); // 450.662f, 343.793f, 440.307f, 343.793f
@@ -2109,7 +2113,7 @@
builder.add(path139, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43abcc05), SkBits2Float(0x42d3af00)); // 343.594f, 105.842f
path.quadTo(SkBits2Float(0x43abcc05), SkBits2Float(0x42e864ef), SkBits2Float(0x43a822c3), SkBits2Float(0x42f709f8)); // 343.594f, 116.197f, 336.272f, 123.519f
path.quadTo(SkBits2Float(0x43a47981), SkBits2Float(0x4302d780), SkBits2Float(0x439f4c05), SkBits2Float(0x4302d780)); // 328.949f, 130.842f, 318.594f, 130.842f
@@ -2124,7 +2128,7 @@
builder.add(path140, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x438e8ffa), SkBits2Float(0x438bdd2b)); // 285.125f, 279.728f
path.quadTo(SkBits2Float(0x438e8ffa), SkBits2Float(0x43910aa7), SkBits2Float(0x438ae6b8), SkBits2Float(0x4394b3e9)); // 285.125f, 290.083f, 277.802f, 297.406f
path.quadTo(SkBits2Float(0x43873d76), SkBits2Float(0x43985d2b), SkBits2Float(0x43820ffa), SkBits2Float(0x43985d2b)); // 270.48f, 304.728f, 260.125f, 304.728f
@@ -2139,7 +2143,7 @@
builder.add(path141, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x441d8000), SkBits2Float(0x435e8072)); // 630, 222.502f
path.quadTo(SkBits2Float(0x441d8000), SkBits2Float(0x4368db6a), SkBits2Float(0x441bab5f), SkBits2Float(0x43702dee)); // 630, 232.857f, 622.678f, 240.179f
path.quadTo(SkBits2Float(0x4419d6be), SkBits2Float(0x43778072), SkBits2Float(0x44174000), SkBits2Float(0x43778072)); // 615.355f, 247.502f, 605, 247.502f
@@ -2154,7 +2158,7 @@
builder.add(path142, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43cab007), SkBits2Float(0x4370ffc2)); // 405.375f, 240.999f
path.quadTo(SkBits2Float(0x43cab007), SkBits2Float(0x437b5aba), SkBits2Float(0x43c706c5), SkBits2Float(0x4381569f)); // 405.375f, 251.354f, 398.053f, 258.677f
path.quadTo(SkBits2Float(0x43c35d83), SkBits2Float(0x4384ffe1), SkBits2Float(0x43be3007), SkBits2Float(0x4384ffe1)); // 390.731f, 265.999f, 380.375f, 265.999f
@@ -2169,7 +2173,7 @@
builder.add(path143, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43ae2f7d), SkBits2Float(0x43587ea0)); // 348.371f, 216.495f
path.quadTo(SkBits2Float(0x43ae2f7d), SkBits2Float(0x4362d998), SkBits2Float(0x43aa863b), SkBits2Float(0x436a2c1c)); // 348.371f, 226.85f, 341.049f, 234.172f
path.quadTo(SkBits2Float(0x43a6dcf9), SkBits2Float(0x43717ea0), SkBits2Float(0x43a1af7d), SkBits2Float(0x43717ea0)); // 333.726f, 241.495f, 323.371f, 241.495f
@@ -2184,7 +2188,7 @@
builder.add(path144, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43add1a9), SkBits2Float(0x436897ac)); // 347.638f, 232.592f
path.quadTo(SkBits2Float(0x43add1a9), SkBits2Float(0x4372f2a3), SkBits2Float(0x43aa2867), SkBits2Float(0x437a4527)); // 347.638f, 242.948f, 340.316f, 250.27f
path.quadTo(SkBits2Float(0x43a67f25), SkBits2Float(0x4380cbd6), SkBits2Float(0x43a151a9), SkBits2Float(0x4380cbd6)); // 332.993f, 257.592f, 322.638f, 257.592f
@@ -2199,7 +2203,7 @@
builder.add(path145, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43f37c5c), SkBits2Float(0x438cffd4)); // 486.972f, 281.999f
path.quadTo(SkBits2Float(0x43f37c5c), SkBits2Float(0x43922d50), SkBits2Float(0x43efd31a), SkBits2Float(0x4395d692)); // 486.972f, 292.354f, 479.649f, 299.676f
path.quadTo(SkBits2Float(0x43ec29d8), SkBits2Float(0x43997fd4), SkBits2Float(0x43e6fc5c), SkBits2Float(0x43997fd4)); // 472.327f, 306.999f, 461.972f, 306.999f
@@ -2214,7 +2218,7 @@
builder.add(path146, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x434938a6), SkBits2Float(0x439b6682)); // 201.221f, 310.801f
path.quadTo(SkBits2Float(0x434938a6), SkBits2Float(0x43a093fe), SkBits2Float(0x4341e622), SkBits2Float(0x43a43d40)); // 201.221f, 321.156f, 193.899f, 328.479f
path.quadTo(SkBits2Float(0x433a939e), SkBits2Float(0x43a7e682), SkBits2Float(0x433038a6), SkBits2Float(0x43a7e682)); // 186.577f, 335.801f, 176.221f, 335.801f
@@ -2229,7 +2233,7 @@
builder.add(path147, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43957ad9), SkBits2Float(0x4340d6a9)); // 298.96f, 192.839f
path.quadTo(SkBits2Float(0x43957ad9), SkBits2Float(0x434b31a0), SkBits2Float(0x4391d197), SkBits2Float(0x43528425)); // 298.96f, 203.194f, 291.637f, 210.516f
path.quadTo(SkBits2Float(0x438e2855), SkBits2Float(0x4359d6a9), SkBits2Float(0x4388fad9), SkBits2Float(0x4359d6a9)); // 284.315f, 217.839f, 273.96f, 217.839f
@@ -2244,7 +2248,7 @@
builder.add(path148, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4359cdc3), SkBits2Float(0x431623e6)); // 217.804f, 150.14f
path.quadTo(SkBits2Float(0x4359cdc3), SkBits2Float(0x43207ede), SkBits2Float(0x43527b3f), SkBits2Float(0x4327d162)); // 217.804f, 160.496f, 210.481f, 167.818f
path.quadTo(SkBits2Float(0x434b28ba), SkBits2Float(0x432f23e6), SkBits2Float(0x4340cdc3), SkBits2Float(0x432f23e6)); // 203.159f, 175.14f, 192.804f, 175.14f
@@ -2259,7 +2263,7 @@
builder.add(path149, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4395d72b), SkBits2Float(0x43c5524a)); // 299.681f, 394.643f
path.quadTo(SkBits2Float(0x4395d72b), SkBits2Float(0x43ca7fc6), SkBits2Float(0x43922de9), SkBits2Float(0x43ce2908)); // 299.681f, 404.998f, 292.359f, 412.321f
path.quadTo(SkBits2Float(0x438e84a7), SkBits2Float(0x43d1d24a), SkBits2Float(0x4389572b), SkBits2Float(0x43d1d24a)); // 285.036f, 419.643f, 274.681f, 419.643f
@@ -2274,7 +2278,7 @@
builder.add(path150, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43884f5e), SkBits2Float(0x436c6388)); // 272.62f, 236.389f
path.quadTo(SkBits2Float(0x43884f5e), SkBits2Float(0x4376be7f), SkBits2Float(0x4384a61c), SkBits2Float(0x437e1103)); // 272.62f, 246.744f, 265.298f, 254.066f
path.quadTo(SkBits2Float(0x4380fcda), SkBits2Float(0x4382b1c4), SkBits2Float(0x43779ebc), SkBits2Float(0x4382b1c4)); // 257.975f, 261.389f, 247.62f, 261.389f
@@ -2289,7 +2293,7 @@
builder.add(path151, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43ac3331), SkBits2Float(0x4330c484)); // 344.4f, 176.768f
path.quadTo(SkBits2Float(0x43ac3331), SkBits2Float(0x433b1f7c), SkBits2Float(0x43a889ef), SkBits2Float(0x43427200)); // 344.4f, 187.123f, 337.078f, 194.445f
path.quadTo(SkBits2Float(0x43a4e0ad), SkBits2Float(0x4349c484), SkBits2Float(0x439fb331), SkBits2Float(0x4349c484)); // 329.755f, 201.768f, 319.4f, 201.768f
@@ -2304,7 +2308,7 @@
builder.add(path152, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x435659f0), SkBits2Float(0x438a1820)); // 214.351f, 276.188f
path.quadTo(SkBits2Float(0x435659f0), SkBits2Float(0x438f459c), SkBits2Float(0x434f076c), SkBits2Float(0x4392eede)); // 214.351f, 286.544f, 207.029f, 293.866f
path.quadTo(SkBits2Float(0x4347b4e8), SkBits2Float(0x43969820), SkBits2Float(0x433d59f0), SkBits2Float(0x43969820)); // 199.707f, 301.188f, 189.351f, 301.188f
@@ -2319,7 +2323,7 @@
builder.add(path153, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x437aa20e), SkBits2Float(0x434e714e)); // 250.633f, 206.443f
path.quadTo(SkBits2Float(0x437aa20e), SkBits2Float(0x4358cc46), SkBits2Float(0x43734f8a), SkBits2Float(0x43601eca)); // 250.633f, 216.798f, 243.311f, 224.12f
path.quadTo(SkBits2Float(0x436bfd06), SkBits2Float(0x4367714e), SkBits2Float(0x4361a20e), SkBits2Float(0x4367714e)); // 235.988f, 231.443f, 225.633f, 231.443f
@@ -2334,7 +2338,7 @@
builder.add(path154, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43ed22e3), SkBits2Float(0x439da644)); // 474.273f, 315.299f
path.quadTo(SkBits2Float(0x43ed22e3), SkBits2Float(0x43a2d3c0), SkBits2Float(0x43e979a1), SkBits2Float(0x43a67d02)); // 474.273f, 325.654f, 466.95f, 332.977f
path.quadTo(SkBits2Float(0x43e5d05f), SkBits2Float(0x43aa2644), SkBits2Float(0x43e0a2e3), SkBits2Float(0x43aa2644)); // 459.628f, 340.299f, 449.273f, 340.299f
@@ -2349,7 +2353,7 @@
builder.add(path155, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43cc4428), SkBits2Float(0x43797560)); // 408.532f, 249.458f
path.quadTo(SkBits2Float(0x43cc4428), SkBits2Float(0x4381e82c), SkBits2Float(0x43c89ae6), SkBits2Float(0x4385916e)); // 408.532f, 259.814f, 401.21f, 267.136f
path.quadTo(SkBits2Float(0x43c4f1a4), SkBits2Float(0x43893ab0), SkBits2Float(0x43bfc428), SkBits2Float(0x43893ab0)); // 393.888f, 274.458f, 383.532f, 274.458f
@@ -2364,7 +2368,7 @@
builder.add(path156, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42e47b81), SkBits2Float(0x43b97683)); // 114.241f, 370.926f
path.quadTo(SkBits2Float(0x42e47b81), SkBits2Float(0x43bea3ff), SkBits2Float(0x42d5d678), SkBits2Float(0x43c24d41)); // 114.241f, 381.281f, 106.919f, 388.604f
path.quadTo(SkBits2Float(0x42c73170), SkBits2Float(0x43c5f683), SkBits2Float(0x42b27b81), SkBits2Float(0x43c5f683)); // 99.5966f, 395.926f, 89.2412f, 395.926f
@@ -2379,7 +2383,7 @@
builder.add(path157, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4384239e), SkBits2Float(0x42a36f30)); // 264.278f, 81.7172f
path.quadTo(SkBits2Float(0x4384239e), SkBits2Float(0x42b8251f), SkBits2Float(0x43807a5c), SkBits2Float(0x42c6ca28)); // 264.278f, 92.0725f, 256.956f, 99.3948f
path.quadTo(SkBits2Float(0x4379a234), SkBits2Float(0x42d56f30), SkBits2Float(0x436f473c), SkBits2Float(0x42d56f30)); // 249.634f, 106.717f, 239.278f, 106.717f
@@ -2394,7 +2398,7 @@
builder.add(path158, (SkPathOp) 2);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x435be541), SkBits2Float(0x43baaaf6)); // 219.896f, 373.336f
path.quadTo(SkBits2Float(0x435be541), SkBits2Float(0x43bfd872), SkBits2Float(0x435492bd), SkBits2Float(0x43c381b4)); // 219.896f, 383.691f, 212.573f, 391.013f
path.quadTo(SkBits2Float(0x434d4038), SkBits2Float(0x43c72af6), SkBits2Float(0x4342e541), SkBits2Float(0x43c72af6)); // 205.251f, 398.336f, 194.896f, 398.336f
diff --git a/tests/PathOpsBuilderConicTest.cpp b/tests/PathOpsBuilderConicTest.cpp
index 062578c..f776b43 100644
--- a/tests/PathOpsBuilderConicTest.cpp
+++ b/tests/PathOpsBuilderConicTest.cpp
@@ -54,7 +54,7 @@
static void testOne(skiatest::Reporter* reporter, const OvalSet& set) {
SkPath oval, regionResult, builderResult, opResult;
- oval.setFillType(SkPathFillType::kWinding);
+ oval.setFillType(SkPath::kWinding_FillType);
oval.addOval(set.fBounds);
SkOpBuilder builder;
SkRegion region;
@@ -412,7 +412,7 @@
DEF_TEST(SixtyOvalsA, reporter) {
SkPath path;
-path.setFillType(SkPathFillType::kEvenOdd);
+path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(11.1722f, -8.10398f);
path.conicTo(22.9143f, -10.3787f, 23.7764f, -7.72542f, 1.00863f);
path.conicTo(24.6671f, -4.98406f, 13.8147f, 0.0166066f, 0.973016f);
@@ -439,7 +439,7 @@
path.close();
SkPath one(path);
path.reset();
-path.setFillType(SkPathFillType::kWinding);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(-1.54509f, -4.75528f);
path.conicTo(22.2313f, -12.4807f, 23.7764f, -7.72543f, 0.707107f);
path.conicTo(25.3215f, -2.97014f, 1.54509f, 4.75528f, 0.707107f);
@@ -453,7 +453,7 @@
DEF_TEST(SixtyOvalsAX, reporter) {
SkPath path;
-path.setFillType(SkPathFillType::kEvenOdd);
+path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(SkBits2Float(0x4132c174), SkBits2Float(0xc101a9e5)); // 11.1722f, -8.10398f
path.conicTo(SkBits2Float(0x41b7508a), SkBits2Float(0xc1260efe), SkBits2Float(0x41be3618), SkBits2Float(0xc0f736ad), SkBits2Float(0x3f811abd)); // 22.9143f, -10.3787f, 23.7764f, -7.72542f, 1.00863f
path.conicTo(SkBits2Float(0x41c5564b), SkBits2Float(0xc09f7d6d), SkBits2Float(0x415d0934), SkBits2Float(0x3c880a93), SkBits2Float(0x3f79179a)); // 24.6671f, -4.98406f, 13.8147f, 0.0166066f, 0.973016f
@@ -481,7 +481,7 @@
path.close();
SkPath one(path);
path.reset();
-path.setFillType(SkPathFillType::kWinding);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0xbfc5c55c), SkBits2Float(0xc0982b46)); // -1.54509f, -4.75528f
path.conicTo(SkBits2Float(0x41b1d9c2), SkBits2Float(0xc147b0fc), SkBits2Float(0x41be3618), SkBits2Float(0xc0f736b3), SkBits2Float(0x3f3504f3)); // 22.2313f, -12.4807f, 23.7764f, -7.72543f, 0.707107f
path.conicTo(SkBits2Float(0x41ca926e), SkBits2Float(0xc03e16da), SkBits2Float(0x3fc5c55c), SkBits2Float(0x40982b46), SkBits2Float(0x3f3504f3)); // 25.3215f, -2.97014f, 1.54509f, 4.75528f, 0.707107f
diff --git a/tests/PathOpsBuilderTest.cpp b/tests/PathOpsBuilderTest.cpp
index 31c02fe..86d4f49 100644
--- a/tests/PathOpsBuilderTest.cpp
+++ b/tests/PathOpsBuilderTest.cpp
@@ -25,7 +25,7 @@
REPORTER_ASSERT(reporter, result.isEmpty());
SkPath rectPath;
- rectPath.setFillType(SkPathFillType::kEvenOdd);
+ rectPath.setFillType(SkPath::kEvenOdd_FillType);
rectPath.addRect(0, 1, 2, 3, SkPathDirection::kCW);
builder.add(rectPath, kUnion_SkPathOp);
REPORTER_ASSERT(reporter, builder.resolve(&result));
@@ -38,7 +38,7 @@
REPORTER_ASSERT(reporter, pixelDiff == 0);
rectPath.reset();
- rectPath.setFillType(SkPathFillType::kEvenOdd);
+ rectPath.setFillType(SkPath::kEvenOdd_FillType);
rectPath.addRect(0, 1, 2, 3, SkPathDirection::kCCW);
builder.add(rectPath, kUnion_SkPathOp);
REPORTER_ASSERT(reporter, builder.resolve(&result));
@@ -138,10 +138,10 @@
DEF_TEST(BuilderIssue502792_2, reporter) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.addRect(0, 0, 1, 1, SkPathDirection::kCW);
path.addRect(2, 2, 3, 3, SkPathDirection::kCW);
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.addRect(3, 3, 4, 4, SkPathDirection::kCW);
pathB.addRect(3, 3, 4, 4, SkPathDirection::kCW);
SkOpBuilder builder;
@@ -304,14 +304,14 @@
DEF_TEST(SkOpBuilderFuzz665, reporter) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(SkBits2Float(0xcc4264a7), SkBits2Float(0x4bb12e50)); // -5.0959e+07f, 2.32235e+07f
path.lineTo(SkBits2Float(0xcc4264b0), SkBits2Float(0x4bb12e48)); // -5.0959e+07f, 2.32234e+07f
path.lineTo(SkBits2Float(0xcc4264a7), SkBits2Float(0x4bb12e50)); // -5.0959e+07f, 2.32235e+07f
path.close();
SkPath path1(path);
path.reset();
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x43213333), SkBits2Float(0x43080000)); // 161.2f, 136
path.lineTo(SkBits2Float(0x43038000), SkBits2Float(0x43080000)); // 131.5f, 136
path.cubicTo(SkBits2Float(0x43038000), SkBits2Float(0x42f00000), SkBits2Float(0x42f16666), SkBits2Float(0x42d53333), SkBits2Float(0x42d3cccd), SkBits2Float(0x42cd6666)); // 131.5f, 120, 120.7f, 106.6f, 105.9f, 102.7f
diff --git a/tests/PathOpsChalkboardTest.cpp b/tests/PathOpsChalkboardTest.cpp
index b75dfdd..6c03f2c 100644
--- a/tests/PathOpsChalkboardTest.cpp
+++ b/tests/PathOpsChalkboardTest.cpp
@@ -15,6 +15,7 @@
static void chalkboard(skiatest::Reporter* reporter, uint64_t testlines) {
SkPath path;
+ path.setFillType((SkPath::FillType) 0);
uint64_t i = 0;
path.moveTo(SkBits2Float(0x4470eed9), SkBits2Float(0x439c1ac1)); // 963.732f, 312.209f
if (testlines & (1LL << i++)) path.lineTo(SkBits2Float(0x4470dde3), SkBits2Float(0x439c63d8)); // 963.467f, 312.78f
diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp
index a9923d6..45699d7 100644
--- a/tests/PathOpsExtendedTest.cpp
+++ b/tests/PathOpsExtendedTest.cpp
@@ -452,7 +452,7 @@
bool testSimplify(SkPath& path, bool useXor, SkPath& out, PathOpsThreadState& state,
const char* pathStr) {
static SkMutex& simplifyDebugOut = *(new SkMutex);
- SkPathFillType fillType = useXor ? SkPathFillType::kEvenOdd : SkPathFillType::kWinding;
+ SkPath::FillType fillType = useXor ? SkPath::kEvenOdd_FillType : SkPath::kWinding_FillType;
path.setFillType(fillType);
state.fReporter->bumpTestCount();
if (!Simplify(path, &out)) {
@@ -469,8 +469,8 @@
std::string str;
const char* pathPrefix = nullptr;
const char* nameSuffix = nullptr;
- if (fillType == SkPathFillType::kEvenOdd) {
- pathPrefix = " path.setFillType(SkPathFillType::kEvenOdd);\n";
+ if (fillType == SkPath::kEvenOdd_FillType) {
+ pathPrefix = " path.setFillType(SkPath::kEvenOdd_FillType);\n";
nameSuffix = "x";
}
const char testFunction[] = "testSimplify(reporter, path);";
@@ -772,12 +772,12 @@
}
}
-void PathOpsThreadState::outputProgress(const char* pathStr, SkPathFillType pathFillType) {
+void PathOpsThreadState::outputProgress(const char* pathStr, SkPath::FillType pathFillType) {
const char testFunction[] = "testSimplify(path);";
const char* pathPrefix = nullptr;
const char* nameSuffix = nullptr;
- if (pathFillType == SkPathFillType::kEvenOdd) {
- pathPrefix = " path.setFillType(SkPathFillType::kEvenOdd);\n";
+ if (pathFillType == SkPath::kEvenOdd_FillType) {
+ pathPrefix = " path.setFillType(SkPath::kEvenOdd_FillType);\n";
nameSuffix = "x";
}
appendTest(pathStr, pathPrefix, nameSuffix, testFunction, false, fPathStr);
diff --git a/tests/PathOpsFuzz763Test.cpp b/tests/PathOpsFuzz763Test.cpp
index 1e50a9e..3e864bf 100644
--- a/tests/PathOpsFuzz763Test.cpp
+++ b/tests/PathOpsFuzz763Test.cpp
@@ -11,7 +11,7 @@
static void fuzz763_3084(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xc19e6455), SkBits2Float(0xc19e6455));
path.quadTo(SkBits2Float(0xc1399153), SkBits2Float(0xc1e00000), SkBits2Float(0x00000000), SkBits2Float(0xc1e00000));
path.quadTo(SkBits2Float(0x41399153), SkBits2Float(0xc1e00000), SkBits2Float(0x419e6455), SkBits2Float(0xc19e6455));
@@ -49,7 +49,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42240000), SkBits2Float(0x42040000));
path.quadTo(SkBits2Float(0x42240000), SkBits2Float(0x4211413d), SkBits2Float(0x421aa09e), SkBits2Float(0x421aa09e));
path.quadTo(SkBits2Float(0x4211413d), SkBits2Float(0x42240000), SkBits2Float(0x42040000), SkBits2Float(0x42240000));
@@ -67,7 +67,7 @@
static void fuzz763_1823(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xc19e6455), SkBits2Float(0xc19e6455));
path.quadTo(SkBits2Float(0xc1399153), SkBits2Float(0xc1e00000), SkBits2Float(0x00000000), SkBits2Float(0xc1e00000));
path.quadTo(SkBits2Float(0x41399153), SkBits2Float(0xc1e00000), SkBits2Float(0x419e6455), SkBits2Float(0xc19e6455));
@@ -104,7 +104,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41000000), SkBits2Float(0x42040000));
path.quadTo(SkBits2Float(0x41000000), SkBits2Float(0x4211413d), SkBits2Float(0x40b504f3), SkBits2Float(0x421aa09e));
path.quadTo(SkBits2Float(0x405413cd), SkBits2Float(0x42240000), SkBits2Float(0x00000000), SkBits2Float(0x42240000));
@@ -122,7 +122,7 @@
static void fuzz763_378(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x41013776), SkBits2Float(0xc25007a8));
path.quadTo(SkBits2Float(0x412f219e), SkBits2Float(0xc256a86f), SkBits2Float(0x41625842), SkBits2Float(0xc2533a60));
path.quadTo(SkBits2Float(0x418ac776), SkBits2Float(0xc24fcc52), SkBits2Float(0x41980904), SkBits2Float(0xc24451c8));
@@ -198,7 +198,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0xc2444fb0), SkBits2Float(0x419813d4));
path.quadTo(SkBits2Float(0xc24fca68), SkBits2Float(0x418ad2e8), SkBits2Float(0xc25338d1), SkBits2Float(0x41626f8c));
path.quadTo(SkBits2Float(0xc256a73a), SkBits2Float(0x412f3944), SkBits2Float(0xc25006c4), SkBits2Float(0x41014e62));
@@ -215,7 +215,7 @@
static void fuzz763_378b(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(-47.1494f, 4.35143f);
path.quadTo(-39.8075f, 18.9486f, -43.0083f, 19.8062f);
path.quadTo(-50.35f, 5.21042f, -52.0068f, 8.08022f);
@@ -225,7 +225,7 @@
path.close();
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0xc2444fb0), SkBits2Float(0x419813d4));
path.quadTo(SkBits2Float(0xc24fca68), SkBits2Float(0x418ad2e8), SkBits2Float(0xc25338d1), SkBits2Float(0x41626f8c));
path.quadTo(SkBits2Float(0xc256a73a), SkBits2Float(0x412f3944), SkBits2Float(0xc25006c4), SkBits2Float(0x41014e62));
@@ -238,7 +238,7 @@
static void fuzz763_378c(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(-47.1494f, 4.35143f);
path.quadTo(-46.208f, 20.6664f, -43.0072f, 19.8086f);
path.quadTo(-39.8065f, 18.9507f, -38.1498f, 16.0809f);
@@ -247,7 +247,7 @@
path.close();
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(-49.0778f, 19.0097f);
path.quadTo(-38.2087f, 6.80955f, -37.3509f, 10.0103f);
path.quadTo(-36.4931f, 13.211f, -38.1498f, 16.0809f);
@@ -259,14 +259,14 @@
static void fuzz763_378d(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(-47.1494f, 4.35143f);
path.quadTo(-38.2091f, 6.80749f, -37.3514f, 10.0083f); // required
path.quadTo(-36.4938f, 13.2091f, -38.1506f, 16.0788f); // required
path.close();
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(-49.0778f, 19.0097f);
path.quadTo(-38.2087f, 6.80955f, -37.3509f, 10.0103f);
path.quadTo(-36.4931f, 13.211f, -38.1498f, 16.0809f);
@@ -277,7 +277,7 @@
static void fuzz763_558(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x41c95d06), SkBits2Float(0xc238e312));
path.quadTo(SkBits2Float(0x41e37302), SkBits2Float(0xc23b3f66), SkBits2Float(0x41f93bb2), SkBits2Float(0xc233b1b3));
path.quadTo(SkBits2Float(0x42025d9e), SkBits2Float(0xc22fb50a), SkBits2Float(0x4205bcea), SkBits2Float(0xc22a30db));
@@ -353,7 +353,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0xbfe9fe20), SkBits2Float(0x42526568));
path.quadTo(SkBits2Float(0xc08f5cf4), SkBits2Float(0x425a57e7), SkBits2Float(0xc0f853f0), SkBits2Float(0x4258763b));
path.quadTo(SkBits2Float(0xc130a57c), SkBits2Float(0x42569490), SkBits2Float(0xc1506f76), SkBits2Float(0x424bf8e3));
@@ -371,7 +371,7 @@
static void fuzz763_378a(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x40f4c1fc), SkBits2Float(0xc25049c6));
path.quadTo(SkBits2Float(0x41281306), SkBits2Float(0xc25702a0), SkBits2Float(0x415b6610), SkBits2Float(0xc253af82));
path.quadTo(SkBits2Float(0x41875c90), SkBits2Float(0xc2505c66), SkBits2Float(0x4194ce44), SkBits2Float(0xc244efe4));
@@ -441,7 +441,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0xc243ae22), SkBits2Float(0x419b4beb));
path.quadTo(SkBits2Float(0xc24f36b0), SkBits2Float(0x418e3b60), SkBits2Float(0xc252bffc), SkBits2Float(0x41695dc8));
path.quadTo(SkBits2Float(0xc2564948), SkBits2Float(0x413644ce), SkBits2Float(0xc24fc102), SkBits2Float(0x41082296));
@@ -460,7 +460,7 @@
static void fuzz763_378a_1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xc23c98fa), SkBits2Float(0x408b3eec));
path.quadTo(SkBits2Float(0xc22fcb5c), SkBits2Float(0x405f9a18), SkBits2Float(0xc22450bb), SkBits2Float(0x40a4d200));
path.quadTo(SkBits2Float(0xc218d61a), SkBits2Float(0x40d9d6f4), SkBits2Float(0xc21567dd), SkBits2Float(0x412021ef));
@@ -482,7 +482,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0xc243ae22), SkBits2Float(0x419b4beb));
path.quadTo(SkBits2Float(0xc24f36b0), SkBits2Float(0x418e3b60), SkBits2Float(0xc252bffc), SkBits2Float(0x41695dc8));
path.quadTo(SkBits2Float(0xc2564948), SkBits2Float(0x413644ce), SkBits2Float(0xc24fc102), SkBits2Float(0x41082296));
@@ -500,7 +500,7 @@
static void fuzz763_8712(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x40dce520), SkBits2Float(0xc250b45c));
path.quadTo(SkBits2Float(0x411bc0ec), SkBits2Float(0xc25796e0), SkBits2Float(0x414f4352), SkBits2Float(0xc25472d6));
path.quadTo(SkBits2Float(0x418162dd), SkBits2Float(0xc2514ece), SkBits2Float(0x418f27e4), SkBits2Float(0xc245fb37));
@@ -572,7 +572,7 @@
path.close();
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0xc2428ca4), SkBits2Float(0x41a0e11e));
path.quadTo(SkBits2Float(0xc24e2cd0), SkBits2Float(0x41942565), SkBits2Float(0xc251e4cc), SkBits2Float(0x417566f6));
path.quadTo(SkBits2Float(0xc2559cca), SkBits2Float(0x4142831e), SkBits2Float(0xc24f3eed), SkBits2Float(0x4114026c));
@@ -590,7 +590,7 @@
static void fuzz763_8712a(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xc23c98fa), SkBits2Float(0x408b3eec));
path.quadTo(SkBits2Float(0xc22fcb5c), SkBits2Float(0x405f9a18), SkBits2Float(0xc22450bb), SkBits2Float(0x40a4d200));
path.quadTo(SkBits2Float(0xc218d61a), SkBits2Float(0x40d9d6f4), SkBits2Float(0xc21567dd), SkBits2Float(0x412021ef));
@@ -607,7 +607,7 @@
path.close();
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0xc2428ca4), SkBits2Float(0x41a0e11e));
path.quadTo(SkBits2Float(0xc24e2cd0), SkBits2Float(0x41942565), SkBits2Float(0xc251e4cc), SkBits2Float(0x417566f6));
path.quadTo(SkBits2Float(0xc2559cca), SkBits2Float(0x4142831e), SkBits2Float(0xc24f3eed), SkBits2Float(0x4114026c));
@@ -625,7 +625,7 @@
static void fuzz763_4014(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x4126977e), SkBits2Float(0xc24e5cc8));
path.quadTo(SkBits2Float(0x4155a79e), SkBits2Float(0xc2547762), SkBits2Float(0x41841952), SkBits2Float(0xc250767b));
path.quadTo(SkBits2Float(0x419d5ed4), SkBits2Float(0xc24c7594), SkBits2Float(0x41a99408), SkBits2Float(0xc240b18c));
@@ -696,7 +696,7 @@
path.close();
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0xc2478a00), SkBits2Float(0x418639e0));
path.quadTo(SkBits2Float(0xc252b546), SkBits2Float(0x416fe6f8), SkBits2Float(0xc2558f0e), SkBits2Float(0x413c1fa8));
path.quadTo(SkBits2Float(0xc25868d8), SkBits2Float(0x41085856), SkBits2Float(0xc25145a6), SkBits2Float(0x40b75684));
@@ -714,7 +714,7 @@
static void fuzz763_4014a(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xc23d30a0), SkBits2Float(0x400e5c28)); // -47.2975f, 2.22437f
path.quadTo(SkBits2Float(0xc2303ecc), SkBits2Float(0x3fc17f10), SkBits2Float(0xc2251387), SkBits2Float(0x4052f2a8)); // -44.0613f, 1.51169f, -41.2691f, 3.29606f
path.quadTo(SkBits2Float(0xc219e842), SkBits2Float(0x40a292e2), SkBits2Float(0xc2170e78), SkBits2Float(0x410510c3)); // -38.4768f, 5.08043f, -37.7641f, 8.31659f
@@ -732,7 +732,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0xc2478a00), SkBits2Float(0x418639e0)); // -49.8848f, 16.7783f
path.quadTo(SkBits2Float(0xc252b546), SkBits2Float(0x416fe6f8), SkBits2Float(0xc2558f0e), SkBits2Float(0x413c1fa8)); // -52.677f, 14.9939f, -53.3897f, 11.7577f
path.quadTo(SkBits2Float(0xc25868d8), SkBits2Float(0x41085856), SkBits2Float(0xc25145a6), SkBits2Float(0x40b75684)); // -54.1024f, 8.52157f, -52.318f, 5.72931f
@@ -750,7 +750,7 @@
static void fuzz763_1404(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x419b2e3e), SkBits2Float(0xc243b405));
path.quadTo(SkBits2Float(0x41b4811d), SkBits2Float(0xc2479f9a), SkBits2Float(0x41cbf476), SkBits2Float(0xc2417131));
path.quadTo(SkBits2Float(0x41e19882), SkBits2Float(0xc23bbceb), SkBits2Float(0x41e9f15f), SkBits2Float(0xc23083cb));
@@ -833,7 +833,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x401b14b8), SkBits2Float(0x42524cc7));
path.quadTo(SkBits2Float(0xbd754800), SkBits2Float(0x425b13d0), SkBits2Float(0xc05781d0), SkBits2Float(0x425a42cf));
path.quadTo(SkBits2Float(0xc0d59744), SkBits2Float(0x425971cf), SkBits2Float(0xc10de7c8), SkBits2Float(0x424f8332));
@@ -851,7 +851,7 @@
static void fuzz763_4713(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x40f7bc68), SkBits2Float(0xc2503bb0));
path.quadTo(SkBits2Float(0x41299c84), SkBits2Float(0xc256ef4e), SkBits2Float(0x415ce976), SkBits2Float(0xc2539652));
path.quadTo(SkBits2Float(0x41881b33), SkBits2Float(0xc2503d58), SkBits2Float(0x41958271), SkBits2Float(0xc244cdc4));
@@ -919,7 +919,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42240000), SkBits2Float(0x42040000));
path.quadTo(SkBits2Float(0x42240000), SkBits2Float(0x4211413d), SkBits2Float(0x421aa09e), SkBits2Float(0x421aa09e));
path.quadTo(SkBits2Float(0x4211413d), SkBits2Float(0x42240000), SkBits2Float(0x42040000), SkBits2Float(0x42240000));
@@ -937,7 +937,7 @@
static void fuzz763_24588(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x413a5194), SkBits2Float(0xc24d4e33)); // 11.6449f, -51.3264f
path.quadTo(SkBits2Float(0x4169f3fc), SkBits2Float(0xc2532032), SkBits2Float(0x418e0c8b), SkBits2Float(0xc24ed218)); // 14.6221f, -52.7814f, 17.7561f, -51.7052f
path.quadTo(SkBits2Float(0x41a71f17), SkBits2Float(0xc24a83ff), SkBits2Float(0x41b2c316), SkBits2Float(0xc23e9b65)); // 20.8902f, -50.6289f, 22.3453f, -47.6518f
@@ -1012,7 +1012,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x421a8288), SkBits2Float(0x420efdef)); // 38.6275f, 35.748f
path.quadTo(SkBits2Float(0x4219989b), SkBits2Float(0x421c3719), SkBits2Float(0x420f9986), SkBits2Float(0x4224eb5c)); // 38.399f, 39.0538f, 35.8999f, 41.2298f
path.quadTo(SkBits2Float(0x42059a71), SkBits2Float(0x422d9f9f), SkBits2Float(0x41f0c28e), SkBits2Float(0x422cb5b2)); // 33.4008f, 43.4059f, 30.095f, 43.1774f
@@ -1031,7 +1031,7 @@
// SkDQuadIntersection.cpp:594: failed assertion "way_roughly_zero(fT[0][index])
static void fuzz763_20016(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x41e88c66), SkBits2Float(0xc22f800b)); // 29.0686f, -43.875f
path.quadTo(SkBits2Float(0x420178e8), SkBits2Float(0xc230b9b9), SkBits2Float(0x420babd1), SkBits2Float(0xc228426b)); // 32.3681f, -44.1814f, 34.9178f, -42.0649f
path.quadTo(SkBits2Float(0x4215debb), SkBits2Float(0xc21fcb1e), SkBits2Float(0x42171869), SkBits2Float(0xc2129869)); // 37.4675f, -39.9484f, 37.7738f, -36.6488f
@@ -1115,7 +1115,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41bbb37b), SkBits2Float(0x423c724c)); // 23.4626f, 47.1116f
path.quadTo(SkBits2Float(0x41b0a015), SkBits2Float(0x42487d2f), SkBits2Float(0x4197c34c), SkBits2Float(0x424d16a6)); // 22.0782f, 50.1222f, 18.9704f, 51.2721f
path.quadTo(SkBits2Float(0x417dcd04), SkBits2Float(0x4251b01e), SkBits2Float(0x414da178), SkBits2Float(0x424c266a)); // 15.8626f, 52.422f, 12.8519f, 51.0375f
@@ -1133,7 +1133,7 @@
static void fuzz763_17370(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x41fb8980), SkBits2Float(0xc20d9cf4)); // 31.4421f, -35.4033f
path.quadTo(SkBits2Float(0x42081e43), SkBits2Float(0xc215e4e6), SkBits2Float(0x42154ac6), SkBits2Float(0xc2146e6f)); // 34.0296f, -37.4735f, 37.323f, -37.1078f
path.quadTo(SkBits2Float(0x4222774a), SkBits2Float(0xc212f7f8), SkBits2Float(0x422abf3a), SkBits2Float(0xc2089e76)); // 40.6165f, -36.7422f, 42.6867f, -34.1547f
@@ -1223,7 +1223,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x415798ee), SkBits2Float(0x424b81a4)); // 13.4748f, 50.8766f
path.quadTo(SkBits2Float(0x41382eba), SkBits2Float(0x42562f18), SkBits2Float(0x4103c4ac), SkBits2Float(0x42582e42)); // 11.5114f, 53.546f, 8.23552f, 54.0452f
path.quadTo(SkBits2Float(0x409eb53c), SkBits2Float(0x425a2d6e), SkBits2Float(0x40129340), SkBits2Float(0x425252e0)); // 4.95962f, 54.5444f, 2.29024f, 52.5809f
@@ -1242,7 +1242,7 @@
// SkDQuadIntersection.cpp:598: failed assertion "way_roughly_equal(fT[0][index], 1)"
static void fuzz763_35322(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x41042400), SkBits2Float(0xc24fea42)); // 8.25879f, -51.9788f
path.quadTo(SkBits2Float(0x413225f2), SkBits2Float(0xc25680b3), SkBits2Float(0x4165502a), SkBits2Float(0xc2530720)); // 11.1343f, -53.6257f, 14.3321f, -52.757f
path.quadTo(SkBits2Float(0x418c3d32), SkBits2Float(0xc24f8d8e), SkBits2Float(0x41996a13), SkBits2Float(0xc2440d11)); // 17.5299f, -51.8882f, 19.1768f, -49.0128f
@@ -1330,7 +1330,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41213a06), SkBits2Float(0x424ea0eb)); // 10.0767f, 51.6571f
path.quadTo(SkBits2Float(0x40fe1b10), SkBits2Float(0x4258c340), SkBits2Float(0x40947314), SkBits2Float(0x4259e330)); // 7.9408f, 54.1907f, 4.63905f, 54.4719f
path.quadTo(SkBits2Float(0x3fab2c60), SkBits2Float(0x425b0321), SkBits2Float(0xbf991e40), SkBits2Float(0x42527802)); // 1.33729f, 54.7531f, -1.19624f, 52.6172f
@@ -1349,7 +1349,7 @@
// SkPathOpsOp.cpp:52: failed assertion "angle != firstAngle || !loop"
static void fuzz763_849020(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x411e4374), SkBits2Float(0xc24ec58f)); // 9.89147f, -51.6929f
path.quadTo(SkBits2Float(0x414d13fa), SkBits2Float(0xc254fe70), SkBits2Float(0x417fc7a6), SkBits2Float(0xc2511e30)); // 12.8174f, -53.2485f, 15.9862f, -52.2795f
path.quadTo(SkBits2Float(0x41993dab), SkBits2Float(0xc24d3df4), SkBits2Float(0x41a5af6e), SkBits2Float(0xc24189d2)); // 19.1551f, -51.3105f, 20.7107f, -48.3846f
@@ -1423,7 +1423,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x421f4961), SkBits2Float(0x4209a6a0)); // 39.8217f, 34.4127f
path.quadTo(SkBits2Float(0x421ed2ca), SkBits2Float(0x4216e5cb), SkBits2Float(0x42152104), SkBits2Float(0x421fefda)); // 39.7058f, 37.7244f, 37.2822f, 39.9842f
path.quadTo(SkBits2Float(0x420b6f41), SkBits2Float(0x4228f9ea), SkBits2Float(0x41fc602b), SkBits2Float(0x42288353)); // 34.8586f, 42.2441f, 31.547f, 42.1282f
@@ -1441,7 +1441,7 @@
static void fuzz763_1597464(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x4101092a), SkBits2Float(0xc2500973)); // 8.06474f, -52.0092f
path.quadTo(SkBits2Float(0x412ef1d8), SkBits2Float(0xc256aade), SkBits2Float(0x41622940), SkBits2Float(0xc2533d84)); // 10.934f, -53.6669f, 14.1351f, -52.8101f
path.quadTo(SkBits2Float(0x418ab055), SkBits2Float(0xc24fd02d), SkBits2Float(0x4197f32a), SkBits2Float(0xc2445602)); // 17.3361f, -51.9533f, 18.9937f, -49.084f
@@ -1515,7 +1515,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0xc2444b74), SkBits2Float(0x419829ad)); // -49.0737f, 19.0203f
path.quadTo(SkBits2Float(0xc24fc68b), SkBits2Float(0x418aea08), SkBits2Float(0xc25335aa), SkBits2Float(0x41629e8a)); // -51.9439f, 17.3643f, -52.8024f, 14.1637f
path.quadTo(SkBits2Float(0xc256a4ca), SkBits2Float(0x412f6908), SkBits2Float(0xc25004f8), SkBits2Float(0x41017cac)); // -53.6609f, 10.9631f, -52.0049f, 8.09294f
@@ -1533,7 +1533,7 @@
static void fuzz763_34974(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
#if 00
path.moveTo(SkBits2Float(0x41015326), SkBits2Float(0xc2500694));
path.quadTo(SkBits2Float(0x412f3e30), SkBits2Float(0xc256a6fa), SkBits2Float(0x41627462), SkBits2Float(0xc253387e));
@@ -1625,7 +1625,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
#if 01
path.moveTo(SkBits2Float(0xc2445236), SkBits2Float(0x419806c2));
path.quadTo(SkBits2Float(0xc24fccb6), SkBits2Float(0x418ac513), SkBits2Float(0xc2533ab2), SkBits2Float(0x4162536e));
@@ -1644,7 +1644,7 @@
static void fuzz763_2211264(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x41017a68), SkBits2Float(0xc250050e));
path.quadTo(SkBits2Float(0x412f66b2), SkBits2Float(0xc256a4e9), SkBits2Float(0x41629c3c), SkBits2Float(0xc25335d1));
path.quadTo(SkBits2Float(0x418ae8e6), SkBits2Float(0xc24fc6bc), SkBits2Float(0x4198289b), SkBits2Float(0xc2444ba9));
@@ -1701,7 +1701,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0xc24455cc), SkBits2Float(0x4197f43e));
path.quadTo(SkBits2Float(0xc24fcffc), SkBits2Float(0x418ab179), SkBits2Float(0xc2533d5e), SkBits2Float(0x41622b92));
path.quadTo(SkBits2Float(0xc256aac0), SkBits2Float(0x412ef432), SkBits2Float(0xc250095d), SkBits2Float(0x41010b70));
@@ -1719,7 +1719,7 @@
static void fuzz763_4628016(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x41029678), SkBits2Float(0xc24ff9f4)); // 8.16174f, -51.9941f
path.quadTo(SkBits2Float(0x41308bcc), SkBits2Float(0xc25695e3), SkBits2Float(0x4163bca4), SkBits2Float(0xc253226d)); // 11.0341f, -53.6464f, 14.2336f, -52.7836f
path.quadTo(SkBits2Float(0x4164114c), SkBits2Float(0xc2531cb8), SkBits2Float(0x41646770), SkBits2Float(0xc25316ce)); // 14.2542f, -52.778f, 14.2753f, -52.7723f
@@ -1794,7 +1794,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4223940b), SkBits2Float(0x420485b1)); // 40.8946f, 33.1306f
path.quadTo(SkBits2Float(0x4223893a), SkBits2Float(0x4211c6ea), SkBits2Float(0x421a2234), SkBits2Float(0x421b1ea2)); // 40.884f, 36.4443f, 38.5334f, 38.7799f
path.quadTo(SkBits2Float(0x4210bb30), SkBits2Float(0x4224765a), SkBits2Float(0x420379f7), SkBits2Float(0x42246b89)); // 36.1828f, 41.1156f, 32.8691f, 41.105f
@@ -1812,7 +1812,7 @@
static void fuzz763_6411089(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x410373c2), SkBits2Float(0xc24ff13e));
path.quadTo(SkBits2Float(0x4131701e), SkBits2Float(0xc2568a1e), SkBits2Float(0x41649d46), SkBits2Float(0xc2531340));
path.quadTo(SkBits2Float(0x418be539), SkBits2Float(0xc24f9c64), SkBits2Float(0x419916f9), SkBits2Float(0xc2441d4e));
@@ -1887,7 +1887,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0xc24450bb), SkBits2Float(0x41980e6c));
path.quadTo(SkBits2Float(0xc24fcb5c), SkBits2Float(0x418acd2f), SkBits2Float(0xc2533998), SkBits2Float(0x416263e8));
path.quadTo(SkBits2Float(0xc256a7d4), SkBits2Float(0x412f2d72), SkBits2Float(0xc2500736), SkBits2Float(0x410142ec));
@@ -1905,7 +1905,7 @@
static void fuzz763_3283699(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x411032d0), SkBits2Float(0xc24f69e5));
path.quadTo(SkBits2Float(0x413e956c), SkBits2Float(0xc255d56a), SkBits2Float(0x41718a9c), SkBits2Float(0xc2522c67));
path.quadTo(SkBits2Float(0x41755c61), SkBits2Float(0xc251e62c), SkBits2Float(0x417909ca), SkBits2Float(0xc2519487));
@@ -1987,7 +1987,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0xc24450bb), SkBits2Float(0x41980e6c));
path.quadTo(SkBits2Float(0xc24fcb5c), SkBits2Float(0x418acd2f), SkBits2Float(0xc2533998), SkBits2Float(0x416263e8));
path.quadTo(SkBits2Float(0xc256a7d4), SkBits2Float(0x412f2d72), SkBits2Float(0xc2500736), SkBits2Float(0x410142ec));
@@ -2005,7 +2005,7 @@
static void fuzz763_1026368(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x4101c02c), SkBits2Float(0xc2500256)); // 8.10942f, -52.0023f
path.quadTo(SkBits2Float(0x412faeae), SkBits2Float(0xc256a13a), SkBits2Float(0x4162e312), SkBits2Float(0xc2533110)); // 10.9801f, -53.6574f, 14.1804f, -52.7979f
path.quadTo(SkBits2Float(0x418b0bbc), SkBits2Float(0xc24fc0e8), SkBits2Float(0x41984984), SkBits2Float(0xc2444547)); // 17.3807f, -51.9384f, 19.0359f, -49.0677f
@@ -2079,7 +2079,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42240000), SkBits2Float(0x42040000)); // 41, 33
path.quadTo(SkBits2Float(0x42240000), SkBits2Float(0x4211413d), SkBits2Float(0x421aa09e), SkBits2Float(0x421aa09e)); // 41, 36.3137f, 38.6569f, 38.6569f
path.quadTo(SkBits2Float(0x4211413d), SkBits2Float(0x42240000), SkBits2Float(0x42040000), SkBits2Float(0x42240000)); // 36.3137f, 41, 33, 41
@@ -2098,7 +2098,7 @@
static void fuzz763_5485218(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xc1b1a434), SkBits2Float(0xc247d348));
path.quadTo(SkBits2Float(0xc1996ac1), SkBits2Float(0xc24d3588), SkBits2Float(0xc180ac87), SkBits2Float(0xc248738e));
path.quadTo(SkBits2Float(0xc14fdc9c), SkBits2Float(0xc243b194), SkBits2Float(0xc13a53a0), SkBits2Float(0xc23794da));
@@ -2186,7 +2186,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x425285c7), SkBits2Float(0xbdfdd900));
path.quadTo(SkBits2Float(0x425adb97), SkBits2Float(0x401cf6e8), SkBits2Float(0x425976d3), SkBits2Float(0x40b7eee0));
path.quadTo(SkBits2Float(0x42581210), SkBits2Float(0x4110b128), SkBits2Float(0x424dc3b4), SkBits2Float(0x41320868));
@@ -2204,7 +2204,7 @@
static void fuzz763_2674194(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0xbfb16e10), SkBits2Float(0xc252733b));
path.quadTo(SkBits2Float(0x3f91df50), SkBits2Float(0xc25b07b4), SkBits2Float(0x408e27f4), SkBits2Float(0xc259f3f8));
path.quadTo(SkBits2Float(0x40f7d814), SkBits2Float(0xc258e03e), SkBits2Float(0x411e3df0), SkBits2Float(0xc24ec5d2));
@@ -2293,7 +2293,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41828cb4), SkBits2Float(0x424825e0));
path.quadTo(SkBits2Float(0x416823bc), SkBits2Float(0x42534038), SkBits2Float(0x41344220), SkBits2Float(0x4255fb7e));
path.quadTo(SkBits2Float(0x41006082), SkBits2Float(0x4258b6c5), SkBits2Float(0x40a7ee48), SkBits2Float(0x4251795a));
@@ -2311,7 +2311,7 @@
static void fuzz763_10022998(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x40f23d54), SkBits2Float(0xc250558c)); // 7.56999f, -52.0835f
path.quadTo(SkBits2Float(0x4126c646), SkBits2Float(0xc25712d1), SkBits2Float(0x415a1e76), SkBits2Float(0xc253c4aa)); // 10.4234f, -53.7684f, 13.6324f, -52.9421f
path.quadTo(SkBits2Float(0x4186bb52), SkBits2Float(0xc2507686), SkBits2Float(0x419435db), SkBits2Float(0xc2450c9e)); // 16.8415f, -52.1157f, 18.5263f, -49.2623f
@@ -2379,7 +2379,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42240000), SkBits2Float(0x42040000)); // 41, 33
path.quadTo(SkBits2Float(0x42240000), SkBits2Float(0x4211413d), SkBits2Float(0x421aa09e), SkBits2Float(0x421aa09e)); // 41, 36.3137f, 38.6569f, 38.6569f
path.quadTo(SkBits2Float(0x4211413d), SkBits2Float(0x42240000), SkBits2Float(0x42040000), SkBits2Float(0x42240000)); // 36.3137f, 41, 33, 41
diff --git a/tests/PathOpsInverseTest.cpp b/tests/PathOpsInverseTest.cpp
index e9d8765..9228f89 100644
--- a/tests/PathOpsInverseTest.cpp
+++ b/tests/PathOpsInverseTest.cpp
@@ -8,22 +8,20 @@
DEF_TEST(PathOpsInverse, reporter) {
const SkPathDirection dirs[] = {SkPathDirection::kCW, SkPathDirection::kCCW};
- const SkPathFillType fts[] = {
- SkPathFillType::kWinding, SkPathFillType::kEvenOdd,
- SkPathFillType::kInverseWinding, SkPathFillType::kInverseEvenOdd
- };
SkPath one, two;
int testCount = 0;
for (int op = kDifference_SkPathOp; op <= kReverseDifference_SkPathOp; ++op) {
- for (auto oneFill : fts) {
+ for (int oneFill = SkPath::kWinding_FillType; oneFill <= SkPath::kInverseEvenOdd_FillType;
+ ++oneFill) {
for (auto oneDir : dirs) {
one.reset();
- one.setFillType(oneFill);
+ one.setFillType((SkPath::FillType) oneFill);
one.addRect(0, 0, 6, 6, oneDir);
- for (auto twoFill : fts) {
+ for (int twoFill = SkPath::kWinding_FillType;
+ twoFill <= SkPath::kInverseEvenOdd_FillType; ++twoFill) {
for (auto twoDir : dirs) {
two.reset();
- two.setFillType(twoFill);
+ two.setFillType((SkPath::FillType) twoFill);
two.addRect(3, 3, 9, 9, twoDir);
SkString testName;
testName.printf("inverseTest%d", ++testCount);
diff --git a/tests/PathOpsOpCircleThreadedTest.cpp b/tests/PathOpsOpCircleThreadedTest.cpp
index 0ac492b..9358c0c 100644
--- a/tests/PathOpsOpCircleThreadedTest.cpp
+++ b/tests/PathOpsOpCircleThreadedTest.cpp
@@ -16,20 +16,19 @@
static void testOpCirclesMain(PathOpsThreadState* data) {
SkASSERT(data);
- const SkPathFillType fts[] = { SkPathFillType::kWinding, SkPathFillType::kEvenOdd };
PathOpsThreadState& state = *data;
SkString pathStr;
for (int a = 0 ; a < 6; ++a) {
for (int b = a + 1 ; b < 7; ++b) {
for (int c = 0 ; c < 6; ++c) {
for (int d = c + 1 ; d < 7; ++d) {
- for (auto e : fts) {
- for (auto f : fts) {
+ for (int e = SkPath::kWinding_FillType ; e <= SkPath::kEvenOdd_FillType; ++e) {
+ for (int f = SkPath::kWinding_FillType ; f <= SkPath::kEvenOdd_FillType; ++f) {
SkPath pathA, pathB;
- pathA.setFillType(e);
+ pathA.setFillType((SkPath::FillType) e);
pathA.addCircle(SkIntToScalar(state.fA), SkIntToScalar(state.fB), SkIntToScalar(state.fC),
state.fD ? SkPathDirection::kCW : SkPathDirection::kCCW);
- pathB.setFillType(f);
+ pathB.setFillType((SkPath::FillType) f);
pathB.addCircle(SkIntToScalar(a), SkIntToScalar(b), SkIntToScalar(c),
d ? SkPathDirection::kCW : SkPathDirection::kCCW);
for (int op = 0 ; op <= kXOR_SkPathOp; ++op) {
@@ -37,13 +36,13 @@
pathStr.printf("static void circlesOp%d(skiatest::Reporter* reporter,"
" const char* filename) {\n", loopNo);
pathStr.appendf(" SkPath path, pathB;\n");
- pathStr.appendf(" path.setFillType(SkPathFillType::k%s);\n",
- e == SkPathFillType::kWinding ? "Winding" : e == SkPathFillType::kEvenOdd
+ pathStr.appendf(" path.setFillType(SkPath::k%s_FillType);\n",
+ e == SkPath::kWinding_FillType ? "Winding" : e == SkPath::kEvenOdd_FillType
? "EvenOdd" : "?UNDEFINED");
pathStr.appendf(" path.addCircle(%d, %d, %d, %s);\n", state.fA, state.fB,
state.fC, state.fD ? "SkPathDirection::kCW" : "SkPathDirection::kCCW");
- pathStr.appendf(" pathB.setFillType(SkPathFillType::k%s);\n",
- f == SkPathFillType::kWinding ? "Winding" : f == SkPathFillType::kEvenOdd
+ pathStr.appendf(" pathB.setFillType(SkPath::k%s_FillType);\n",
+ f == SkPath::kWinding_FillType ? "Winding" : f == SkPath::kEvenOdd_FillType
? "EvenOdd" : "?UNDEFINED");
pathStr.appendf(" pathB.addCircle(%d, %d, %d, %s);\n", a, b,
c, d ? "SkPathDirection::kCW" : "SkPathDirection::kCCW");
diff --git a/tests/PathOpsOpCubicThreadedTest.cpp b/tests/PathOpsOpCubicThreadedTest.cpp
index e453483..50eb414 100644
--- a/tests/PathOpsOpCubicThreadedTest.cpp
+++ b/tests/PathOpsOpCubicThreadedTest.cpp
@@ -19,22 +19,21 @@
strncpy(DEBUG_FILENAME_STRING, "", DEBUG_FILENAME_STRING_LENGTH);
#endif
SkASSERT(data);
- const SkPathFillType fts[] = { SkPathFillType::kWinding, SkPathFillType::kEvenOdd };
PathOpsThreadState& state = *data;
SkString pathStr;
for (int a = 0 ; a < 6; ++a) {
for (int b = a + 1 ; b < 7; ++b) {
for (int c = 0 ; c < 6; ++c) {
for (int d = c + 1 ; d < 7; ++d) {
- for (auto e : fts) {
- for (auto f : fts) {
+ for (int e = SkPath::kWinding_FillType ; e <= SkPath::kEvenOdd_FillType; ++e) {
+ for (int f = SkPath::kWinding_FillType ; f <= SkPath::kEvenOdd_FillType; ++f) {
SkPath pathA, pathB;
- pathA.setFillType((SkPathFillType) e);
+ pathA.setFillType((SkPath::FillType) e);
pathA.moveTo(SkIntToScalar(state.fA), SkIntToScalar(state.fB));
pathA.cubicTo(SkIntToScalar(state.fC), SkIntToScalar(state.fD), SkIntToScalar(b),
SkIntToScalar(a), SkIntToScalar(d), SkIntToScalar(c));
pathA.close();
- pathB.setFillType((SkPathFillType) f);
+ pathB.setFillType((SkPath::FillType) f);
pathB.moveTo(SkIntToScalar(a), SkIntToScalar(b));
pathB.cubicTo(SkIntToScalar(c), SkIntToScalar(d), SkIntToScalar(state.fB),
SkIntToScalar(state.fA), SkIntToScalar(state.fD), SkIntToScalar(state.fC));
@@ -44,15 +43,15 @@
pathStr.printf("static void cubicOp%d(skiatest::Reporter* reporter,"
" const char* filename) {\n", loopNo);
pathStr.appendf(" SkPath path, pathB;\n");
- pathStr.appendf(" path.setFillType(SkPathFillType::k%s);\n",
- e == SkPathFillType::kWinding ? "Winding" : e == SkPathFillType::kEvenOdd
+ pathStr.appendf(" path.setFillType(SkPath::k%s_FillType);\n",
+ e == SkPath::kWinding_FillType ? "Winding" : e == SkPath::kEvenOdd_FillType
? "EvenOdd" : "?UNDEFINED");
pathStr.appendf(" path.moveTo(%d,%d);\n", state.fA, state.fB);
pathStr.appendf(" path.cubicTo(%d,%d, %d,%d, %d,%d);\n", state.fC, state.fD,
b, a, d, c);
pathStr.appendf(" path.close();\n");
- pathStr.appendf(" pathB.setFillType(SkPathFillType::k%s);\n",
- f == SkPathFillType::kWinding ? "Winding" : f == SkPathFillType::kEvenOdd
+ pathStr.appendf(" pathB.setFillType(SkPath::k%s_FillType);\n",
+ f == SkPath::kWinding_FillType ? "Winding" : f == SkPath::kEvenOdd_FillType
? "EvenOdd" : "?UNDEFINED");
pathStr.appendf(" pathB.moveTo(%d,%d);\n", a, b);
pathStr.appendf(" pathB.cubicTo(%d,%d, %d,%d, %d,%d);\n", c, d,
diff --git a/tests/PathOpsOpRectThreadedTest.cpp b/tests/PathOpsOpRectThreadedTest.cpp
index b3809e0..cb8ee6c 100644
--- a/tests/PathOpsOpRectThreadedTest.cpp
+++ b/tests/PathOpsOpRectThreadedTest.cpp
@@ -23,23 +23,22 @@
static void testPathOpsRectsMain(PathOpsThreadState* data)
{
SkASSERT(data);
- const SkPathFillType fts[] = { SkPathFillType::kWinding, SkPathFillType::kEvenOdd };
PathOpsThreadState& state = *data;
SkString pathStr;
for (int a = 0 ; a < 6; ++a) {
for (int b = a + 1 ; b < 7; ++b) {
for (int c = 0 ; c < 6; ++c) {
for (int d = c + 1 ; d < 7; ++d) {
- for (auto e : fts) {
- for (auto f : fts) {
+ for (int e = SkPath::kWinding_FillType ; e <= SkPath::kEvenOdd_FillType; ++e) {
+ for (int f = SkPath::kWinding_FillType ; f <= SkPath::kEvenOdd_FillType; ++f) {
SkPath pathA, pathB;
- pathA.setFillType((SkPathFillType) e);
+ pathA.setFillType((SkPath::FillType) e);
pathA.addRect(SkIntToScalar(state.fA), SkIntToScalar(state.fA), SkIntToScalar(state.fB),
SkIntToScalar(state.fB), SkPathDirection::kCW);
pathA.addRect(SkIntToScalar(state.fC), SkIntToScalar(state.fC), SkIntToScalar(state.fD),
SkIntToScalar(state.fD), SkPathDirection::kCW);
pathA.close();
- pathB.setFillType((SkPathFillType) f);
+ pathB.setFillType((SkPath::FillType) f);
pathB.addRect(SkIntToScalar(a), SkIntToScalar(a), SkIntToScalar(b),
SkIntToScalar(b), SkPathDirection::kCW);
pathB.addRect(SkIntToScalar(c), SkIntToScalar(c), SkIntToScalar(d),
@@ -51,15 +50,15 @@
"static void rects%d(skiatest::Reporter* reporter,"
"const char* filename) {\n", loopNo);
pathStr.appendf(" SkPath path, pathB;");
- pathStr.appendf(" path.setFillType(SkPathFillType::k%s);\n",
- e == SkPathFillType::kWinding ? "Winding" : e == SkPathFillType::kEvenOdd
+ pathStr.appendf(" path.setFillType(SkPath::k%s_FillType);\n",
+ e == SkPath::kWinding_FillType ? "Winding" : e == SkPath::kEvenOdd_FillType
? "EvenOdd" : "?UNDEFINED");
pathStr.appendf(" path.addRect(%d, %d, %d, %d,"
" SkPathDirection::kCW);\n", state.fA, state.fA, state.fB, state.fB);
pathStr.appendf(" path.addRect(%d, %d, %d, %d,"
" SkPathDirection::kCW);\n", state.fC, state.fC, state.fD, state.fD);
- pathStr.appendf(" pathB.setFillType(SkPathFillType::k%s);\n",
- f == SkPathFillType::kWinding ? "Winding" : f == SkPathFillType::kEvenOdd
+ pathStr.appendf(" pathB.setFillType(SkPath::k%s_FillType);\n",
+ f == SkPath::kWinding_FillType ? "Winding" : f == SkPath::kEvenOdd_FillType
? "EvenOdd" : "?UNDEFINED");
pathStr.appendf(" pathB.addRect(%d, %d, %d, %d,"
" SkPathDirection::kCW);\n", a, a, b, b);
@@ -112,10 +111,6 @@
static void testPathOpsFastMain(PathOpsThreadState* data)
{
SkASSERT(data);
- const SkPathFillType fts[] = {
- SkPathFillType::kWinding, SkPathFillType::kEvenOdd,
- SkPathFillType::kInverseWinding, SkPathFillType::kInverseEvenOdd
- };
PathOpsThreadState& state = *data;
SkString pathStr;
int step = data->fReporter->allowExtendedTest() ? 2 : 5;
@@ -123,16 +118,16 @@
for (bool b : { false, true } ) {
for (int c = 0; c < 6; c += step) {
for (int d = 0; d < 6; d += step) {
- for (auto e : fts) {
- for (auto f : fts) {
+ for (int e = SkPath::kWinding_FillType; e <= SkPath::kInverseEvenOdd_FillType; ++e) {
+ for (int f = SkPath::kWinding_FillType; f <= SkPath::kInverseEvenOdd_FillType; ++f) {
SkPath pathA, pathB;
- pathA.setFillType(e);
+ pathA.setFillType((SkPath::FillType) e);
if (a) {
pathA.addRect(SkIntToScalar(state.fA), SkIntToScalar(state.fA), SkIntToScalar(state.fB) + c,
SkIntToScalar(state.fB), SkPathDirection::kCW);
}
pathA.close();
- pathB.setFillType(f);
+ pathB.setFillType((SkPath::FillType) f);
if (b) {
pathB.addRect(SkIntToScalar(state.fC), SkIntToScalar(state.fC), SkIntToScalar(state.fD) + d,
SkIntToScalar(state.fD), SkPathDirection::kCW);
@@ -145,12 +140,12 @@
"static void fast%d(skiatest::Reporter* reporter,"
"const char* filename) {\n", loopNo);
pathStr.appendf(" SkPath path, pathB;");
- pathStr.appendf(" path.setFillType(SkPathFillType::k%s);\n", fillTypeStr[(int)e]);
+ pathStr.appendf(" path.setFillType(SkPath::k%s_FillType);\n", fillTypeStr[e]);
if (a) {
pathStr.appendf(" path.addRect(%d, %d, %d, %d,"
" SkPathDirection::kCW);\n", state.fA, state.fA, state.fB + c, state.fB);
}
- pathStr.appendf(" path.setFillType(SkPathFillType::k%s);\n", fillTypeStr[(int)f]);
+ pathStr.appendf(" path.setFillType(SkPath::k%s_FillType);\n", fillTypeStr[f]);
if (b) {
pathStr.appendf(" path.addRect(%d, %d, %d, %d,"
" SkPathDirection::kCW);\n", state.fC, state.fC, state.fD + d, state.fD);
diff --git a/tests/PathOpsOpTest.cpp b/tests/PathOpsOpTest.cpp
index 38c58bf..ef00b20 100644
--- a/tests/PathOpsOpTest.cpp
+++ b/tests/PathOpsOpTest.cpp
@@ -32,11 +32,11 @@
static void cubicOp1d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,2, 1,0, 1,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(0,1, 1,0, 2,0);
pathB.close();
@@ -45,11 +45,11 @@
static void cubicOp2d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,2);
path.cubicTo(0,1, 1,0, 1,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(0,1, 2,0, 1,0);
pathB.close();
@@ -58,11 +58,11 @@
static void cubicOp3d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(2,3, 1,0, 1,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(0,1, 1,0, 3,2);
pathB.close();
@@ -71,11 +71,11 @@
static void cubicOp5d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,2, 1,0, 2,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(0,2, 1,0, 2,0);
pathB.close();
@@ -84,11 +84,11 @@
static void cubicOp6d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,6, 1,0, 3,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(0,3, 1,0, 6,0);
pathB.close();
@@ -97,11 +97,11 @@
static void cubicOp7d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(3,4, 1,0, 3,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(0,3, 1,0, 4,3);
pathB.close();
@@ -110,11 +110,11 @@
static void cubicOp8d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,5, 1,0, 4,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(0,4, 1,0, 5,0);
pathB.close();
@@ -123,11 +123,11 @@
static void cubicOp9d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,6, 1,0, 2,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(1,2, 1,0, 6,1);
pathB.close();
@@ -136,12 +136,12 @@
static void quadOp9d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.quadTo(1,6, 1.5f,1);
path.quadTo(1.5f,0.5f, 2,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.quadTo(1,2, 1.4f,1);
pathB.quadTo(3,0.4f, 6,1);
@@ -151,14 +151,14 @@
static void lineOp9d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.lineTo(1,6);
path.lineTo(1.5f,1);
path.lineTo(1.8f,0.8f);
path.lineTo(2,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.lineTo(1,2);
pathB.lineTo(1.4f,1);
@@ -170,11 +170,11 @@
static void cubicOp1i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,2, 1,0, 2,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(1,2, 1,0, 2,1);
pathB.close();
@@ -183,11 +183,11 @@
static void cubicOp10d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,3, 1,0, 4,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(1,4, 1,0, 3,1);
pathB.close();
@@ -196,11 +196,11 @@
static void cubicOp11d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(3,4, 1,0, 5,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(1,5, 1,0, 4,3);
pathB.close();
@@ -209,11 +209,11 @@
static void cubicOp12d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,6, 1,0, 1,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(0,1, 1,0, 6,1);
pathB.close();
@@ -222,11 +222,11 @@
static void cubicOp13d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(4,5, 1,0, 5,3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(3,5, 1,0, 5,4);
pathB.close();
@@ -235,11 +235,11 @@
static void cubicOp14d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,2, 2,0, 2,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,2);
pathB.cubicTo(1,2, 1,0, 2,0);
pathB.close();
@@ -248,11 +248,11 @@
static void cubicOp15d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(3,6, 2,0, 2,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,2);
pathB.cubicTo(1,2, 1,0, 6,3);
pathB.close();
@@ -261,11 +261,11 @@
static void cubicOp16d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,2);
path.cubicTo(0,1, 3,0, 1,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,3);
pathB.cubicTo(0,1, 2,0, 1,0);
pathB.close();
@@ -274,11 +274,11 @@
static void cubicOp17d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,2);
path.cubicTo(0,2, 4,0, 2,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,4);
pathB.cubicTo(1,2, 2,0, 2,0);
pathB.close();
@@ -287,11 +287,11 @@
static void cubicOp18d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(3,5, 2,0, 2,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,2);
pathB.cubicTo(1,2, 1,0, 5,3);
pathB.close();
@@ -300,11 +300,11 @@
static void cubicOp19i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,2);
path.cubicTo(0,1, 2,1, 6,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,2);
pathB.cubicTo(2,6, 2,0, 1,0);
pathB.close();
@@ -313,11 +313,11 @@
static void cubicOp20d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,1, 6,0, 2,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,6);
pathB.cubicTo(1,2, 1,0, 1,0);
pathB.close();
@@ -326,11 +326,11 @@
static void cubicOp21d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,1, 2,1, 6,5);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,2);
pathB.cubicTo(5,6, 1,0, 1,0);
pathB.close();
@@ -339,11 +339,11 @@
static void cubicOp22d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(2,3, 3,0, 2,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,3);
pathB.cubicTo(1,2, 1,0, 3,2);
pathB.close();
@@ -352,11 +352,11 @@
static void cubicOp23d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,2, 4,0, 2,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,4);
pathB.cubicTo(1,2, 1,0, 2,1);
pathB.close();
@@ -365,11 +365,11 @@
static void cubicOp24d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,2, 2,0, 3,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,2);
pathB.cubicTo(2,3, 1,0, 2,1);
pathB.close();
@@ -434,10 +434,10 @@
static void testOp1d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.addRect(0, 0, 1, 1, SkPathDirection::kCW);
path.addRect(0, 0, 2, 2, SkPathDirection::kCW);
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.addRect(0, 0, 1, 1, SkPathDirection::kCW);
pathB.addRect(0, 0, 1, 1, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kDifference_SkPathOp, filename);
@@ -445,10 +445,10 @@
static void testOp2d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.addRect(0, 0, 1, 1, SkPathDirection::kCW);
path.addRect(0, 0, 2, 2, SkPathDirection::kCW);
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.addRect(0, 0, 1, 1, SkPathDirection::kCW);
pathB.addRect(0, 0, 1, 1, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kDifference_SkPathOp, filename);
@@ -456,10 +456,10 @@
static void testOp3d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.addRect(0, 0, 1, 1, SkPathDirection::kCW);
path.addRect(1, 1, 2, 2, SkPathDirection::kCW);
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.addRect(0, 0, 1, 1, SkPathDirection::kCW);
pathB.addRect(0, 0, 1, 1, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kDifference_SkPathOp, filename);
@@ -467,10 +467,10 @@
static void testOp1u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.addRect(0, 0, 1, 1, SkPathDirection::kCW);
path.addRect(0, 0, 3, 3, SkPathDirection::kCW);
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.addRect(0, 0, 1, 1, SkPathDirection::kCW);
pathB.addRect(0, 0, 1, 1, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kUnion_SkPathOp, filename);
@@ -478,10 +478,10 @@
static void testOp4d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.addRect(0, 0, 1, 1, SkPathDirection::kCW);
path.addRect(2, 2, 4, 4, SkPathDirection::kCW);
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.addRect(0, 0, 1, 1, SkPathDirection::kCW);
pathB.addRect(0, 0, 1, 1, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kDifference_SkPathOp, filename);
@@ -489,10 +489,10 @@
static void testOp5d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 2, 2, SkPathDirection::kCW);
path.addRect(0, 0, 3, 3, SkPathDirection::kCW);
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.addRect(0, 0, 1, 1, SkPathDirection::kCW);
pathB.addRect(0, 0, 1, 1, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kDifference_SkPathOp, filename);
@@ -500,10 +500,10 @@
static void testOp6d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 1, 1, SkPathDirection::kCW);
path.addRect(0, 0, 3, 3, SkPathDirection::kCW);
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.addRect(0, 0, 1, 1, SkPathDirection::kCW);
pathB.addRect(0, 0, 1, 1, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kDifference_SkPathOp, filename);
@@ -511,10 +511,10 @@
static void testOp7d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 2, 2, SkPathDirection::kCW);
path.addRect(0, 0, 1, 1, SkPathDirection::kCW);
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.addRect(0, 0, 1, 1, SkPathDirection::kCW);
pathB.addRect(0, 0, 1, 1, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kDifference_SkPathOp, filename);
@@ -522,10 +522,10 @@
static void testOp2u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 2, 2, SkPathDirection::kCW);
path.addRect(0, 0, 2, 2, SkPathDirection::kCW);
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.addRect(0, 0, 3, 3, SkPathDirection::kCW);
pathB.addRect(1, 1, 2, 2, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kUnion_SkPathOp, filename);
@@ -541,11 +541,11 @@
}
static void cubicOp25i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(2,4, 5,0, 3,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,5);
pathB.cubicTo(2,3, 1,0, 4,2);
pathB.close();
@@ -554,11 +554,11 @@
static void cubicOp26d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(3,4, 4,0, 3,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,4);
pathB.cubicTo(2,3, 1,0, 4,3);
pathB.close();
@@ -567,11 +567,11 @@
static void cubicOp27d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(3,6, 1,0, 5,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(2,5, 1,0, 6,3);
pathB.close();
@@ -580,11 +580,11 @@
static void cubicOp28u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,4, 6,0, 3,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,6);
pathB.cubicTo(2,3, 1,0, 4,1);
pathB.close();
@@ -593,11 +593,11 @@
static void cubicOp29d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(2,5, 6,0, 4,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,6);
pathB.cubicTo(2,4, 1,0, 5,2);
pathB.close();
@@ -606,11 +606,11 @@
static void cubicOp30d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(2,5, 6,0, 5,3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,6);
pathB.cubicTo(3,5, 1,0, 5,2);
pathB.close();
@@ -619,11 +619,11 @@
static void cubicOp31d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,2);
path.cubicTo(0,3, 2,1, 4,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,2);
pathB.cubicTo(0,4, 2,0, 3,0);
pathB.close();
@@ -632,11 +632,11 @@
static void cubicOp31u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,2);
path.cubicTo(0,3, 2,1, 4,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,2);
pathB.cubicTo(0,4, 2,0, 3,0);
pathB.close();
@@ -645,11 +645,11 @@
static void cubicOp31x(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,2);
path.cubicTo(0,3, 2,1, 4,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,2);
pathB.cubicTo(0,4, 2,0, 3,0);
pathB.close();
@@ -658,11 +658,11 @@
static void cubicOp32d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,2, 6,0, 3,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,6);
pathB.cubicTo(1,3, 1,0, 2,1);
pathB.close();
@@ -671,11 +671,11 @@
static void cubicOp33i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,2, 6,0, 3,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,6);
pathB.cubicTo(1,3, 1,0, 2,1);
pathB.close();
@@ -684,11 +684,11 @@
static void cubicOp34d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(3,5, 2,1, 3,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,2);
pathB.cubicTo(1,3, 1,0, 5,3);
pathB.close();
@@ -697,11 +697,11 @@
static void cubicOp35d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,5, 2,1, 4,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,2);
pathB.cubicTo(0,4, 1,0, 5,1);
pathB.close();
@@ -710,11 +710,11 @@
static void cubicOp36u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,6, 2,0, 5,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,2);
pathB.cubicTo(1,5, 1,0, 6,1);
pathB.close();
@@ -723,11 +723,11 @@
static void cubicOp37d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(2,6, 6,1, 4,3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,6);
pathB.cubicTo(3,4, 1,0, 6,2);
pathB.close();
@@ -736,11 +736,11 @@
static void cubicOp38d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,6, 3,2, 4,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2,3);
pathB.cubicTo(1,4, 1,0, 6,0);
pathB.close();
@@ -749,11 +749,11 @@
static void cubicOp39d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(2,3, 5,1, 4,3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,5);
pathB.cubicTo(3,4, 1,0, 3,2);
pathB.close();
@@ -762,11 +762,11 @@
static void cubicOp40d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,5, 3,2, 4,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2,3);
pathB.cubicTo(2,4, 1,0, 5,1);
pathB.close();
@@ -775,11 +775,11 @@
static void cubicOp41i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(2,6, 4,3, 6,4);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(3,4);
pathB.cubicTo(4,6, 1,0, 6,2);
pathB.close();
@@ -788,11 +788,11 @@
static void cubicOp42d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,2, 6,5, 5,4);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(5,6);
pathB.cubicTo(4,5, 1,0, 2,1);
pathB.close();
@@ -801,11 +801,11 @@
static void cubicOp43d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,2);
path.cubicTo(1,2, 4,0, 3,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,4);
pathB.cubicTo(1,3, 2,0, 2,1);
pathB.close();
@@ -814,11 +814,11 @@
static void cubicOp44d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,2);
path.cubicTo(3,6, 4,0, 3,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,4);
pathB.cubicTo(2,3, 2,0, 6,3);
pathB.close();
@@ -827,11 +827,11 @@
static void cubicOp45d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,2);
path.cubicTo(2,4, 4,0, 3,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,4);
pathB.cubicTo(2,3, 2,0, 4,2);
pathB.close();
@@ -840,11 +840,11 @@
static void cubicOp46d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,2);
path.cubicTo(3,5, 5,0, 4,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,5);
pathB.cubicTo(2,4, 2,0, 5,3);
pathB.close();
@@ -853,11 +853,11 @@
static void cubicOp47d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,6, 6,2, 5,4);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2,6);
pathB.cubicTo(4,5, 1,0, 6,1);
pathB.close();
@@ -866,11 +866,11 @@
static void cubicOp48d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,2);
path.cubicTo(2,3, 5,1, 3,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,5);
pathB.cubicTo(2,3, 2,0, 3,2);
pathB.close();
@@ -879,11 +879,11 @@
static void cubicOp49d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,2);
path.cubicTo(1,5, 3,2, 4,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2,3);
pathB.cubicTo(1,4, 2,0, 5,1);
pathB.close();
@@ -892,11 +892,11 @@
static void cubicOp50d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,3);
path.cubicTo(1,6, 5,0, 5,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,5);
pathB.cubicTo(1,5, 3,0, 6,1);
pathB.close();
@@ -905,11 +905,11 @@
static void cubicOp51d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,3);
path.cubicTo(1,2, 4,1, 6,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,4);
pathB.cubicTo(0,6, 3,0, 2,1);
pathB.close();
@@ -918,11 +918,11 @@
static void cubicOp52d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,2);
path.cubicTo(1,2, 5,4, 4,3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(4,5);
pathB.cubicTo(3,4, 2,0, 2,1);
pathB.close();
@@ -931,11 +931,11 @@
static void cubicOp53d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,3);
path.cubicTo(1,2, 5,3, 2,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(3,5);
pathB.cubicTo(1,2, 3,0, 2,1);
pathB.close();
@@ -944,11 +944,11 @@
static void cubicOp54d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,4);
path.cubicTo(1,3, 5,4, 4,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(4,5);
pathB.cubicTo(2,4, 4,0, 3,1);
pathB.close();
@@ -957,11 +957,11 @@
static void cubicOp55d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,5);
path.cubicTo(1,3, 3,2, 5,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2,3);
pathB.cubicTo(0,5, 5,0, 3,1);
pathB.close();
@@ -970,11 +970,11 @@
static void cubicOp56d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(2,6, 5,0, 2,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,5);
pathB.cubicTo(1,2, 1,0, 6,2);
pathB.close();
@@ -983,11 +983,11 @@
static void cubicOp57d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,5);
path.cubicTo(0,5, 5,4, 6,4);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(4,5);
pathB.cubicTo(4,6, 5,0, 5,0);
pathB.close();
@@ -996,11 +996,11 @@
static void cubicOp58d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,5);
path.cubicTo(3,4, 6,5, 5,3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(5,6);
pathB.cubicTo(3,5, 5,0, 4,3);
pathB.close();
@@ -1009,11 +1009,11 @@
static void cubicOp59d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(5,6, 4,0, 4,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,4);
pathB.cubicTo(1,4, 1,0, 6,5);
pathB.close();
@@ -1022,11 +1022,11 @@
static void cubicOp60d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,2);
path.cubicTo(4,6, 6,0, 5,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,6);
pathB.cubicTo(2,5, 2,0, 6,4);
pathB.close();
@@ -1035,11 +1035,11 @@
static void cubicOp61d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1,2);
path.cubicTo(0,5, 3,2, 6,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2,3);
pathB.cubicTo(1,6, 2,1, 5,0);
pathB.close();
@@ -1048,11 +1048,11 @@
static void cubicOp62d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1,3);
path.cubicTo(5,6, 5,3, 5,4);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(3,5);
pathB.cubicTo(4,5, 3,1, 6,5);
pathB.close();
@@ -1061,11 +1061,11 @@
static void cubicOp63d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2,3);
path.cubicTo(0,4, 3,2, 5,3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2,3);
pathB.cubicTo(3,5, 3,2, 4,0);
pathB.close();
@@ -1113,11 +1113,11 @@
static void cubicOp66u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(2,6, 4,2, 5,3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2,4);
pathB.cubicTo(3,5, 1,0, 6,2);
pathB.close();
@@ -1194,7 +1194,7 @@
rects[4].setLTRB(xC, yC, xF, yF);
paths[4].addRoundRect(rects[4], SkIntToScalar(5), SkIntToScalar(5)); // cyan
SkPath path;
- path.setFillType(SkPathFillType::kInverseEvenOdd);
+ path.setFillType(SkPath::kInverseEvenOdd_FillType);
for (int index = 0; index < 5; ++index) {
SkString uniqueName;
uniqueName.printf("%s%d", filename, index);
@@ -1205,7 +1205,7 @@
static void skp1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(189,7);
path.cubicTo(189,5.34314585f, 190.34314f,4, 192,4);
path.lineTo(243,4);
@@ -1227,7 +1227,7 @@
path.lineTo(191,8);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(189,4);
pathB.lineTo(199,14);
pathB.lineTo(236,14);
@@ -1239,7 +1239,7 @@
static void skp2(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(253.000000f, 11757.0000f);
path.lineTo(253.000000f, 222.000000f);
path.lineTo(823.000000f, 222.000000f);
@@ -1247,7 +1247,7 @@
path.lineTo(253.000000f, 11757.0000f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(258.000000f, 1028.00000f);
pathB.lineTo(258.000000f, 1027.00000f);
pathB.lineTo(823.000000f, 1027.00000f);
@@ -1259,7 +1259,7 @@
static void skp3(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(717.000000f, 507.000000f);
path.lineTo(717.000000f, 425.000000f);
path.lineTo(973.000000f, 425.000000f);
@@ -1279,7 +1279,7 @@
path.lineTo(719.000000f, 426.000000f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(717.000000f, 510.000000f);
pathB.lineTo(760.000000f, 467.000000f);
pathB.lineTo(930.000000f, 467.000000f);
@@ -1291,7 +1291,7 @@
static void skp4(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(230.756805f, 591.756775f);
path.quadTo(232.514725f, 590.000000f, 235.000000f, 590.000000f);
path.lineTo(300.000000f, 590.000000f);
@@ -1311,7 +1311,7 @@
path.lineTo(231.000000f, 597.000000f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(306.000000f, 590.000000f);
pathB.lineTo(292.000000f, 604.000000f);
pathB.lineTo(305.000000f, 617.000000f);
@@ -1323,7 +1323,7 @@
static void skp5(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(18.0000000f, 226.000000f);
path.quadTo(14.6862917f, 226.000000f, 12.3423996f, 228.342407f);
path.quadTo(10.0000000f, 230.686295f, 10.0000000f, 234.000000f);
@@ -1335,7 +1335,7 @@
path.lineTo(18.0000000f, 226.000000f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(18.0000000f, 226.000000f);
pathB.lineTo(1239.00000f, 226.000000f);
pathB.cubicTo(1243.41833f, 226.000000f, 1247.00000f, 229.581726f, 1247.00000f, 234.000000f);
@@ -1349,11 +1349,11 @@
static void cubicOp70d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,5, 4,0, 5,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,4);
pathB.cubicTo(0,5, 1,0, 5,0);
pathB.close();
@@ -1362,11 +1362,11 @@
static void cubicOp71d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,5, 4,1, 6,4);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,4);
pathB.cubicTo(4,6, 1,0, 5,0);
pathB.close();
@@ -1375,11 +1375,11 @@
static void cubicOp72i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,5, 5,2, 5,4);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2,5);
pathB.cubicTo(4,5, 1,0, 5,0);
pathB.close();
@@ -1388,12 +1388,12 @@
static void cubicOp73d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(3,4, 4,0, 6,4);
path.lineTo(0,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,4);
pathB.cubicTo(4,6, 1,0, 4,3);
pathB.lineTo(0,4);
@@ -1403,12 +1403,12 @@
static void cubicOp74d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,5, 5,1, 5,1);
path.lineTo(0,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,5);
pathB.cubicTo(1,5, 1,0, 5,1);
pathB.lineTo(1,5);
@@ -1418,12 +1418,12 @@
static void cubicOp75d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,4, 5,1, 6,4);
path.lineTo(0,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,5);
pathB.cubicTo(4,6, 1,0, 4,0);
pathB.lineTo(1,5);
@@ -1433,11 +1433,11 @@
static void cubicOp76u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,2, 2,0, 5,3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,2);
pathB.cubicTo(3,5, 1,0, 2,0);
pathB.close();
@@ -1446,12 +1446,12 @@
static void cubicOp77i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0,1);
path.cubicTo(1,3, 2,0, 3,2);
path.lineTo(0,1);
path.close();
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(0,2);
pathB.cubicTo(2,3, 1,0, 3,1);
pathB.lineTo(0,2);
@@ -1461,12 +1461,12 @@
static void cubicOp78u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1,6);
path.cubicTo(1,6, 5,0, 6,1);
path.lineTo(1,6);
path.close();
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(0,5);
pathB.cubicTo(1,6, 6,1, 6,1);
pathB.lineTo(0,5);
@@ -1476,11 +1476,11 @@
static void cubicOp79u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,3, 1,0, 6,4);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(4,6, 1,0, 3,1);
pathB.close();
@@ -1489,12 +1489,12 @@
static void cubicOp80i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(2,3, 2,1, 4,3);
path.lineTo(0,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,2);
pathB.cubicTo(3,4, 1,0, 3,2);
pathB.lineTo(1,2);
@@ -1504,11 +1504,11 @@
static void cubicOp81d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(4,6, 4,3, 5,4);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(3,4);
pathB.cubicTo(4,5, 1,0, 6,4);
pathB.close();
@@ -1517,12 +1517,12 @@
static void cubicOp82i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0,1);
path.cubicTo(2,3, 5,2, 3,0);
path.lineTo(0,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2,5);
pathB.cubicTo(0,3, 1,0, 3,2);
pathB.lineTo(2,5);
@@ -1532,12 +1532,12 @@
static void cubicOp83i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,3, 2,1, 4,1);
path.lineTo(0,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,2);
pathB.cubicTo(1,4, 1,0, 3,0);
pathB.lineTo(1,2);
@@ -1547,11 +1547,11 @@
static void cubicOp84d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,4);
path.cubicTo(2,3, 6,3, 3,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(3,6);
pathB.cubicTo(2,3, 4,0, 3,2);
pathB.close();
@@ -1560,7 +1560,7 @@
static void skpClip1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1126.17114f, 877.171204f);
path.quadTo(1127.34314f, 876.000000f, 1129.00000f, 876.000000f);
path.lineTo(1243.00000f, 876.000000f);
@@ -1578,7 +1578,7 @@
path.quadTo(1125.00000f, 878.343140f, 1126.17114f, 877.171204f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1247.00000f, 876.000000f);
pathB.lineTo(1231.00000f, 892.000000f);
pathB.lineTo(1246.00000f, 907.000000f);
@@ -1590,7 +1590,7 @@
static void skpClip2(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(134.000000f, 11414.0000f);
path.cubicTo(131.990234f, 11414.0000f, 130.326660f, 11415.4824f, 130.042755f, 11417.4131f);
path.cubicTo(130.233124f, 11418.3193f, 131.037079f, 11419.0000f, 132.000000f, 11419.0000f);
@@ -1600,7 +1600,7 @@
path.lineTo(134.000000f, 11414.0000f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(132.000000f, 11415.0000f);
pathB.lineTo(806.000000f, 11415.0000f);
pathB.cubicTo(807.104553f, 11415.0000f, 808.000000f, 11415.4473f, 808.000000f, 11416.0000f);
@@ -1616,7 +1616,7 @@
static void skp96prezzi1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(157.464005f, 670.463989f);
path.quadTo(158.928925f, 669.000000f, 161.000000f, 669.000000f);
path.lineTo(248.000000f, 669.000000f);
@@ -1634,7 +1634,7 @@
path.quadTo(156.000000f, 671.928955f, 157.464005f, 670.463989f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(156.000000f, 669.000000f);
pathB.lineTo(178.500000f, 691.500000f);
pathB.lineTo(230.500000f, 691.500000f);
@@ -1646,7 +1646,7 @@
static void skpancestry_com1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(161.000000f, 925.000000f);
path.cubicTo(159.874390f, 925.000000f, 158.835663f, 925.371948f, 158.000000f, 925.999634f);
path.lineTo(158.000000f, 926.000000f);
@@ -1656,7 +1656,7 @@
path.lineTo(161.000000f, 925.000000f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(161.000000f, 926.000000f);
pathB.lineTo(1105.00000f, 926.000000f);
pathB.cubicTo(1107.20911f, 926.000000f, 1109.00000f, 927.790833f, 1109.00000f, 930.000000f);
@@ -1672,7 +1672,7 @@
static void skpeldorado_com_ua1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(286.695129f, 291.000000f);
path.lineTo(229.304855f, 561.000000f);
path.lineTo(979.304871f, 561.000000f);
@@ -1680,7 +1680,7 @@
path.lineTo(286.695129f, 291.000000f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1006.69513f, 291.000000f);
pathB.cubicTo(1023.26367f, 291.000000f, 1033.84021f, 304.431458f, 1030.31836f, 321.000000f);
pathB.lineTo(985.681519f, 531.000000f);
@@ -1696,7 +1696,7 @@
static void skpbyte_com1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(968.000000f, 14.0000000f);
path.cubicTo(965.238586f, 14.0000000f, 963.000000f, 16.2385769f, 963.000000f, 19.0000000f);
path.lineTo(963.000000f, 32.0000000f);
@@ -1708,7 +1708,7 @@
path.lineTo(968.000000f, 14.0000000f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(968.000000f, 14.0000000f);
pathB.lineTo(1034.00000f, 14.0000000f);
pathB.cubicTo(1036.76147f, 14.0000000f, 1039.00000f, 16.2385750f, 1039.00000f, 19.0000000f);
@@ -1724,7 +1724,7 @@
static void skphealth_com76(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(708.099182f, 7.09919119f);
path.lineTo(708.099182f, 7.09920025f);
path.quadTo(704.000000f, 11.2010098f, 704.000000f, 17.0000000f);
@@ -1735,7 +1735,7 @@
path.lineTo(708.099182f, 7.09919119f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(704.000000f, 3.00000000f);
pathB.lineTo(704.000000f, 33.0000000f);
pathB.lineTo(705.000000f, 33.0000000f);
@@ -1745,7 +1745,7 @@
static void skpahrefs_com88(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1099.82886f, 7.17117119f);
path.lineTo(1099.12134f, 7.87867832f);
path.cubicTo(1099.66418f, 8.42157173f, 1100.00000f, 9.17157173f, 1100.00000f, 10.0000000f);
@@ -1761,7 +1761,7 @@
path.lineTo(1099.82886f, 7.17117119f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1101.00000f, 6.00000000f);
pathB.lineTo(1088.00000f, 6.00000000f);
pathB.lineTo(1088.00000f, 19.0000000f);
@@ -1771,7 +1771,7 @@
static void skpahrefs_com29(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1037.17114f, 7.17119980f);
path.quadTo(1038.34314f, 6.00000000f, 1040.00000f, 6.00000000f);
path.lineTo(1074.00000f, 6.00000000f);
@@ -1791,7 +1791,7 @@
path.lineTo(1037.00000f, 10.0000000f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1036.00000f, 32.0000000f);
pathB.lineTo(1049.00000f, 19.0000000f);
pathB.lineTo(1073.00000f, 31.0000000f);
@@ -1801,12 +1801,12 @@
static void cubicOp85d(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,6, 1,0, 6,2);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(2,6, 1,0, 6,1);
pathB.close();
@@ -1815,7 +1815,7 @@
static void skpkkiste_to98(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(96, 122);
path.cubicTo(94.6192932f, 122, 93.3692932f, 122.559647f, 92.4644699f, 123.46447f);
path.lineTo(94.1715698f, 125.17157f);
@@ -1827,7 +1827,7 @@
path.lineTo(96, 122);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(258, 122);
pathB.cubicTo(260.761414f, 122, 263, 124.238579f, 263, 127);
pathB.lineTo(263, 284);
@@ -1981,11 +1981,11 @@
static void cubicOp85i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(3, 4);
path.cubicTo(1, 5, 4, 3, 6, 4);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(3, 4);
pathB.cubicTo(4, 6, 4, 3, 5, 1);
pathB.close();
@@ -2000,7 +2000,7 @@
path1.lineTo(0, 1);
path1.lineTo(0, 0);
path1.close();
- path1.setFillType(SkPathFillType::kWinding);
+ path1.setFillType(SkPath::kWinding_FillType);
SkPath path2;
path2.moveTo(0.646446645f, -0.353553414f);
path2.quadTo(0.792893291f, -0.50000006f, 1.00000012f, -0.50000006f);
@@ -2018,16 +2018,16 @@
path2.quadTo(0.50000006f, 0.792893291f, 0.646446645f, 0.646446645f);
path2.quadTo(0.792893291f, 0.50000006f, 1.00000012f, 0.50000006f);
path2.close();
- path2.setFillType(SkPathFillType::kEvenOdd);
+ path2.setFillType(SkPath::kEvenOdd_FillType);
testPathOp(reporter, path1, path2, kIntersect_SkPathOp, filename);
}
static void rectOp1i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.addRect(0, 0, 1, 1, SkPathDirection::kCW);
path.addRect(2, 2, 4, 4, SkPathDirection::kCW);
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.addRect(0, 0, 1, 1, SkPathDirection::kCW);
pathB.addRect(0, 0, 2, 2, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kIntersect_SkPathOp, filename);
@@ -2035,10 +2035,10 @@
static void rectOp2i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 1, 1, SkPathDirection::kCW);
path.addRect(0, 0, 3, 3, SkPathDirection::kCW);
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.addRect(0, 0, 2, 2, SkPathDirection::kCW);
pathB.addRect(0, 0, 2, 2, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kIntersect_SkPathOp, filename);
@@ -2046,7 +2046,7 @@
static void rectOp3x(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(3, 0);
path.lineTo(3, 3);
@@ -2057,7 +2057,7 @@
path.lineTo(3, 3);
path.lineTo(2, 3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 1);
pathB.lineTo(3, 1);
pathB.lineTo(3, 3);
@@ -2080,7 +2080,7 @@
path1.lineTo(90, 230);
path1.lineTo(160, 60);
path1.close();
- path1.setFillType(SkPathFillType::kEvenOdd);
+ path1.setFillType(SkPath::kEvenOdd_FillType);
SkPath path2;
path2.moveTo(142.589081f, 102.283646f);
@@ -2118,13 +2118,13 @@
path2.lineTo(181.176468f, 120);
path2.lineTo(195.830978f, 161.521133f);
path2.close();
- path2.setFillType(SkPathFillType::kEvenOdd);
+ path2.setFillType(SkPath::kEvenOdd_FillType);
testPathOp(reporter, path1, path2, kIntersect_SkPathOp, filename);
}
static void skpkkiste_to716(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1173, 284);
path.cubicTo(1173, 285.125824f, 1173.37207f, 286.164734f, 1174, 287.000488f);
path.lineTo(1174, 123.999496f);
@@ -2132,7 +2132,7 @@
path.lineTo(1173, 284);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1340, 122);
pathB.cubicTo(1342.76147f, 122, 1345, 124.238579f, 1345, 127);
pathB.lineTo(1345, 284);
@@ -2148,7 +2148,7 @@
static void loopEdge1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0,0);
path.lineTo(3,0);
path.lineTo(3,2);
@@ -2159,7 +2159,7 @@
path.lineTo(0,3);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(1,2);
pathB.lineTo(2,2);
pathB.lineTo(2,4);
@@ -2170,7 +2170,7 @@
static void loopEdge2(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0,0);
path.lineTo(3,0);
path.lineTo(3,2);
@@ -2181,7 +2181,7 @@
path.lineTo(0,3);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(1 - 1e-6f,2);
pathB.lineTo(2 - 1e-6f,2);
pathB.lineTo(2 - 1e-6f,4);
@@ -2192,11 +2192,11 @@
static void cubicOp86i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 4);
path.cubicTo(3, 4, 6, 2, 5, 2);
path.close();
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(2, 6);
pathB.cubicTo(2, 5, 4, 0, 4, 3);
pathB.close();
@@ -2205,11 +2205,11 @@
static void cubicOp87u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,2, 2,0, 6,4);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,2);
pathB.cubicTo(4,6, 1,0, 2,0);
pathB.close();
@@ -2219,11 +2219,11 @@
static void cubicOp88u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(2,5, 5,0, 6,4);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,5);
pathB.cubicTo(4,6, 1,0, 5,2);
pathB.close();
@@ -2232,11 +2232,11 @@
static void cubicOp89u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 3);
path.cubicTo(1, 6, 5, 0, 6, 3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 5);
pathB.cubicTo(3, 6, 3, 0, 6, 1);
pathB.close();
@@ -2245,11 +2245,11 @@
static void cubicOp90u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 5);
path.cubicTo(1, 2, 5, 2, 4, 1);
path.close();
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(2, 5);
pathB.cubicTo(1, 4, 5, 0, 2, 1);
pathB.close();
@@ -2258,11 +2258,11 @@
static void cubicOp91u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 6);
path.cubicTo(0, 3, 6, 3, 5, 0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(3, 6);
pathB.cubicTo(0, 5, 6, 1, 3, 0);
pathB.close();
@@ -2271,7 +2271,7 @@
static void skpaaalgarve_org53(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(-1.24344979e-014f, 348);
path.lineTo(258, 348);
path.lineTo(258, 322);
@@ -2281,7 +2281,7 @@
path.lineTo(-1.24344979e-014f, 348);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 312);
pathB.lineTo(258, 312);
pathB.lineTo(258, 348);
@@ -2292,7 +2292,7 @@
static void skpabcspark_ca103(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1.99840144e-015f, 494);
path.lineTo(97, 494);
path.quadTo(100.313705f, 494, 102.6576f, 491.657593f);
@@ -2304,7 +2304,7 @@
path.lineTo(1.99840144e-015f, 494);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 417);
pathB.lineTo(105, 417);
pathB.lineTo(105, 494);
@@ -2315,7 +2315,7 @@
static void skpacesoftech_com47(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(670.537415f, 285);
path.lineTo(670.387451f, 285);
path.lineTo(596.315186f, 314.850708f);
@@ -2325,7 +2325,7 @@
path.lineTo(670.537415f, 285);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(663.318542f, 374.100616f);
pathB.quadTo(647.950989f, 380.293671f, 632.705322f, 373.806305f);
pathB.quadTo(617.459595f, 367.318909f, 611.266541f, 351.951355f);
@@ -2341,7 +2341,7 @@
static void skpact_com43(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1.45716772e-016f, 924.336121f);
path.lineTo(-1.11022302e-016f, 920);
path.lineTo(6, 920);
@@ -2356,7 +2356,7 @@
path.cubicTo(2.79086018f, 925, 1, 923.209167f, 1, 921);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(-1, 920);
pathB.lineTo(0, 920);
pathB.lineTo(3, 927);
@@ -2366,7 +2366,7 @@
static void skpadbox_lt8(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(320.097229f, 628.573669f);
path.lineTo(610.227173f, 85.7786865f);
path.lineTo(946.652588f, 265.601807f);
@@ -2374,7 +2374,7 @@
path.lineTo(320.097229f, 628.573669f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(333.866608f, 623.496155f);
pathB.lineTo(613.368042f, 100.585754f);
pathB.cubicTo(613.685303f, 99.9921265f, 614.423767f, 99.7681885f, 615.017395f, 100.085449f);
@@ -2390,7 +2390,7 @@
static void skpadindex_de4(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 926);
path.lineTo(0, 0);
path.lineTo(1280, 0);
@@ -2398,7 +2398,7 @@
path.lineTo(0, 926);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 312);
pathB.lineTo(8.20486257e-015f, 178);
pathB.lineTo(49, 178);
@@ -2409,7 +2409,7 @@
static void skpadithya_putr4_blogspot_com551(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(205.605804f, 142.334625f);
path.lineTo(254.665359f, 85.6058044f);
path.lineTo(311.394196f, 134.665359f);
@@ -2417,7 +2417,7 @@
path.lineTo(205.605804f, 142.334625f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(283.407959f, 110.462646f);
pathB.cubicTo(298.864319f, 123.829437f, 300.558258f, 147.195221f, 287.191467f, 162.651581f);
pathB.lineTo(286.537354f, 163.407959f);
@@ -2433,7 +2433,7 @@
static void skpadspert_de11(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(-4.4408921e-016f, 682.5f);
path.lineTo(30.5f, 682.5f);
path.cubicTo(32.709137f, 682.5f, 34.5f, 680.709167f, 34.5f, 678.5f);
@@ -2443,7 +2443,7 @@
path.lineTo(-4.4408921e-016f, 682.5f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 482);
pathB.lineTo(35, 482);
pathB.lineTo(35, 683);
@@ -2454,7 +2454,7 @@
static void skpaiaigames_com870(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(324.071075f, 845.071045f);
path.cubicTo(324.405151f, 844.737f, 324.715668f, 844.379395f, 325, 844.000977f);
path.lineTo(325, 842.127197f);
@@ -2468,7 +2468,7 @@
path.cubicTo(324.571411f, 716.043762f, 324.017761f, 715.289856f, 323.363953f, 714.636047f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(317, 711);
pathB.cubicTo(322.522858f, 711, 327, 715.477173f, 327, 721);
pathB.lineTo(327, 838);
@@ -2484,11 +2484,11 @@
static void cubicOp92i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 1);
path.cubicTo(2, 6, 4, 1, 5, 4);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 4);
pathB.cubicTo(4, 5, 1, 0, 6, 2);
pathB.close();
@@ -2497,11 +2497,11 @@
static void cubicOp93d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 1);
path.cubicTo(1, 6, 4, 1, 4, 3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 4);
pathB.cubicTo(3, 4, 1, 0, 6, 1);
pathB.close();
@@ -2510,11 +2510,11 @@
static void cubicOp94u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 3);
path.cubicTo(2, 3, 5, 0, 5, 3);
path.close();
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(0, 5);
pathB.cubicTo(3, 5, 3, 0, 3, 2);
pathB.close();
@@ -2523,7 +2523,7 @@
static void skpadbox_lt15(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(333.292084f, 624.570984f);
path.lineTo(614.229797f, 98.9735107f);
path.lineTo(933.457764f, 269.604431f);
@@ -2531,7 +2531,7 @@
path.lineTo(333.292084f, 624.570984f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(613.368042f, 100.585754f);
pathB.cubicTo(613.685303f, 99.9921265f, 614.423767f, 99.7681885f, 615.017395f, 100.085449f);
pathB.lineTo(932.633057f, 269.854553f);
@@ -2547,7 +2547,7 @@
static void skpadoption_org196(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(802, 367);
path.lineTo(802, 324);
path.lineTo(956, 324);
@@ -2558,7 +2558,7 @@
path.cubicTo(806.029419f, 376, 802, 371.970551f, 802, 367);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(803, 326);
pathB.lineTo(955, 326);
pathB.lineTo(955, 370);
@@ -2572,7 +2572,7 @@
static void skpadspert_net23(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(-2.220446e-018f, 483.5f);
path.lineTo(0, 482.5f);
path.lineTo(30.5f, 482.5f);
@@ -2588,7 +2588,7 @@
path.lineTo(-2.220446e-018f, 483.5f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 482);
pathB.lineTo(35, 482);
pathB.lineTo(35, 683);
@@ -2599,7 +2599,7 @@
static void skpadventistmission_org572(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1182.00037f, 926);
path.cubicTo(1181.08813f, 924.785583f, 1179.63586f, 924, 1178, 924);
path.lineTo(938, 924);
@@ -2607,7 +2607,7 @@
path.lineTo(1182.00037f, 926);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(934, 924);
pathB.lineTo(1182, 924);
pathB.lineTo(1182, 926);
@@ -2618,7 +2618,7 @@
static void skpagentxsites_com55(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(925, 27);
path.cubicTo(924.447693f, 27, 924, 27.4477158f, 924, 28);
path.lineTo(924, 55);
@@ -2630,7 +2630,7 @@
path.lineTo(925, 27);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1103, 27);
pathB.cubicTo(1104.10461f, 27, 1105, 27.8954315f, 1105, 29);
pathB.lineTo(1105, 54);
@@ -2646,7 +2646,7 @@
static void skpbakosoft_com10(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(190, 170);
path.cubicTo(178.9543f, 170, 170, 178.9543f, 170, 190);
path.cubicTo(170, 201.0457f, 178.9543f, 210, 190, 210);
@@ -2656,7 +2656,7 @@
path.lineTo(190, 170);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(210, 190);
pathB.quadTo(210, 198.284271f, 204.142136f, 204.142136f);
pathB.quadTo(198.284271f, 210, 190, 210);
@@ -2672,7 +2672,7 @@
static void skpbambootheme_com12(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(47.8780937f, 58);
path.lineTo(0, 58);
path.lineTo(-8.65973959e-015f, 96.9914017f);
@@ -2680,7 +2680,7 @@
path.quadTo(44.9466133f, 71.764061f, 47.8780937f, 58);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(-1, -3);
pathB.lineTo(-1, -3);
pathB.cubicTo(26.6142502f, -3, 49, 19.3857498f, 49, 47);
@@ -2696,7 +2696,7 @@
static void skpakmmos_ru100(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(693.000488f, 926);
path.cubicTo(692.164734f, 925.37207f, 691.125793f, 925, 690, 925);
path.lineTo(578, 925);
@@ -2704,7 +2704,7 @@
path.lineTo(693.000488f, 926);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(575, 925);
pathB.lineTo(693, 925);
pathB.lineTo(693, 926);
@@ -2715,7 +2715,7 @@
static void skpcarpetplanet_ru22(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(195, 785);
path.cubicTo(124.307556f, 785, 67, 841.859863f, 67, 912);
path.lineTo(67, 913);
@@ -2725,7 +2725,7 @@
path.cubicTo(314.09201f, 833.437622f, 260.247131f, 785, 195, 785);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(195, 785);
pathB.cubicTo(265.140167f, 785, 322, 842.307556f, 322, 913);
pathB.cubicTo(322, 983.692444f, 265.140167f, 1041, 195, 1041);
@@ -2739,7 +2739,7 @@
static void skpcarrot_is24(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(945, 597);
path.quadTo(913.93396f, 597, 891.96698f, 618.96698f);
path.quadTo(870, 640.93396f, 870, 672);
@@ -2751,7 +2751,7 @@
path.quadTo(976.06604f, 597, 945, 597);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(945.080994f, 597.161987f);
pathB.cubicTo(903.659973f, 597.161987f, 870.080994f, 630.73999f, 870.080994f, 672.161987f);
pathB.cubicTo(870.080994f, 676.096008f, 870.387024f, 679.957031f, 870.971008f, 683.726013f);
@@ -2765,7 +2765,7 @@
static void skpbangalorenest_com4(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 926);
path.lineTo(0, 0);
path.lineTo(1265, 0);
@@ -2773,7 +2773,7 @@
path.lineTo(0, 926);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 290);
pathB.lineTo(-2.64514972e-014f, 146);
pathB.lineTo(30, 146);
@@ -2784,7 +2784,7 @@
static void skpbenzoteh_ru152(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(883, 23);
path.lineTo(883, 0);
path.lineTo(1122.5f, 0);
@@ -2796,7 +2796,7 @@
path.quadTo(883, 25.0710678f, 883, 23);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(883, 0);
pathB.lineTo(1123, 0);
pathB.lineTo(1123, 23);
@@ -2811,7 +2811,7 @@
static void skpbestred_ru37(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(883, 23);
path.lineTo(883, 0);
path.lineTo(1122.5f, 0);
@@ -2823,7 +2823,7 @@
path.quadTo(883, 25.0710678f, 883, 23);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(883, 0);
pathB.lineTo(1123, 0);
pathB.lineTo(1123, 23);
@@ -2838,7 +2838,7 @@
static void skpbingoentertainment_net189(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(896, 745.38678f);
path.lineTo(896, 873.38678f);
path.lineTo(922.567993f, 876.683716f);
@@ -2846,7 +2846,7 @@
path.lineTo(896, 745.38678f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(899.200928f, 745.783997f);
pathB.cubicTo(897.119385f, 745.525696f, 895.432007f, 752.031982f, 895.432007f, 760.316284f);
pathB.lineTo(895.432007f, 858.316284f);
@@ -2862,7 +2862,7 @@
static void skpcarrefour_ro62(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1104, 453);
path.lineTo(399, 453);
path.lineTo(399, 657);
@@ -2872,7 +2872,7 @@
path.lineTo(1104, 453);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(400, 453);
pathB.lineTo(1103, 453);
pathB.lineTo(1103, 666);
@@ -2885,7 +2885,7 @@
static void skpcaffelavazzait_com_ua21(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(883, 23);
path.lineTo(883, 0);
path.lineTo(1122.5f, 0);
@@ -2897,7 +2897,7 @@
path.quadTo(883, 25.0710678f, 883, 23);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(883, 0);
pathB.lineTo(1123, 0);
pathB.lineTo(1123, 23);
@@ -2912,7 +2912,7 @@
static void skpcamcorder_kz21(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(883, 23);
path.lineTo(883, 0);
path.lineTo(1122.5f, 0);
@@ -2924,7 +2924,7 @@
path.quadTo(883, 25.0710678f, 883, 23);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(883, 0);
pathB.lineTo(1123, 0);
pathB.lineTo(1123, 23);
@@ -2939,7 +2939,7 @@
static void skpcavablar_net563(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(160.000488f, 918);
path.cubicTo(159.164749f, 917.37207f, 158.125824f, 917, 157, 917);
path.lineTo(94, 917);
@@ -2947,7 +2947,7 @@
path.lineTo(160.000488f, 918);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(91, 917);
pathB.lineTo(160, 917);
pathB.lineTo(160, 918);
@@ -2958,7 +2958,7 @@
static void skpinsomnia_gr72(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1138, 231);
path.lineTo(1137, 243.625748f);
path.lineTo(1137, 926);
@@ -2967,7 +2967,7 @@
path.lineTo(1138, 231);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1139, 231);
pathB.lineTo(1138, 231);
pathB.lineTo(633, 6101);
@@ -2977,11 +2977,11 @@
static void cubicOp95u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 2);
path.cubicTo(2, 3, 5, 1, 3, 2);
path.close();
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(1, 5);
pathB.cubicTo(2, 3, 2, 0, 3, 2);
pathB.close();
@@ -2990,11 +2990,11 @@
static void cubicOp96d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1, 6);
path.cubicTo(0, 3, 6, 3, 5, 0);
path.close();
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(3, 6);
pathB.cubicTo(0, 5, 6, 1, 3, 0);
pathB.close();
@@ -3003,11 +3003,11 @@
static void cubicOp97x(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 2);
path.cubicTo(0, 6, 2, 1, 2, 1);
path.close();
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(1, 2);
pathB.cubicTo(1, 2, 2, 0, 6, 0);
pathB.close();
@@ -3016,11 +3016,11 @@
static void cubicOp98x(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 3);
path.cubicTo(3, 6, 4, 1, 6, 3);
path.close();
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(1, 4);
pathB.cubicTo(3, 6, 3, 0, 6, 3);
pathB.close();
@@ -3029,11 +3029,11 @@
static void cubicOp99(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(3,6);
path.cubicTo(0,3, 6,5, 5,4);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(5,6);
pathB.cubicTo(4,5, 6,3, 3,0);
pathB.close();
@@ -3042,11 +3042,11 @@
static void cubicOp100(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,2, 2,1, 4,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,2);
pathB.cubicTo(2,4, 1,0, 2,0);
pathB.close();
@@ -3055,11 +3055,11 @@
static void cubicOp101(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 1);
path.cubicTo(2, 3, 2, 1, 5, 3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 2);
pathB.cubicTo(3, 5, 1, 0, 3, 2);
pathB.close();
@@ -3068,11 +3068,11 @@
static void cubicOp102(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,2, 1,0, 3,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,1);
pathB.cubicTo(0,3, 1,0, 2,1);
pathB.close();
@@ -3081,11 +3081,11 @@
static void cubicOp103(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,5, 2,0, 2,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,2);
pathB.cubicTo(1,2, 1,0, 5,1);
pathB.close();
@@ -3094,11 +3094,11 @@
static void cubicOp104(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,6, 4,0, 6,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,4);
pathB.cubicTo(1,6, 1,0, 6,0);
pathB.close();
@@ -3107,11 +3107,11 @@
static void cubicOp105(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,4, 6,5, 2,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(5,6);
pathB.cubicTo(0,2, 1,0, 4,0);
pathB.close();
@@ -3120,11 +3120,11 @@
static void cubicOp106(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 1);
path.cubicTo(4, 6, 2, 1, 2, 0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 2);
pathB.cubicTo(0, 2, 1, 0, 6, 4);
pathB.close();
@@ -3133,11 +3133,11 @@
static void cubicOp107(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 1);
path.cubicTo(4, 6, 2, 1, 2, 0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 2);
pathB.cubicTo(0, 2, 1, 0, 6, 4);
pathB.close();
@@ -3146,11 +3146,11 @@
static void cubicOp108(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 1);
path.cubicTo(4, 6, 2, 1, 2, 0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 2);
pathB.cubicTo(0, 2, 1, 0, 6, 4);
pathB.close();
@@ -3159,11 +3159,11 @@
static void cubicOp109(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(4,5, 6,3, 5,4);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(3,6);
pathB.cubicTo(4,5, 1,0, 5,4);
pathB.close();
@@ -3172,10 +3172,10 @@
static void cubicOp110(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 1, 1, SkPathDirection::kCW);
path.addRect(0, 0, 4, 4, SkPathDirection::kCW);
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.addRect(0, 0, 2, 2, SkPathDirection::kCW);
pathB.addRect(0, 0, 2, 2, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kIntersect_SkPathOp, filename);
@@ -3183,11 +3183,11 @@
static void cubicOp111(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1,4);
path.cubicTo(0,5, 4,1, 3,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,4);
pathB.cubicTo(1,3, 4,1, 5,0);
pathB.close();
@@ -3196,11 +3196,11 @@
static void xOp1u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1, 4);
path.cubicTo(4, 5, 3, 2, 6, 3);
path.close();
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(2, 3);
pathB.cubicTo(3, 6, 4, 1, 5, 4);
pathB.close();
@@ -3209,11 +3209,11 @@
static void xOp1i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1, 4);
path.cubicTo(1, 5, 6, 0, 5, 1);
path.close();
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(0, 6);
pathB.cubicTo(1, 5, 4, 1, 5, 1);
pathB.close();
@@ -3222,11 +3222,11 @@
static void xOp2i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1, 5);
path.cubicTo(0, 4, 3, 2, 6, 1);
path.close();
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(2, 3);
pathB.cubicTo(1, 6, 5, 1, 4, 0);
pathB.close();
@@ -3235,11 +3235,11 @@
static void xOp3i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1,4);
path.cubicTo(0,5, 4,1, 3,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,4);
pathB.cubicTo(1,3, 4,1, 5,0);
pathB.close();
@@ -3248,11 +3248,11 @@
static void findFirst1(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,6, 5,0, 2,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,5);
pathB.cubicTo(1,2, 1,0, 6,1);
pathB.close();
@@ -3261,11 +3261,11 @@
static void cubicOp112(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2,4);
path.cubicTo(2,3, 6,4, 1,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(4,6);
pathB.cubicTo(0,1, 4,2, 3,2);
pathB.close();
@@ -3285,11 +3285,11 @@
static void cubicOp114(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 1);
path.cubicTo(1, 3, -1, 2, 3.5f, 1.33333337f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 3);
pathB.cubicTo(-1, 2, 3.5f, 1.33333337f, 0, 1);
pathB.close();
@@ -3298,11 +3298,11 @@
static void cubicOp114asQuad(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 1);
path.cubicTo(1, 3, -1, 2, 3.5f, 1.33333337f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 3);
pathB.cubicTo(-1, 2, 3.5f, 1.33333337f, 0, 1);
pathB.close();
@@ -3384,7 +3384,7 @@
static void rects1(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(1, 0);
path.lineTo(1, 1);
@@ -3395,7 +3395,7 @@
path.lineTo(6, 6);
path.lineTo(0, 6);
path.close();
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(0, 0);
pathB.lineTo(1, 0);
pathB.lineTo(1, 1);
@@ -3411,7 +3411,7 @@
static void rects2(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(4, 0);
path.lineTo(4, 4);
@@ -3422,7 +3422,7 @@
path.lineTo(4, 4);
path.lineTo(3, 4);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(3, 3);
pathB.lineTo(6, 3);
pathB.lineTo(6, 6);
@@ -3438,10 +3438,10 @@
static void rects3(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 1, 1, SkPathDirection::kCW);
path.addRect(0, 0, 4, 4, SkPathDirection::kCW);
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.addRect(0, 0, 2, 2, SkPathDirection::kCW);
pathB.addRect(0, 0, 2, 2, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kDifference_SkPathOp, filename);
@@ -3449,10 +3449,10 @@
static void rects4(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 1, 1, SkPathDirection::kCW);
path.addRect(0, 0, 2, 2, SkPathDirection::kCW);
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.addRect(0, 0, 2, 2, SkPathDirection::kCW);
pathB.addRect(0, 0, 3, 3, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kDifference_SkPathOp, filename);
@@ -3508,11 +3508,11 @@
static void cubicOp115(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(3,4, 2,1, 5,3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,2);
pathB.cubicTo(3,5, 1,0, 4,3);
pathB.close();
@@ -3531,10 +3531,10 @@
static void testRect2(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.addRect(0, 0, 1, 1, SkPathDirection::kCW);
path.addRect(4, 4, 5, 5, SkPathDirection::kCW);
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.addRect(0, 0, 2, 2, SkPathDirection::kCW);
pathB.addRect(0, 0, 6, 6, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kDifference_SkPathOp, filename);
@@ -3542,11 +3542,11 @@
static void cubicOp116(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(4,6, 2,0, 2,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,2);
pathB.cubicTo(0,2, 1,0, 6,4);
pathB.close();
@@ -3555,11 +3555,11 @@
static void cubicOp117(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(4,5, 6,0, 1,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,6);
pathB.cubicTo(0,1, 1,0, 5,4);
pathB.close();
@@ -3568,11 +3568,11 @@
static void cubicOp118(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(4,6, 5,1, 6,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,5);
pathB.cubicTo(2,6, 1,0, 6,4);
pathB.close();
@@ -3671,11 +3671,11 @@
static void cubicOp119(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(3,5, 2,1, 3,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,2);
pathB.cubicTo(1,3, 1,0, 5,3);
pathB.close();
@@ -3684,11 +3684,11 @@
static void cubicOp120(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(2,4, 2,1, 4,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,2);
pathB.cubicTo(0,4, 1,0, 4,2);
pathB.close();
@@ -3697,11 +3697,11 @@
static void cubicOp121(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(3,4, 3,2, 4,3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2,3);
pathB.cubicTo(3,4, 1,0, 4,3);
pathB.close();
@@ -3711,11 +3711,11 @@
// FIXME : haven't debugged this failure yet
static void cubicOp122(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(3,5, 4,1, 4,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,4);
pathB.cubicTo(0,4, 1,0, 5,3);
pathB.close();
@@ -3724,11 +3724,11 @@
static void cubicOp123(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,5, 2,0, 6,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,2);
pathB.cubicTo(0,6, 1,0, 5,1);
pathB.close();
@@ -3759,11 +3759,11 @@
static void cubicOp124(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,5, 6,0, 3,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,6);
pathB.cubicTo(0,3, 1,0, 5,1);
pathB.close();
@@ -3772,11 +3772,11 @@
static void cubicOp125(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(3,6, 3,1, 6,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,3);
pathB.cubicTo(2,6, 1,0, 6,3);
pathB.close();
@@ -3785,11 +3785,11 @@
static void cubicOp126(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,3, 6,0, 2,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,6);
pathB.cubicTo(1,2, 1,0, 3,0);
pathB.close();
@@ -3798,11 +3798,11 @@
static void cubicOp127(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(1,5, 6,0, 3,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,6);
pathB.cubicTo(0,3, 1,0, 5,1);
pathB.close();
@@ -3811,11 +3811,11 @@
static void cubicOp128(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(0,3, 3,2, 5,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2,3);
pathB.cubicTo(2,5, 1,0, 3,0);
pathB.close();
@@ -3824,11 +3824,11 @@
static void cubicOp129(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(5,6);
path.cubicTo(3,4, 2,0, 2,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,2);
pathB.cubicTo(1,2, 6,5, 4,3);
pathB.close();
@@ -3837,11 +3837,11 @@
static void cubicOp130(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(5,6);
path.cubicTo(4,6, 3,0, 2,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,3);
pathB.cubicTo(1,2, 6,5, 6,4);
pathB.close();
@@ -3869,12 +3869,12 @@
static void cubicOp130a(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(5,6);
SkPoint pts[] = { {5,6}, {4,6}, {3,0}, {2,1} };
complex_to_quads(pts, &path);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,3);
SkPoint pts2[] = { {0,3}, {1,2}, {6,5}, {6,4} };
complex_to_quads(pts2, &path);
@@ -3884,11 +3884,11 @@
static void cubicOp131(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(3,4, 3,0, 6,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,3);
pathB.cubicTo(2,6, 1,0, 4,3);
pathB.close();
@@ -3897,25 +3897,25 @@
static void circlesOp1(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.addCircle(0, 1, 2, SkPathDirection::kCCW);
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.addCircle(0, 1, 1, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kDifference_SkPathOp, filename);
}
static void circlesOp2(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.addCircle(0, 1, 4, SkPathDirection::kCCW);
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.addCircle(0, 4, 3, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kIntersect_SkPathOp, filename);
}
static void rRect1x(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(20.65f, 5.65f);
path.conicTo(20.65f, 1.13612f, 25.1404f, 0.65f, 0.888488f);
path.lineTo(25.65f, 0.65f);
@@ -3941,7 +3941,7 @@
SkPath path1(path);
path.reset();
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(20.65f, 45.65f);
path.lineTo(20.65f, 25.65f);
path.conicTo(20.65f, 20.65f, 25.65f, 20.65f, 0.707107f);
@@ -3970,10 +3970,10 @@
static void rects5(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.addRect(5, 5, 6, 6, SkPathDirection::kCW);
path.addRect(5, 5, 6, 6, SkPathDirection::kCW);
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.addRect(0, 0, 6, 6, SkPathDirection::kCW);
pathB.addRect(5, 5, 6, 6, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kDifference_SkPathOp, filename);
@@ -4003,9 +4003,9 @@
static void circlesOp3(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.addCircle(0, 1, 2, SkPathDirection::kCCW);
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.addCircle(3, 5, 3, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kDifference_SkPathOp, filename);
}
@@ -4034,11 +4034,11 @@
static void cubicOp132(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(5,6);
path.cubicTo(3,4, 3,0, 3,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,3);
pathB.cubicTo(2,3, 6,5, 4,3);
pathB.close();
@@ -4058,11 +4058,11 @@
static void cubicOp133(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(5,6);
path.cubicTo(5,6, 5,0, 4,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,5);
pathB.cubicTo(1,4, 6,5, 6,5);
pathB.close();
@@ -4071,11 +4071,11 @@
static void cubicOp134(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(5,6);
path.cubicTo(5,6, 6,0, 3,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,6);
pathB.cubicTo(1,3, 6,5, 6,5);
pathB.close();
@@ -4084,11 +4084,11 @@
static void cubicOp135(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(5,6);
path.cubicTo(5,6, 6,0, 4,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,6);
pathB.cubicTo(1,4, 6,5, 6,5);
pathB.close();
@@ -4097,11 +4097,11 @@
static void cubicOp136(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(5,6);
path.cubicTo(5,6, 5,0, 3,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,5);
pathB.cubicTo(1,3, 6,5, 6,5);
pathB.close();
@@ -4110,11 +4110,11 @@
static void cubicOp136a(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(5,6);
path.quadTo(5,0, 3,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,5);
pathB.cubicTo(1,3, 6,5, 6,5);
pathB.close();
@@ -4123,11 +4123,11 @@
static void cubics137(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 5);
path.cubicTo(3, 6, 1, 0, 3, 2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 1);
pathB.cubicTo(2, 3, 5, 0, 6, 3);
pathB.close();
@@ -4136,11 +4136,11 @@
static void cubics138(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 5);
path.cubicTo(3, 6, 1, 0, 4, 2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 1);
pathB.cubicTo(2, 4, 5, 0, 6, 3);
pathB.close();
@@ -4150,11 +4150,11 @@
// three curves intersect successfully nearby -- the angle only gets 2 of the 3 pts
static void cubicOp139(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,2);
path.cubicTo(0,4, 3,1, 5,1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,3);
pathB.cubicTo(1,5, 2,0, 4,0);
pathB.close();
@@ -4163,11 +4163,11 @@
static void cubicOp140(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,2);
path.cubicTo(1,2, 5,4, 3,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(4,5);
pathB.cubicTo(2,3, 2,0, 2,1);
pathB.close();
@@ -4176,11 +4176,11 @@
static void cubicOp141(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,2);
path.cubicTo(1,2, 6,4, 3,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(4,6);
pathB.cubicTo(2,3, 2,0, 2,1);
pathB.close();
@@ -4249,11 +4249,11 @@
static void loops4i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 3);
path.cubicTo(0, 2, 0, 2, -1.66666663f, 2.16666675f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 2);
pathB.cubicTo(0, 2, -1.66666663f, 2.16666675f, 0, 3);
pathB.close();
@@ -4262,11 +4262,11 @@
static void loops5i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 2);
path.cubicTo(0, 2, 0, 2, 0.166666672f, 2.66666675f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 2);
pathB.cubicTo(0, 2, 0.166666672f, 2.66666675f, 1, 2);
pathB.close();
@@ -4275,11 +4275,11 @@
static void cubicOp142(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(5,6);
path.cubicTo(2,5, 2,1, 1,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1,2);
pathB.cubicTo(0,1, 6,5, 5,2);
pathB.close();
@@ -4288,11 +4288,11 @@
static void cubics6d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(3, 5);
path.cubicTo(1, 5, 4, 2, 4, 0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2, 4);
pathB.cubicTo(0, 4, 5, 3, 5, 1);
pathB.close();
@@ -4301,11 +4301,11 @@
static void cubics7d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 6);
path.cubicTo(2, 4, 5, 1, 3, 1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 5);
pathB.cubicTo(1, 3, 6, 2, 4, 2);
pathB.close();
@@ -4314,11 +4314,11 @@
static void cubics8d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 5);
path.cubicTo(2, 4, 5, 1, 3, 2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 5);
pathB.cubicTo(2, 3, 5, 2, 4, 2);
pathB.close();
@@ -4327,11 +4327,11 @@
static void cubics9d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 4);
path.cubicTo(2, 6, 3, 1, 5, 1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 3);
pathB.cubicTo(1, 5, 4, 2, 6, 2);
pathB.close();
@@ -4340,11 +4340,11 @@
static void cubics10u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 4);
path.cubicTo(1, 6, 4, 1, 5, 1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 4);
pathB.cubicTo(1, 5, 4, 2, 6, 1);
pathB.close();
@@ -4353,11 +4353,11 @@
static void cubics11i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 4);
path.cubicTo(2, 5, 3, 2, 5, 1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2, 3);
pathB.cubicTo(1, 5, 4, 2, 5, 2);
pathB.close();
@@ -4366,11 +4366,11 @@
static void cubics12d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 4);
path.cubicTo(0, 4, 5, 3, 5, 1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(3, 5);
pathB.cubicTo(1, 5, 4, 2, 4, 0);
pathB.close();
@@ -4379,11 +4379,11 @@
static void cubics13d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 3);
path.cubicTo(1, 5, 4, 2, 5, 2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2, 4);
pathB.cubicTo(2, 5, 3, 2, 5, 1);
pathB.close();
@@ -4392,11 +4392,11 @@
static void cubics14d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 3);
path.cubicTo(0, 4, 3, 1, 3, 0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 3);
pathB.cubicTo(0, 3, 3, 2, 4, 0);
pathB.close();
@@ -4405,11 +4405,11 @@
static void cubics15d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 5);
path.cubicTo(3, 5, 4, 0, 4, 2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 4);
pathB.cubicTo(2, 4, 5, 1, 5, 3);
pathB.close();
@@ -4418,11 +4418,11 @@
static void cubics16i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 5);
path.cubicTo(2, 5, 5, 0, 4, 2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 5);
pathB.cubicTo(2, 4, 5, 1, 5, 2);
pathB.close();
@@ -4431,11 +4431,11 @@
static void cubics17d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 5);
path.cubicTo(3, 4, 4, 1, 4, 2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 4);
pathB.cubicTo(2, 4, 5, 1, 4, 3);
pathB.close();
@@ -4444,11 +4444,11 @@
static void cubics18d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 5);
path.cubicTo(1, 3, 4, 0, 2, 0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 4);
pathB.cubicTo(0, 2, 5, 1, 3, 1);
pathB.close();
@@ -4457,11 +4457,11 @@
static void cubics19d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 5);
path.cubicTo(2, 3, 5, 2, 4, 2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2, 5);
pathB.cubicTo(2, 4, 5, 1, 3, 2);
pathB.close();
@@ -4470,11 +4470,11 @@
static void cubicOp157(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1,5);
path.cubicTo(1,3, 6,2, 4,2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2,6);
pathB.cubicTo(2,4, 5,1, 3,1);
pathB.close();
@@ -4483,11 +4483,11 @@
static void cubics20d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 2);
path.cubicTo(0, 3, 6, 0, 3, 2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 6);
pathB.cubicTo(2, 3, 2, 1, 3, 0);
pathB.close();
@@ -4496,11 +4496,11 @@
static void loops20i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 2);
path.cubicTo(0, 2, 0.833333313f, 2, 1, 3.66666651f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 2);
pathB.cubicTo(0.833333313f, 2, 1, 3.66666651f, 1, 2);
pathB.close();
@@ -4509,11 +4509,11 @@
static void loops21i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 2);
path.cubicTo(0, 2, 0.833333313f, 2, 1, 4);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 2);
pathB.cubicTo(0.833333313f, 2, 1, 4, 1, 2);
pathB.close();
@@ -4522,11 +4522,11 @@
static void loops22i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 3);
path.cubicTo(0, 3, 0.833333313f, 3, 1, 4.66666651f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 3);
pathB.cubicTo(0.833333313f, 3, 1, 4.66666651f, 1, 3);
pathB.close();
@@ -4535,11 +4535,11 @@
static void loops23i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 5);
path.cubicTo(0, 1, 6.16666698f, 5.66666698f, -5.66666651f, 6.66666651f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 1);
pathB.cubicTo(6.16666698f, 5.66666698f, -5.66666651f, 6.66666651f, 1, 5);
pathB.close();
@@ -4548,11 +4548,11 @@
static void loops24i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 2);
path.cubicTo(0, 2, 0.833333313f, 2, 1, 3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 2);
pathB.cubicTo(0.833333313f, 2, 1, 3, 1, 2);
pathB.close();
@@ -4561,11 +4561,11 @@
static void loops25i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 5);
path.cubicTo(0, 5, 0.833333313f, 5, 1, 7);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 5);
pathB.cubicTo(0.833333313f, 5, 1, 7, 1, 5);
pathB.close();
@@ -4574,11 +4574,11 @@
static void loops26i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 6);
path.cubicTo(0, 2, 6.16666698f, 6.66666698f, -5.66666651f, 7.66666651f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 2);
pathB.cubicTo(6.16666698f, 6.66666698f, -5.66666651f, 7.66666651f, 1, 6);
pathB.close();
@@ -4587,11 +4587,11 @@
static void loops27i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 3);
path.cubicTo(0, 3, 0.833333313f, 3, 1, 4.33333349f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 3);
pathB.cubicTo(0.833333313f, 3, 1, 4.33333349f, 1, 3);
pathB.close();
@@ -4600,11 +4600,11 @@
static void loops28i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 3);
path.cubicTo(1, 3, 1.83333337f, 3, 2, 4.66666651f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 3);
pathB.cubicTo(1.83333337f, 3, 2, 4.66666651f, 2, 3);
pathB.close();
@@ -4613,11 +4613,11 @@
static void loops29i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 4);
path.cubicTo(0, 4, 1.66666663f, 4, 2, 7.33333302f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 4);
pathB.cubicTo(1.66666663f, 4, 2, 7.33333302f, 2, 4);
pathB.close();
@@ -4626,11 +4626,11 @@
static void loops30i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 4);
path.cubicTo(0, 4, 1.66666663f, 4, 2, 8);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 4);
pathB.cubicTo(1.66666663f, 4, 2, 8, 2, 4);
pathB.close();
@@ -4639,11 +4639,11 @@
static void loops31i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 5);
path.cubicTo(1, 5, 1.83333337f, 5, 2, 6.66666651f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 5);
pathB.cubicTo(1.83333337f, 5, 2, 6.66666651f, 2, 5);
pathB.close();
@@ -4652,11 +4652,11 @@
static void loops32i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 6);
path.cubicTo(1, 6, 1.83333337f, 6, 2, 8);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 6);
pathB.cubicTo(1.83333337f, 6, 2, 8, 2, 6);
pathB.close();
@@ -4665,11 +4665,11 @@
static void loops33i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 6);
path.cubicTo(1, 2, 7.16666698f, 6.66666698f, -4.66666651f, 7.66666651f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 2);
pathB.cubicTo(7.16666698f, 6.66666698f, -4.66666651f, 7.66666651f, 2, 6);
pathB.close();
@@ -4691,11 +4691,11 @@
// }
pts[5].fY = 6.66666698f + offset;
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(pts[0]);
path.cubicTo(pts[1], pts[2], pts[3]);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(pts[4]);
pathB.cubicTo(pts[5], pts[6], pts[7]);
pathB.close();
@@ -4712,11 +4712,11 @@
static void loops33iAsQuads(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 6);
path.cubicTo(1, 2, 7.16666698f, 6.66666698f, -4.66666651f, 7.66666651f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 2);
pathB.cubicTo(7.16666698f, 6.66666698f, -4.66666651f, 7.66666651f, 2, 6);
pathB.close();
@@ -4728,11 +4728,11 @@
static void loops34i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(3, 4);
path.cubicTo(0, 4, 2.5f, 4, 3, 9);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 4);
pathB.cubicTo(2.5f, 4, 3, 9, 3, 4);
pathB.close();
@@ -4741,11 +4741,11 @@
static void loops35i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(3, 4);
path.cubicTo(0, 4, 2.5f, 4, 3, 10);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 4);
pathB.cubicTo(2.5f, 4, 3, 10, 3, 4);
pathB.close();
@@ -4754,11 +4754,11 @@
static void loops36i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(3, 4);
path.cubicTo(1, 4, 2.66666675f, 4, 3, 8);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 4);
pathB.cubicTo(2.66666675f, 4, 3, 8, 3, 4);
pathB.close();
@@ -4767,11 +4767,11 @@
static void loops37i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 4);
path.cubicTo(1, 4, 1.83333337f, 4, 2, 5.33333349f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 4);
pathB.cubicTo(1.83333337f, 4, 2, 5.33333349f, 2, 4);
pathB.close();
@@ -4780,11 +4780,11 @@
static void loops38i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(3, 4);
path.cubicTo(2, 4, 2.83333325f, 4, 3, 6);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2, 4);
pathB.cubicTo(2.83333325f, 4, 3, 6, 3, 4);
pathB.close();
@@ -4793,11 +4793,11 @@
static void loops39i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(3, 5);
path.cubicTo(0, 5, 2.5f, 5, 3, 10);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 5);
pathB.cubicTo(2.5f, 5, 3, 10, 3, 5);
pathB.close();
@@ -4806,11 +4806,11 @@
static void loops40i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(3, 5);
path.cubicTo(0, 5, 2.5f, 5, 3, 11);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 5);
pathB.cubicTo(2.5f, 5, 3, 11, 3, 5);
pathB.close();
@@ -4819,11 +4819,11 @@
static void loops40iAsQuads(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(3, 5);
path.cubicTo(0, 5, 2.5f, 5, 3, 11);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 5);
pathB.cubicTo(2.5f, 5, 3, 11, 3, 5);
pathB.close();
@@ -4835,11 +4835,11 @@
static void loops44i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 5);
path.cubicTo(0, 1, 7.33333302f, 5.33333349f, -7, 7);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 1);
pathB.cubicTo(7.33333302f, 5.33333349f, -7, 7, 1, 5);
pathB.close();
@@ -4848,11 +4848,11 @@
static void loops45i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 6);
path.cubicTo(0, 2, 7.33333302f, 6.33333302f, -7, 8);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 2);
pathB.cubicTo(7.33333302f, 6.33333302f, -7, 8, 1, 6);
pathB.close();
@@ -4861,11 +4861,11 @@
static void loops46i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 6);
path.cubicTo(1, 2, 8.33333302f, 6.33333302f, -6, 8);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 2);
pathB.cubicTo(8.33333302f, 6.33333302f, -6, 8, 2, 6);
pathB.close();
@@ -4876,11 +4876,11 @@
FAILED: d:\cygwin\puregit\tests\pathopsextendedtest.cpp:346 0 */
static void loops47i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 4);
path.cubicTo(0, 1, 6, 5.83333302f, -4, 8);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 1);
pathB.cubicTo(6, 5.83333302f, -4, 8, 2, 4);
pathB.close();
@@ -4889,11 +4889,11 @@
static void loops48i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 6);
path.cubicTo(0, 1, 9.33333302f, 6.83333302f, -8.33333302f, 9.16666603f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 1);
pathB.cubicTo(9.33333302f, 6.83333302f, -8.33333302f, 9.16666603f, 2, 6);
pathB.close();
@@ -4902,11 +4902,11 @@
static void loops49i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 2);
path.cubicTo(1, 4, -0.166666687f, 2.66666675f, 1.66666675f, 2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 4);
pathB.cubicTo(-0.166666687f, 2.66666675f, 1.66666675f, 2, 0, 2);
pathB.close();
@@ -4915,11 +4915,11 @@
static void loops50i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 3);
path.cubicTo(1, 5, -0.166666687f, 3.66666675f, 1.66666675f, 3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 5);
pathB.cubicTo(-0.166666687f, 3.66666675f, 1.66666675f, 3, 0, 3);
pathB.close();
@@ -4928,11 +4928,11 @@
static void loops51i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 2);
path.cubicTo(2, 4, 0.833333313f, 2.66666675f, 2.66666675f, 2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2, 4);
pathB.cubicTo(0.833333313f, 2.66666675f, 2.66666675f, 2, 1, 2);
pathB.close();
@@ -4941,11 +4941,11 @@
static void loops52i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 3);
path.cubicTo(2, 5, 0.833333313f, 3.66666675f, 2.66666675f, 3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2, 5);
pathB.cubicTo(0.833333313f, 3.66666675f, 2.66666675f, 3, 1, 3);
pathB.close();
@@ -4954,11 +4954,11 @@
static void loops53i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 3);
path.cubicTo(3, 5, 1.83333325f, 3.66666675f, 3.66666651f, 3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(3, 5);
pathB.cubicTo(1.83333325f, 3.66666675f, 3.66666651f, 3, 2, 3);
pathB.close();
@@ -4967,11 +4967,11 @@
static void loops54i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 2);
path.cubicTo(1, 4, 0, 3, 1.66666675f, 2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 4);
pathB.cubicTo(0, 3, 1.66666675f, 2, 0, 2);
pathB.close();
@@ -4980,11 +4980,11 @@
static void loops55i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 3);
path.cubicTo(1, 5, 0, 4, 1.66666675f, 3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 5);
pathB.cubicTo(0, 4, 1.66666675f, 3, 0, 3);
pathB.close();
@@ -4993,11 +4993,11 @@
static void loops56i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 2);
path.cubicTo(2, 4, 0.99999994f, 3, 2.66666675f, 2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2, 4);
pathB.cubicTo(0.99999994f, 3, 2.66666675f, 2, 1, 2);
pathB.close();
@@ -5006,11 +5006,11 @@
static void loops57i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 3);
path.cubicTo(2, 5, 0.99999994f, 4, 2.66666675f, 3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2, 5);
pathB.cubicTo(0.99999994f, 4, 2.66666675f, 3, 1, 3);
pathB.close();
@@ -5019,11 +5019,11 @@
static void loops58i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 3);
path.cubicTo(3, 5, 2, 4, 3.66666651f, 3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(3, 5);
pathB.cubicTo(2, 4, 3.66666651f, 3, 2, 3);
pathB.close();
@@ -5032,11 +5032,11 @@
static void loops58iAsQuads(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 3);
path.cubicTo(3, 5, 2, 4, 3.66666651f, 3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(3, 5);
pathB.cubicTo(2, 4, 3.66666651f, 3, 2, 3);
pathB.close();
@@ -5051,11 +5051,11 @@
static void loops59i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 6);
path.cubicTo(1, 2, 7.33333302f, 1.66666663f, -7.5f, 2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 2);
pathB.cubicTo(7.33333302f, 1.66666663f, -7.5f, 2, 0, 6);
pathB.close();
@@ -5064,11 +5064,11 @@
static void loops59iasQuads(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 6);
path.cubicTo(1, 2, 7.33333302f, 1.66666663f, -7.5f, 2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 2);
pathB.cubicTo(7.33333302f, 1.66666663f, -7.5f, 2, 0, 6);
pathB.close();
@@ -5083,11 +5083,11 @@
static void cubics41d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 1);
path.cubicTo(1, 4, 3, 0, 3, 1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 3);
pathB.cubicTo(1, 3, 1, 0, 4, 1);
pathB.close();
@@ -5096,11 +5096,11 @@
void loops61i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 1);
path.cubicTo(1, 5, -6.33333302f, 0.666666627f, 8, -1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 5);
pathB.cubicTo(-6.33333302f, 0.666666627f, 8, -1, 0, 1);
pathB.close();
@@ -5109,11 +5109,11 @@
static void loops62i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 2);
path.cubicTo(1, 6, -6.33333302f, 1.66666663f, 8, 0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 6);
pathB.cubicTo(-6.33333302f, 1.66666663f, 8, 0, 0, 2);
pathB.close();
@@ -5122,11 +5122,11 @@
static void loops63i(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 1);
path.cubicTo(2, 4, -4, -0.833333254f, 6, -3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2, 4);
pathB.cubicTo(-4, -0.833333254f, 6, -3, 0, 1);
pathB.close();
@@ -5135,11 +5135,11 @@
static void cubics44d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(3, 4);
path.cubicTo(2, 5, 3, 1, 6, 2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 3);
pathB.cubicTo(2, 6, 4, 3, 5, 2);
pathB.close();
@@ -5148,11 +5148,11 @@
static void cubics45u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 3);
path.cubicTo(2, 6, 4, 3, 5, 2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(3, 4);
pathB.cubicTo(2, 5, 3, 1, 6, 2);
pathB.close();
@@ -5175,7 +5175,7 @@
// to produce meaningful results
static void crbug_526025(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x43b40000), SkBits2Float(0xcf000000)); // 360, -2.14748e+09f
path.cubicTo(SkBits2Float(0x4e0d628f), SkBits2Float(0xceffffff), SkBits2Float(0x4e800003), SkBits2Float(0xcec6b143), SkBits2Float(0x4e800002), SkBits2Float(0xce7ffffc)); // 5.93012e+08f, -2.14748e+09f, 1.07374e+09f, -1.66675e+09f, 1.07374e+09f, -1.07374e+09f
path.cubicTo(SkBits2Float(0x4e800002), SkBits2Float(0xcde53aee), SkBits2Float(0x4e0d6292), SkBits2Float(0xc307820e), SkBits2Float(0x44627d00), SkBits2Float(0x437ffff2)); // 1.07374e+09f, -4.80731e+08f, 5.93012e+08f, -135.508f, 905.953f, 256
@@ -5189,7 +5189,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42fe0000), SkBits2Float(0x43a08000)); // 127, 321
path.lineTo(SkBits2Float(0x45d5c000), SkBits2Float(0x43870000)); // 6840, 270
path.lineTo(SkBits2Float(0xd0a00000), SkBits2Float(0x4cbebc20)); // -2.14748e+10f, 1e+08
@@ -5203,7 +5203,7 @@
static void fuzzX_392(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(SkBits2Float(0x41e80000), SkBits2Float(0x43bde212)); // 29, 379.766f
path.lineTo(SkBits2Float(0x41e80000), SkBits2Float(0x43bdc7ef)); // 29, 379.562f
path.conicTo(SkBits2Float(0x42a5861e), SkBits2Float(0x43c61f86), SkBits2Float(0x430b0610), SkBits2Float(0x43c61f86), SkBits2Float(0x3f7d23f3)); // 82.7619f, 396.246f, 139.024f, 396.246f, 0.98883f
@@ -5211,7 +5211,7 @@
path.close();
SkPath path1(path);
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0xc36c7bd8), SkBits2Float(0xc3a31d72)); // -236.484f, -326.23f
path.lineTo(SkBits2Float(0xc367a4ae), SkBits2Float(0xc3a31d72)); // -231.643f, -326.23f
path.lineTo(SkBits2Float(0x430b0610), SkBits2Float(0x43c61f86)); // 139.024f, 396.246f
@@ -5223,7 +5223,7 @@
static void dean2(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f2b74b3), SkBits2Float(0x4154a02b)); // 0.669749f, 13.2891f
path.cubicTo(SkBits2Float(0x3f2b74b3), SkBits2Float(0x4154a02b), SkBits2Float(0x41531912), SkBits2Float(0x3f130322), SkBits2Float(0x4154a02b), SkBits2Float(0x3f2b74b3)); // 0.669749f, 13.2891f, 13.1936f, 0.574267f, 13.2891f, 0.669749f
path.cubicTo(SkBits2Float(0x414a835a), SkBits2Float(0x3ec07ba6), SkBits2Float(0x413fcc0d), SkBits2Float(0x3e193319), SkBits2Float(0x4134a02b), SkBits2Float(0x00000000)); // 12.6571f, 0.375943f, 11.9873f, 0.149609f, 11.2891f, 0
@@ -5232,7 +5232,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f2b74b3), SkBits2Float(0x4154a02b)); // 0.669749f, 13.2891f
path.cubicTo(SkBits2Float(0x3f2b74b3), SkBits2Float(0x4154a02b), SkBits2Float(0x41531912), SkBits2Float(0x3f130322), SkBits2Float(0x4154a02b), SkBits2Float(0x3f2b74b3)); // 0.669749f, 13.2891f, 13.1936f, 0.574267f, 13.2891f, 0.669749f
path.lineTo(SkBits2Float(0x417ab74b), SkBits2Float(0x4154a02b)); // 15.6697f, 13.2891f
@@ -5244,11 +5244,11 @@
static void cubics_d(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 1);
path.cubicTo(3, 5, 1, 0, 3, 0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 1);
pathB.cubicTo(0, 3, 1, 0, 5, 3);
pathB.close();
@@ -5257,11 +5257,11 @@
static void cubics_d2(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 1);
path.cubicTo(2, 5, 2, 0, 2, 1);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 2);
pathB.cubicTo(1, 2, 1, 0, 5, 2);
pathB.close();
@@ -5270,11 +5270,11 @@
static void loops_i1(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 3);
path.cubicTo(0, 4, -0.333333343f, 4.66666651f, 3, 5.83333349f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 4);
pathB.cubicTo(-0.333333343f, 4.66666651f, 3, 5.83333349f, 2, 3);
pathB.close();
@@ -5283,11 +5283,11 @@
static void loops_i2(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 4);
path.cubicTo(0, 5, -0.333333343f, 5.66666651f, 3, 6.83333302f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 5);
pathB.cubicTo(-0.333333343f, 5.66666651f, 3, 6.83333302f, 2, 4);
pathB.close();
@@ -5296,11 +5296,11 @@
static void loops_i3(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(2, 5);
path.cubicTo(0, 6, -0.333333343f, 6.66666651f, 3, 7.83333302f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 6);
pathB.cubicTo(-0.333333343f, 6.66666651f, 3, 7.83333302f, 2, 5);
pathB.close();
@@ -5309,11 +5309,11 @@
static void loops_i4(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(3, 4);
path.cubicTo(1, 5, 0.666666627f, 5.66666651f, 4, 6.83333302f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 5);
pathB.cubicTo(0.666666627f, 5.66666651f, 4, 6.83333302f, 3, 4);
pathB.close();
@@ -5322,11 +5322,11 @@
static void loops_i5(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(3, 5);
path.cubicTo(1, 6, 0.666666627f, 6.66666651f, 4, 7.83333302f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 6);
pathB.cubicTo(0.666666627f, 6.66666651f, 4, 7.83333302f, 3, 5);
pathB.close();
@@ -5335,11 +5335,11 @@
static void loops_i6(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(4, 5);
path.cubicTo(2, 6, 1.66666663f, 6.66666651f, 5, 7.83333302f);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2, 6);
pathB.cubicTo(1.66666663f, 6.66666651f, 5, 7.83333302f, 4, 5);
pathB.close();
@@ -5348,11 +5348,11 @@
static void cubics_d3(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(3, 4);
path.cubicTo(0, 6, 6, 1, 4, 2);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1, 6);
pathB.cubicTo(2, 4, 4, 3, 6, 0);
pathB.close();
@@ -5361,11 +5361,11 @@
static void cubics_o(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(1, 4);
path.cubicTo(2, 6, 5, 0, 5, 3);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 5);
pathB.cubicTo(3, 5, 4, 1, 6, 2);
pathB.close();
@@ -5374,11 +5374,11 @@
static void cubicOp158(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0,1);
path.cubicTo(2,4, 2,0, 2,0);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0,2);
pathB.cubicTo(0,2, 1,0, 4,2);
pathB.close();
@@ -5398,9 +5398,9 @@
static void circlesOp4(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.addCircle(0, 1, 5, SkPathDirection::kCW);
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.addCircle(0, 1, 0, SkPathDirection::kCW);
testPathOp(reporter, path, pathB, kDifference_SkPathOp, filename);
}
@@ -5435,7 +5435,7 @@
static void seanbug(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(SkBits2Float(0x45b56000), SkBits2Float(0x45bca000)); // 5804, 6036
path.lineTo(SkBits2Float(0x45b55f0a), SkBits2Float(0x45bc9fc0)); // 5803.88f, 6035.97f
path.lineTo(SkBits2Float(0x45b55e15), SkBits2Float(0x45bc9f7b)); // 5803.76f, 6035.94f
@@ -5715,7 +5715,7 @@
path.close();
SkPath path2;
- path2.setFillType(SkPathFillType::kWinding);
+ path2.setFillType(SkPath::kWinding_FillType);
path2.moveTo(SkBits2Float(0x45b52600), SkBits2Float(0x45ba7c62)); // 5796.75f, 5967.55f
path2.lineTo(SkBits2Float(0x45c7dc6b), SkBits2Float(0x45ba7c62)); // 6395.55f, 5967.55f
path2.lineTo(SkBits2Float(0x45c7dc6b), SkBits2Float(0x45bca239)); // 6395.55f, 6036.28f
@@ -5729,16 +5729,16 @@
static void halbug(skiatest::Reporter* reporter, const char* filename) {
SkPath path, path2;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(SkRect{278.653992f, 155.747406f, 580.15918f, 593.602051f});
- path2.setFillType(SkPathFillType::kWinding);
+ path2.setFillType(SkPath::kWinding_FillType);
path2.addRect(SkRect{278.657715f, 155.747314f, 580.238281f, 594.114014f});
testPathOp(reporter, path, path2, kIntersect_SkPathOp, filename);
}
static void testRect1_u(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 0);
path.lineTo(0, 60);
path.lineTo(60, 60);
@@ -5754,13 +5754,13 @@
path.lineTo(36, 30);
path.lineTo(36, 20);
path.close();
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
testPathOp(reporter, path, pathB, kUnion_SkPathOp, filename);
}
static void filinmangust14(skiatest::Reporter* reporter, const char* filename) {
SkPath path, path1;
-path.setFillType(SkPathFillType::kWinding);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x440bc02c), SkBits2Float(0x4409c000)); // 559.003f, 551
path.lineTo(SkBits2Float(0x440bc02c), SkBits2Float(0x440e8000)); // 559.003f, 570
path.lineTo(SkBits2Float(0x440bbfda), SkBits2Float(0x440e8000)); // 558.998f, 570
@@ -5769,7 +5769,7 @@
path.close();
path1 = path;
path.reset();
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x45582000), SkBits2Float(0x45be9805)); // 3458, 6099
path.lineTo(SkBits2Float(0x4554b667), SkBits2Float(0x45be9805)); // 3403.4f, 6099
path.lineTo(SkBits2Float(0x4554b667), SkBits2Float(0x45be97fb)); // 3403.4f, 6099
@@ -5805,7 +5805,7 @@
static void grshapearcs1(skiatest::Reporter* reporter, const char* filename) {
SkPath path, path1;
-path.setFillType(SkPathFillType::kWinding);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(25.0098f, 23.1973f);
path.lineTo(25.5689f, 22.3682f);
path.conicTo(26.1281f, 21.5392f, 26.9572f, 22.0984f, 0.707107f);
@@ -7377,7 +7377,7 @@
path.close();
path1 = path;
path.reset();
-path.setFillType(SkPathFillType::kWinding);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(25.0098f, 23.1973f);
path.lineTo(25.5689f, 22.3682f);
path.conicTo(26.1281f, 21.5392f, 26.9572f, 22.0984f, 0.707107f);
@@ -8952,15 +8952,15 @@
static void op_1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
-path.setFillType(SkPathFillType::kWinding);
+ path.setFillType((SkPath::FillType) 0);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x15e80300), SkBits2Float(0x400004dc)); // 9.37088e-26f, 2.0003f
path.quadTo(SkBits2Float(0xe56c206c), SkBits2Float(0x646c5f40), SkBits2Float(0x6c80885e), SkBits2Float(0xb4bc576c)); // -6.96923e+22f, 1.74412e+22f, 1.24309e+27f, -3.50813e-07f
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
-path.setFillType(SkPathFillType::kWinding);
+ path.setFillType((SkPath::FillType) 0);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x1b000010), SkBits2Float(0x6e5a5a1b)); // 1.05879e-22f, 1.68942e+28f
path.quadTo(SkBits2Float(0xef646464), SkBits2Float(0xefefefef), SkBits2Float(0x000000ef), SkBits2Float(0x1bb4bc00)); // -7.06839e+28f, -1.48514e+29f, 3.3491e-43f, 2.99e-22f
@@ -8971,8 +8971,8 @@
static void op_2(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
-path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType((SkPath::FillType) 1);
+path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(SkBits2Float(0xeee3ef57), SkBits2Float(0xef6300f8)); // -3.52712e+28f, -7.02543e+28f
path.quadTo(SkBits2Float(0xeeee9c6e), SkBits2Float(0xef609993), SkBits2Float(0x00000000), SkBits2Float(0x6e5a5a1b)); // -3.69233e+28f, -6.95103e+28f, 0, 1.68942e+28f
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
@@ -8983,8 +8983,8 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
-path.setFillType(SkPathFillType::kWinding);
+ path.setFillType((SkPath::FillType) 0);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.lineTo(SkBits2Float(0x1b1b1b00), SkBits2Float(0x1b5a5a1b)); // 1.283e-22f, 1.80617e-22f
@@ -8995,8 +8995,8 @@
static void op_3(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
-path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType((SkPath::FillType) 1);
+path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x6e5a5a1b)); // 0, 1.68942e+28f
path.quadTo(SkBits2Float(0xeeee9c6e), SkBits2Float(0xef609993), SkBits2Float(0xeee3ef57), SkBits2Float(0xef6300f8)); // -3.69233e+28f, -6.95103e+28f, -3.52712e+28f, -7.02543e+28f
path.quadTo(SkBits2Float(0xeeda2c5a), SkBits2Float(0xef6533a7), SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // -3.37607e+28f, -7.09345e+28f, 0, 0
@@ -9010,8 +9010,8 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
-path.setFillType(SkPathFillType::kWinding);
+ path.setFillType((SkPath::FillType) 0);
+path.setFillType(SkPath::kWinding_FillType);
SkPath path2(path);
testPathOpFuzz(reporter, path1, path2, (SkPathOp) 0, filename);
@@ -9020,7 +9020,7 @@
static void op_4(skiatest::Reporter* reporter, const char* filename) {
SkPath patha, pathb;
- patha.setFillType(SkPathFillType::kEvenOdd);
+ patha.setFillType(SkPath::kEvenOdd_FillType);
patha.moveTo(SkBits2Float(0x40d7ea90), SkBits2Float(0x3fa58930)); // 6.74738f, 1.29325f
patha.lineTo(SkBits2Float(0x40ad3d93), SkBits2Float(0x3fa58930)); // 5.41377f, 1.29325f
patha.lineTo(SkBits2Float(0x40ad3d93), SkBits2Float(0x3edba819)); // 5.41377f, 0.429017f
@@ -9030,7 +9030,7 @@
patha.lineTo(SkBits2Float(0x40d7ea90), SkBits2Float(0x3fa58930)); // 6.74738f, 1.29325f
patha.close();
- pathb.setFillType(SkPathFillType::kEvenOdd);
+ pathb.setFillType(SkPath::kEvenOdd_FillType);
pathb.moveTo(SkBits2Float(0x40d7ea89), SkBits2Float(0x409a721d)); // 6.74738f, 4.82643f
pathb.lineTo(SkBits2Float(0x411a9d73), SkBits2Float(0x409a721d)); // 9.66344f, 4.82643f
pathb.lineTo(SkBits2Float(0x411a9d73), SkBits2Float(0x3f3b7c9a)); // 9.66344f, 0.73237f
@@ -9081,7 +9081,7 @@
static void bug8380(skiatest::Reporter* reporter, const char* filename) {
SkPath path, path2;
-path.setFillType(SkPathFillType::kEvenOdd);
+path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(SkBits2Float(0xa6800000), SkBits2Float(0x43b0f22d)); // -8.88178e-16f, 353.892f
path.lineTo(SkBits2Float(0x42fc0000), SkBits2Float(0x4116566d)); // 126, 9.3961f
path.cubicTo(SkBits2Float(0x42fb439d), SkBits2Float(0x4114bbc7), SkBits2Float(0x42fa3ed7), SkBits2Float(0x411565bd), SkBits2Float(0x42f934d2), SkBits2Float(0x4116131e)); // 125.632f, 9.29584f, 125.123f, 9.33734f, 124.603f, 9.37967f
@@ -9092,7 +9092,7 @@
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0x43b0f22d)); // 0, 353.892f
path.lineTo(SkBits2Float(0xa6800000), SkBits2Float(0x43b0f22d)); // -8.88178e-16f, 353.892f
path.close();
-path2.setFillType(SkPathFillType::kEvenOdd);
+path2.setFillType(SkPath::kEvenOdd_FillType);
path2.moveTo(SkBits2Float(0x4102c0ec), SkBits2Float(0x42d06d0e)); // 8.1721f, 104.213f
path2.lineTo(SkBits2Float(0xc0ba5a1d), SkBits2Float(0x43b8e831)); // -5.8235f, 369.814f
path2.lineTo(SkBits2Float(0x42fc0000), SkBits2Float(0x411656d6)); // 126, 9.3962f
@@ -9612,9 +9612,9 @@
static void fuzz535151(skiatest::Reporter* reporter, const char* filename) {
SkPath one;
- one.setFillType(SkPathFillType::kWinding);
+ one.setFillType(SkPath::kWinding_FillType);
SkPath two;
- two.setFillType(SkPathFillType::kWinding);
+ two.setFillType(SkPath::kWinding_FillType);
two.moveTo(0, 0);
two.lineTo(0, 50);
two.lineTo(4.29497e+09f, 50);
@@ -9652,7 +9652,7 @@
static void fuzz433b(skiatest::Reporter* reporter, const char* filename) {
SkPath path1, path2;
- path1.setFillType(SkPathFillType::kEvenOdd);
+ path1.setFillType(SkPath::kEvenOdd_FillType);
path1.moveTo(140, 40);
path1.lineTo(200, 210);
path1.lineTo(40, 100);
@@ -9661,7 +9661,7 @@
path1.lineTo(140, 40);
path1.close();
- path1.setFillType(SkPathFillType::kWinding);
+ path1.setFillType(SkPath::kWinding_FillType);
path2.moveTo(190, 60);
path2.lineTo(250, 230);
path2.lineTo(90, 120);
@@ -9675,7 +9675,7 @@
static void fuzz487a(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x432c8000), SkBits2Float(0x42c00000));
path.lineTo(SkBits2Float(0x4309999a), SkBits2Float(0x42c00000));
path.cubicTo(SkBits2Float(0x4309999a), SkBits2Float(0x429a6666), SkBits2Float(0x42f9999a), SkBits2Float(0x4275999a), SkBits2Float(0x42d70001), SkBits2Float(0x42633333));
@@ -9694,7 +9694,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x432c8000), SkBits2Float(0x42c00000));
path.lineTo(SkBits2Float(0x4309999a), SkBits2Float(0x42c00000));
path.cubicTo(SkBits2Float(0x4309999a), SkBits2Float(0x42a20000), SkBits2Float(0x43016667), SkBits2Float(0x4287cccd), SkBits2Float(0x42ea999a), SkBits2Float(0x4273999a));
@@ -9721,7 +9721,7 @@
static void fuzz487b(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x432c8000), SkBits2Float(0x42c00000));
path.lineTo(SkBits2Float(0x4309999a), SkBits2Float(0x42c00000));
path.cubicTo(SkBits2Float(0x4309999a), SkBits2Float(0x429a6666), SkBits2Float(0x42f9999a), SkBits2Float(0x4275999a), SkBits2Float(0x42d70001), SkBits2Float(0x42633333));
@@ -9740,7 +9740,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x432c8000), SkBits2Float(0x42c00000));
path.lineTo(SkBits2Float(0x4309999a), SkBits2Float(0x42c00000));
path.cubicTo(SkBits2Float(0x4309999a), SkBits2Float(0x42a20000), SkBits2Float(0x43016667), SkBits2Float(0x4287cccd), SkBits2Float(0x42ea999a), SkBits2Float(0x4273999a));
@@ -9767,7 +9767,7 @@
static void fuzz714(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x430c0000), SkBits2Float(0x42200000));
path.lineTo(SkBits2Float(0x43480000), SkBits2Float(0x43520000));
path.lineTo(SkBits2Float(0x42200000), SkBits2Float(0x42c80000));
@@ -9778,7 +9778,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43200000), SkBits2Float(0x42700000));
path.lineTo(SkBits2Float(0x435c0000), SkBits2Float(0x43660000));
path.lineTo(SkBits2Float(0x42700000), SkBits2Float(0x42f00000));
@@ -9793,7 +9793,7 @@
static void fuzz1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x7f800000), SkBits2Float(0x7f800000));
path.quadTo(SkBits2Float(0x7f800000), SkBits2Float(0x7f800000), SkBits2Float(0x7f800000), SkBits2Float(0x7f800000));
path.quadTo(SkBits2Float(0x7f800000), SkBits2Float(0x7f800000), SkBits2Float(0x7f800000), SkBits2Float(0x7f800000));
@@ -9807,7 +9807,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path2(path);
testPathOpFuzz(reporter, path1, path2, (SkPathOp) 2, filename);
@@ -9816,7 +9816,7 @@
static void fuzz753_91(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42910000), SkBits2Float(0x00000000)); // 72.5f, 0
path.lineTo(SkBits2Float(0x42166668), SkBits2Float(0x00000000)); // 37.6f, 0
path.cubicTo(SkBits2Float(0x42166668), SkBits2Float(0xc1966668), SkBits2Float(0x41c66668), SkBits2Float(0xc20a6666), SkBits2Float(0x40f00010), SkBits2Float(0xc21ccccd)); // 37.6f, -18.8f, 24.8f, -34.6f, 7.50001f, -39.2f
@@ -9826,7 +9826,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x428bf702), SkBits2Float(0xcf223cbf)); // 69.9824f, -2.72189e+09f
path.lineTo(SkBits2Float(0x42112d68), SkBits2Float(0xcf223cbf)); // 36.2943f, -2.72189e+09f
path.cubicTo(SkBits2Float(0x4220d9fc), SkBits2Float(0xcf223cc0), SkBits2Float(0x420ee118), SkBits2Float(0xcf223cc0), SkBits2Float(0x41cef2f8), SkBits2Float(0xcf223cc0)); // 40.2129f, -2.72189e+09f, 35.7198f, -2.72189e+09f, 25.8686f, -2.72189e+09f
@@ -9840,7 +9840,7 @@
static void bug597926_0(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
-path.setFillType((SkPathFillType) 0);
+path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43b38000), SkBits2Float(0x433e0000)); // 359, 190
path.lineTo(SkBits2Float(0x40c00000), SkBits2Float(0x449ce000)); // 6, 1255
path.cubicTo(SkBits2Float(0x438c0000), SkBits2Float(0x4497a000), SkBits2Float(0x43e40000), SkBits2Float(0x44750000), SkBits2Float(0x41000000), SkBits2Float(0x44aa2000)); // 280, 1213, 456, 980, 8, 1361
@@ -9851,7 +9851,7 @@
path.quadTo(SkBits2Float(0x43948000), SkBits2Float(0x42ac0000), SkBits2Float(0x43880000), SkBits2Float(0x4487e000)); // 297, 86, 272, 1087
SkPath path1(path);
path.reset();
-path.setFillType((SkPathFillType) 0);
+path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0xc51d735c), SkBits2Float(0xc49db029)); // -2519.21f, -1261.51f
path.cubicTo(SkBits2Float(0xc51d1dbd), SkBits2Float(0xc49d7a3f), SkBits2Float(0xc51c524a), SkBits2Float(0xc49d1610), SkBits2Float(0xc51d1a96), SkBits2Float(0xc49d86a6)); // -2513.86f, -1259.82f, -2501.14f, -1256.69f, -2513.66f, -1260.21f
path.cubicTo(SkBits2Float(0xc51cd471), SkBits2Float(0xc49d54d0), SkBits2Float(0xc51c2e51), SkBits2Float(0xc49d0081), SkBits2Float(0xc51d197b), SkBits2Float(0xc49d7927)); // -2509.28f, -1258.65f, -2498.89f, -1256.02f, -2513.59f, -1259.79f
@@ -9882,7 +9882,7 @@
static void fuzz1450_1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
-path.setFillType(SkPathFillType::kEvenOdd);
+path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(SkBits2Float(0x4e800002), SkBits2Float(0xce7ffffe)); // 1.07374e+09f, -1.07374e+09f
path.conicTo(SkBits2Float(0x4e800002), SkBits2Float(0xcf000000), SkBits2Float(0x43b40000), SkBits2Float(0xcf000000), SkBits2Float(0x3f3504f4)); // 1.07374e+09f, -2.14748e+09f, 360, -2.14748e+09f, 0.707107f
path.lineTo(SkBits2Float(0x43348000), SkBits2Float(0x43800001)); // 180.5f, 256
@@ -9911,11 +9911,11 @@
static void fuzz763_9(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.conicTo(SkBits2Float(0x2a8c555b), SkBits2Float(0x081f2a21), SkBits2Float(0x7bc00321), SkBits2Float(0xed7a6a4b), SkBits2Float(0x1f212a8c)); // 2.49282e-13f, 4.78968e-34f, 1.99397e+36f, -4.84373e+27f, 3.41283e-20f
path.lineTo(SkBits2Float(0x7bc00321), SkBits2Float(0xed7a6a4b)); // 1.99397e+36f, -4.84373e+27f
@@ -9939,11 +9939,11 @@
static void fuzz763_4(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.lineTo(SkBits2Float(0x555b3a2d), SkBits2Float(0x2a212a8c)); // 1.50652e+13f, 1.43144e-13f
path.conicTo(SkBits2Float(0xc0032108), SkBits2Float(0x7a6a4b7b), SkBits2Float(0x212a8ced), SkBits2Float(0x0321081f), SkBits2Float(0x6a3a7bc0)); // -2.04889f, 3.04132e+35f, 5.77848e-19f, 4.7323e-37f, 5.63611e+25f
@@ -9972,11 +9972,11 @@
static void fuzz763_3(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.lineTo(SkBits2Float(0x555b292d), SkBits2Float(0x2a212a8c)); // 1.50606e+13f, 1.43144e-13f
path.conicTo(SkBits2Float(0xc0032108), SkBits2Float(0x7a6a4b7b), SkBits2Float(0x212a8ced), SkBits2Float(0x295b2d1f), SkBits2Float(0x29685568)); // -2.04889f, 3.04132e+35f, 5.77848e-19f, 4.86669e-14f, 5.15884e-14f
@@ -10007,11 +10007,11 @@
static void fuzz763_5(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x5b292d55), SkBits2Float(0x2a2a8c55)); // 4.76191e+16f, 1.51477e-13f
path.conicTo(SkBits2Float(0xc0032108), SkBits2Float(0x7a6a4b79), SkBits2Float(0x212a8ced), SkBits2Float(0x0321081f), SkBits2Float(0x6a3a7bc0)); // -2.04889f, 3.04132e+35f, 5.77848e-19f, 4.7323e-37f, 5.63611e+25f
path.conicTo(SkBits2Float(0x3a2147ed), SkBits2Float(0xdf28282a), SkBits2Float(0x3a8a3a21), SkBits2Float(0x8a284f9a), SkBits2Float(0x3ac23ab3)); // 0.000615238f, -1.2117e+19f, 0.00105459f, -8.10388e-33f, 0.00148185f
@@ -10032,11 +10032,11 @@
static void fuzz763_2(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.lineTo(SkBits2Float(0x555b292d), SkBits2Float(0x2a212a8c)); // 1.50606e+13f, 1.43144e-13f
path.conicTo(SkBits2Float(0xc0032108), SkBits2Float(0x7a6a4b7b), SkBits2Float(0x212a8ced), SkBits2Float(0x0321081f), SkBits2Float(0x6a3a7bc0)); // -2.04889f, 3.04132e+35f, 5.77848e-19f, 4.7323e-37f, 5.63611e+25f
@@ -10072,11 +10072,11 @@
// crbug.com/626164
static void fuzz763_1c(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.cubicTo(SkBits2Float(0x1931204a), SkBits2Float(0x2ba1a14a), SkBits2Float(0x4a4a08ff), SkBits2Float(0x4a4a08ff), SkBits2Float(0x4a4a4a34), SkBits2Float(0x4a4a4a4a)); // 9.15721e-24f, 1.14845e-12f, 3.31014e+06f, 3.31014e+06f, 3.31432e+06f, 3.31432e+06f
path.moveTo(SkBits2Float(0x000010a1), SkBits2Float(0x19312000)); // 5.96533e-42f, 9.15715e-24f
@@ -10091,7 +10091,7 @@
// crbug.com/626186
static void fuzz763_1b(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.cubicTo(SkBits2Float(0x0000ff07), SkBits2Float(0xf9f9ff00), SkBits2Float(0xfe0ef9f4), SkBits2Float(0xd9b105fb), SkBits2Float(0x000000f9), SkBits2Float(0xfe11f901)); // 9.14866e-41f, -1.62257e+35f, -4.75121e+37f, -6.22846e+15f, 3.48923e-43f, -4.85077e+37f
path.lineTo(SkBits2Float(0xda1905ed), SkBits2Float(0x3c05fbfb)); // -1.0768e+16f, 0.00817775f
@@ -10099,7 +10099,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.quadTo(SkBits2Float(0x3c3c3c3c), SkBits2Float(0xfa253c3c), SkBits2Float(0xfefa00d3), SkBits2Float(0x25fad9df)); // 0.011489f, -2.14488e+35f, -1.66156e+38f, 4.35157e-16f
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
@@ -10114,13 +10114,13 @@
static void fuzz763_1a(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.cubicTo(SkBits2Float(0x154be880), SkBits2Float(0x80000640), SkBits2Float(0x5559a419), SkBits2Float(0x59d55928), SkBits2Float(0x80045959), SkBits2Float(0x40154be8)); // 4.11789e-26f, -2.24208e-42f, 1.49562e+13f, 7.50652e+15f, -3.99394e-40f, 2.33276f
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.quadTo(SkBits2Float(0x5559a419), SkBits2Float(0x59d55928), SkBits2Float(0xbd595959), SkBits2Float(0x3f3f3f09)); // 1.49562e+13f, 7.50652e+15f, -0.0530637f, 0.747056f
path.moveTo(SkBits2Float(0x3f3f3f3f), SkBits2Float(0x3f3f3f3f)); // 0.747059f, 0.747059f
@@ -10142,11 +10142,11 @@
// crbug.com/627780
static void fuzz763_3a(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.lineTo(SkBits2Float(0x555b292d), SkBits2Float(0x2a212a8c)); // 1.50606e+13f, 1.43144e-13f
path.conicTo(SkBits2Float(0xc0032108), SkBits2Float(0x7a6a4b7b), SkBits2Float(0x212a8ced), SkBits2Float(0x0321081f), SkBits2Float(0x6a3a7bc0)); // -2.04889f, 3.04132e+35f, 5.77848e-19f, 4.7323e-37f, 5.63611e+25f
@@ -10163,7 +10163,7 @@
// crbug.com/627689
static void fuzz763_5a(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x38bd8610), SkBits2Float(0x00000000)); // 9.03719e-05f, 0
path.conicTo(SkBits2Float(0x4183d871), SkBits2Float(0x41fea321), SkBits2Float(0xb700ff00), SkBits2Float(0x4240b8b8), SkBits2Float(0x3b058283)); // 16.4807f, 31.8297f, -7.68877e-06f, 48.1804f, 0.0020372f
path.lineTo(SkBits2Float(0x3a3a3ab8), SkBits2Float(0xb8b8b8b8)); // 0.000710409f, -8.80821e-05f
@@ -10178,7 +10178,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path2(path);
testPathOpFuzz(reporter, path1, path2, (SkPathOp) 4, filename);
@@ -10187,11 +10187,11 @@
// crbug.com/627401
static void fuzz763_2a(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.quadTo(SkBits2Float(0x3e484500), SkBits2Float(0x164f3a30), SkBits2Float(0x49484801), SkBits2Float(0x7d0100c8)); // 0.195576f, 1.67397e-25f, 820352, 1.07172e+37f
path.conicTo(SkBits2Float(0xff7f36fd), SkBits2Float(0x3e647d01), SkBits2Float(0x0c00f430), SkBits2Float(0x486b6448), SkBits2Float(0x00484848)); // -3.39239e+38f, 0.223133f, 9.93424e-32f, 241041, 6.63809e-39f
@@ -10207,11 +10207,11 @@
// crbug.com/627761
static void fuzz763_2b(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x5b292d55), SkBits2Float(0x212a8c55)); // 4.76191e+16f, 5.7784e-19f
path.moveTo(SkBits2Float(0x3b21081f), SkBits2Float(0x4b7bc003)); // 0.00245715f, 1.64987e+07f
path.lineTo(SkBits2Float(0x2a8ced7a), SkBits2Float(0x21081f21)); // 2.50338e-13f, 4.61198e-19f
@@ -10254,7 +10254,7 @@
static void fuzz763_2c(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x36344a4a)); // 0, 2.68653e-06f
path.cubicTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000), SkBits2Float(0x364a4a4a), SkBits2Float(0x364a4a4a), SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0, 3.01436e-06f, 3.01436e-06f, 0, 0
@@ -10267,7 +10267,7 @@
path.close();
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.cubicTo(SkBits2Float(0x1931204a), SkBits2Float(0x2ba1a14a), SkBits2Float(0x4a4a08ff), SkBits2Float(0x4a4a08ff), SkBits2Float(0x4a4a4a34), SkBits2Float(0x4a4a4a4a)); // 9.15721e-24f, 1.14845e-12f, 3.31014e+06f, 3.31014e+06f, 3.31432e+06f, 3.31432e+06f
path.moveTo(SkBits2Float(0x000010a1), SkBits2Float(0x19312000)); // 5.96533e-42f, 9.15715e-24f
@@ -10279,7 +10279,7 @@
static void fuzz763_6(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x6a2a291f)); // 0, 5.14279e+25f
path.cubicTo(SkBits2Float(0x68295b2d), SkBits2Float(0x00000000), SkBits2Float(0x00000000), SkBits2Float(0x00000000), SkBits2Float(0x00000000), SkBits2Float(0x68556829)); // 3.19905e+24f, 0, 0, 0, 0, 4.03114e+24f
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0x68555b2a)); // 0, 4.03018e+24f
@@ -10295,7 +10295,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3ac23a55), SkBits2Float(0x2a292827)); // 0.00148184f, 1.50241e-13f
path.lineTo(SkBits2Float(0x63962be6), SkBits2Float(0x272a812a)); // 5.54035e+21f, 2.36623e-15f
@@ -10305,11 +10305,11 @@
static void fuzz763_7(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x68556829), SkBits2Float(0x555b2d29)); // 4.03114e+24f, 1.50617e+13f
path.moveTo(SkBits2Float(0x0f2a312a), SkBits2Float(0xc0032108)); // 8.39112e-30f, -2.04889f
path.cubicTo(SkBits2Float(0x68392d55), SkBits2Float(0xf05b684b), SkBits2Float(0x8c55272d), SkBits2Float(0x212a1f2a), SkBits2Float(0x0321082a), SkBits2Float(0x6a4b7bc0)); // 3.4979e+24f, -2.71613e+29f, -1.64207e-31f, 5.76395e-19f, 4.7323e-37f, 6.14991e+25f
@@ -10392,7 +10392,7 @@
static void fuzz763_10(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x68556829)); // 0, 4.03114e+24f
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.quadTo(SkBits2Float(0x6a4b7bc0), SkBits2Float(0x00000000), SkBits2Float(0x00000000), SkBits2Float(0x6a4b7bc4)); // 6.14991e+25f, 0, 0, 6.14991e+25f
@@ -10401,7 +10401,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.lineTo(SkBits2Float(0x5b2d2968), SkBits2Float(0x2a8c8f55)); // 4.87407e+16f, 2.49685e-13f
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
@@ -10435,11 +10435,11 @@
static void fuzz763_11(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x68556829), SkBits2Float(0x555b2d29)); // 4.03114e+24f, 1.50617e+13f
path.moveTo(SkBits2Float(0x2a0f312a), SkBits2Float(0xc0032108)); // 1.2718e-13f, -2.04889f
path.cubicTo(SkBits2Float(0x68392d55), SkBits2Float(0xf05b684b), SkBits2Float(0x8c55272d), SkBits2Float(0x212a1f2a), SkBits2Float(0x0321082a), SkBits2Float(0x6a4b7bc0)); // 3.4979e+24f, -2.71613e+29f, -1.64207e-31f, 5.76395e-19f, 4.7323e-37f, 6.14991e+25f
@@ -10486,7 +10486,7 @@
static void fuzz763_12(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0x6a29082a)); // 0, 5.10868e+25f
path.conicTo(SkBits2Float(0x6a295ac3), SkBits2Float(0x61bb988e), SkBits2Float(0x6829682d), SkBits2Float(0x5f3ba76a), SkBits2Float(0x42730a87)); // 5.11843e+25f, 4.32567e+20f, 3.20001e+24f, 1.35219e+19f, 60.7603f
@@ -10502,7 +10502,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.conicTo(SkBits2Float(0x21081f21), SkBits2Float(0x4b7bc003), SkBits2Float(0xed237a6a), SkBits2Float(0x2d682967), SkBits2Float(0x2a8c555b)); // 4.61198e-19f, 1.64987e+07f, -3.16213e+27f, 1.31969e-11f, 2.49282e-13f
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
@@ -10524,11 +10524,11 @@
static void fuzz763_13(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x212a8c55), SkBits2Float(0x21081f2a)); // 5.7784e-19f, 4.61198e-19f
path.conicTo(SkBits2Float(0x6a4b7bc0), SkBits2Float(0x4793ed7a), SkBits2Float(0x282a3a21), SkBits2Float(0x3adf2128), SkBits2Float(0x4f1a3a8a)); // 6.14991e+25f, 75739, 9.4495e-15f, 0.00170234f, 2.58753e+09f
path.lineTo(SkBits2Float(0x212a8c55), SkBits2Float(0x21081f2a)); // 5.7784e-19f, 4.61198e-19f
@@ -10560,11 +10560,11 @@
static void fuzz763_14(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x68556829), SkBits2Float(0xf45b2d29)); // 4.03114e+24f, -6.94598e+31f
path.moveTo(SkBits2Float(0x1f2a302a), SkBits2Float(0xc8032108)); // 3.60387e-20f, -134276
path.cubicTo(SkBits2Float(0x68392d55), SkBits2Float(0xf0db684b), SkBits2Float(0x8c55272d), SkBits2Float(0x212a292a), SkBits2Float(0x302a5b25), SkBits2Float(0xf0685568)); // 3.4979e+24f, -5.43226e+29f, -1.64207e-31f, 5.76527e-19f, 6.19752e-10f, -2.87615e+29f
@@ -10575,11 +10575,11 @@
static void fuzz763_15(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x5b292d55), SkBits2Float(0x212a8c55)); // 4.76191e+16f, 5.7784e-19f
path.moveTo(SkBits2Float(0x0321081f), SkBits2Float(0x6a6b7bc4)); // 4.7323e-37f, 7.11705e+25f
path.conicTo(SkBits2Float(0x212a8ced), SkBits2Float(0x0321081f), SkBits2Float(0x2c6829c0), SkBits2Float(0x2a8c555b), SkBits2Float(0x081f2a29)); // 5.77848e-19f, 4.7323e-37f, 3.29924e-12f, 2.49282e-13f, 4.78969e-34f
@@ -10630,11 +10630,11 @@
static void fuzz763_16(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x68556829), SkBits2Float(0x555b2d29)); // 4.03114e+24f, 1.50617e+13f
path.moveTo(SkBits2Float(0x1f2a312a), SkBits2Float(0xc0032108)); // 3.60396e-20f, -2.04889f
path.cubicTo(SkBits2Float(0x68372d55), SkBits2Float(0xf05b684b), SkBits2Float(0x8c552775), SkBits2Float(0x212a292a), SkBits2Float(0x0321082a), SkBits2Float(0x6a4b7bc0)); // 3.46012e+24f, -2.71613e+29f, -1.64208e-31f, 5.76527e-19f, 4.7323e-37f, 6.14991e+25f
@@ -10685,11 +10685,11 @@
static void fuzz763_17(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x68556829), SkBits2Float(0x555b2d29)); // 4.03114e+24f, 1.50617e+13f
path.moveTo(SkBits2Float(0x1f2a312a), SkBits2Float(0xc0032108)); // 3.60396e-20f, -2.04889f
path.cubicTo(SkBits2Float(0x68392d55), SkBits2Float(0xf05b684b), SkBits2Float(0x8c55272d), SkBits2Float(0x212a292a), SkBits2Float(0x0321082a), SkBits2Float(0x6a4b7bc0)); // 3.4979e+24f, -2.71613e+29f, -1.64207e-31f, 5.76527e-19f, 4.7323e-37f, 6.14991e+25f
@@ -10737,11 +10737,11 @@
static void fuzz763_18(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x68556829), SkBits2Float(0x555b2d29)); // 4.03114e+24f, 1.50617e+13f
path.moveTo(SkBits2Float(0x1f2a312a), SkBits2Float(0xc0032108)); // 3.60396e-20f, -2.04889f
path.cubicTo(SkBits2Float(0x68392d55), SkBits2Float(0xf05b684b), SkBits2Float(0x8c55272d), SkBits2Float(0x212a292a), SkBits2Float(0x0321082a), SkBits2Float(0x6a4b7bc0)); // 3.4979e+24f, -2.71613e+29f, -1.64207e-31f, 5.76527e-19f, 4.7323e-37f, 6.14991e+25f
@@ -10788,11 +10788,11 @@
static void fuzz763_19(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x21081f21), SkBits2Float(0x4b7bc003)); // 4.61198e-19f, 1.64987e+07f
path.lineTo(SkBits2Float(0x2829ed84), SkBits2Float(0x69555b2d)); // 9.43289e-15f, 1.61207e+25f
path.moveTo(SkBits2Float(0x68305b2d), SkBits2Float(0xf0682955)); // 3.33127e+24f, -2.87402e+29f
@@ -10838,11 +10838,11 @@
static void fuzz763_20(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x68556829), SkBits2Float(0x555b2d29)); // 4.03114e+24f, 1.50617e+13f
path.moveTo(SkBits2Float(0x1f2a312a), SkBits2Float(0xc0032108)); // 3.60396e-20f, -2.04889f
path.cubicTo(SkBits2Float(0x68392d55), SkBits2Float(0xf05b684b), SkBits2Float(0x8c55272d), SkBits2Float(0x212a292a), SkBits2Float(0x0321082a), SkBits2Float(0x6a4b7bc0)); // 3.4979e+24f, -2.71613e+29f, -1.64207e-31f, 5.76527e-19f, 4.7323e-37f, 6.14991e+25f
@@ -10896,7 +10896,7 @@
static void fuzz763_21(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x6828c6f9), SkBits2Float(0x6614dc9e)); // 3.18811e+24f, 1.75745e+23f
path.cubicTo(SkBits2Float(0x68303469), SkBits2Float(0x661f92fc), SkBits2Float(0x6837d3c3), SkBits2Float(0x662b0eb2), SkBits2Float(0x683fa268), SkBits2Float(0x663759e1)); // 3.32841e+24f, 1.88392e+23f, 3.4724e+24f, 2.01949e+23f, 3.61987e+24f, 2.16463e+23f
path.cubicTo(SkBits2Float(0x68c4391f), SkBits2Float(0x672c5c9f), SkBits2Float(0x688b20ab), SkBits2Float(0x6804b825), SkBits2Float(0x681ddb5e), SkBits2Float(0x6838dc00)); // 7.4131e+24f, 8.13956e+23f, 5.25609e+24f, 2.507e+24f, 2.98183e+24f, 3.49189e+24f
@@ -10931,7 +10931,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path2(path);
testPathOpFuzz(reporter, path1, path2, (SkPathOp) 1, filename);
@@ -10939,7 +10939,7 @@
static void fuzz763_22(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x68295b2d)); // 0, 3.19905e+24f
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.lineTo(SkBits2Float(0x6a3a7bc0), SkBits2Float(0x00000000)); // 5.63611e+25f, 0
@@ -10954,7 +10954,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.quadTo(SkBits2Float(0x4f9a3a8a), SkBits2Float(0xc28a0d28), SkBits2Float(0x273a3ab3), SkBits2Float(0x8b2a2928)); // 5.17506e+09f, -69.0257f, 2.58445e-15f, -3.27718e-32f
path.lineTo(SkBits2Float(0x63283ae6), SkBits2Float(0x27282a81)); // 3.1033e+21f, 2.33377e-15f
@@ -10965,11 +10965,11 @@
static void fuzz763_23(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x68556829), SkBits2Float(0x555b2d29)); // 4.03114e+24f, 1.50617e+13f
path.moveTo(SkBits2Float(0x1f2a312a), SkBits2Float(0xc0032108)); // 3.60396e-20f, -2.04889f
path.cubicTo(SkBits2Float(0x68392d55), SkBits2Float(0xf05b684b), SkBits2Float(0x8c55272d), SkBits2Float(0x212a292a), SkBits2Float(0x03210c2a), SkBits2Float(0x6a4b7bc0)); // 3.4979e+24f, -2.71613e+29f, -1.64207e-31f, 5.76527e-19f, 4.73276e-37f, 6.14991e+25f
@@ -11006,11 +11006,11 @@
static void fuzz763_24(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0xededed02), SkBits2Float(0xedededed)); // -9.20431e+27f, -9.20445e+27f
path.close();
path.moveTo(SkBits2Float(0xededed02), SkBits2Float(0xedededed)); // -9.20431e+27f, -9.20445e+27f
@@ -11055,7 +11055,7 @@
static void fuzz763_25(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x6a4b7bc4)); // 0, 6.14991e+25f
path.conicTo(SkBits2Float(0x653140d9), SkBits2Float(0x6a4b4f74), SkBits2Float(0x65906630), SkBits2Float(0x6a25a070), SkBits2Float(0x3f6728a2)); // 5.23159e+22f, 6.14468e+25f, 8.52382e+22f, 5.00576e+25f, 0.902964f
path.cubicTo(SkBits2Float(0x68295bc5), SkBits2Float(0x00000000), SkBits2Float(0x682958ff), SkBits2Float(0x00000000), SkBits2Float(0x68286829), SkBits2Float(0x00000000)); // 3.19909e+24f, 0, 3.19889e+24f, 0, 3.18112e+24f, 0
@@ -11071,7 +11071,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path2(path);
testPathOpFuzz(reporter, path1, path2, (SkPathOp) 4, filename);
@@ -11080,11 +11080,11 @@
static void fuzz763_26(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x68556829), SkBits2Float(0x555b2d29)); // 4.03114e+24f, 1.50617e+13f
path.moveTo(SkBits2Float(0x1f2a312a), SkBits2Float(0xc003210a)); // 3.60396e-20f, -2.04889f
path.cubicTo(SkBits2Float(0x68372d55), SkBits2Float(0xf05b684b), SkBits2Float(0x8c55272d), SkBits2Float(0x212a292a), SkBits2Float(0x0321082a), SkBits2Float(0x6a4b7bc0)); // 3.46012e+24f, -2.71613e+29f, -1.64207e-31f, 5.76527e-19f, 4.7323e-37f, 6.14991e+25f
@@ -11138,11 +11138,11 @@
static void fuzz763_28(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x68556829), SkBits2Float(0x555b2d29)); // 4.03114e+24f, 1.50617e+13f
path.moveTo(SkBits2Float(0x1f2a312a), SkBits2Float(0xc0032108)); // 3.60396e-20f, -2.04889f
path.cubicTo(SkBits2Float(0x68302d55), SkBits2Float(0xf05b684b), SkBits2Float(0x8c55272d), SkBits2Float(0x212a1f2a), SkBits2Float(0x0321082a), SkBits2Float(0x6aa37bc0)); // 3.32789e+24f, -2.71613e+29f, -1.64207e-31f, 5.76395e-19f, 4.7323e-37f, 9.88197e+25f
@@ -11176,11 +11176,11 @@
static void fuzz763_27(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.quadTo(SkBits2Float(0x30309ab8), SkBits2Float(0x305b3030), SkBits2Float(0x00f53030), SkBits2Float(0x3a3a0000)); // 6.42483e-10f, 7.97402e-10f, 2.2517e-38f, 0.000709534f
path.quadTo(SkBits2Float(0xb8b8d5b8), SkBits2Float(0x0b0b0b03), SkBits2Float(0x0b0b0b0b), SkBits2Float(0x3a3a0b0b)); // -8.81361e-05f, 2.67787e-32f, 2.67787e-32f, 0.000709698f
@@ -11192,7 +11192,7 @@
static void fuzz763_29(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0x743e0000)); // 0, 6.02134e+31f
path.cubicTo(SkBits2Float(0x74083cf1), SkBits2Float(0x74536e73), SkBits2Float(0x742ac4e4), SkBits2Float(0x7415f5be), SkBits2Float(0x7433ee3c), SkBits2Float(0x7405a69a)); // 4.31756e+31f, 6.70053e+31f, 5.41189e+31f, 4.75242e+31f, 5.70223e+31f, 4.23556e+31f
@@ -11209,7 +11209,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.lineTo(SkBits2Float(0xf0682955), SkBits2Float(0x211f5b2d)); // -2.87402e+29f, 5.3992e-19f
path.moveTo(SkBits2Float(0x2d2aff2d), SkBits2Float(0x74747474)); // 9.72004e-12f, 7.74708e+31f
@@ -11224,11 +11224,11 @@
static void fuzz763_30(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x1f2108c0), SkBits2Float(0x4b7b0321)); // 3.41003e-20f, 1.64503e+07f
path.lineTo(SkBits2Float(0x6829ed27), SkBits2Float(0x2d555b2d)); // 3.20982e+24f, 1.21279e-11f
path.moveTo(SkBits2Float(0x68305b2d), SkBits2Float(0xf0685527)); // 3.33127e+24f, -2.87614e+29f
@@ -11254,11 +11254,11 @@
static void fuzz763_31(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0xd72a8c55), SkBits2Float(0x61081f2a)); // -1.8752e+14f, 1.56938e+20f
path.conicTo(SkBits2Float(0x6a4b7bc0), SkBits2Float(0x4793ed7a), SkBits2Float(0x282a3a21), SkBits2Float(0xdf3a2128), SkBits2Float(0x471ac575)); // 6.14991e+25f, 75739, 9.4495e-15f, -1.3412e+19f, 39621.5f
path.lineTo(SkBits2Float(0x28404040), SkBits2Float(0x552a298a)); // 1.06721e-14f, 1.16935e+13f
@@ -11279,7 +11279,7 @@
static void fuzz763_33(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x72c185d5), SkBits2Float(0x72c184e8)); // 7.66623e+30f, 7.66608e+30f
path.quadTo(SkBits2Float(0x724341bf), SkBits2Float(0x72433fc4), SkBits2Float(0x6d757575), SkBits2Float(0x6d6d6d6d)); // 3.86746e+30f, 3.86731e+30f, 4.74786e+27f, 4.59251e+27f
path.cubicTo(SkBits2Float(0x6d18b5e5), SkBits2Float(0x6d6d6d6d), SkBits2Float(0x6cbe03bd), SkBits2Float(0x6d4b455b), SkBits2Float(0x6c6c69d8), SkBits2Float(0x6d20df31)); // 2.95385e+27f, 4.59251e+27f, 1.83771e+27f, 3.93183e+27f, 1.14323e+27f, 3.11171e+27f
@@ -11298,7 +11298,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.lineTo(SkBits2Float(0x6c6b6ba7), SkBits2Float(0x886b6b6b)); // 1.13842e+27f, -7.0844e-34f
path.quadTo(SkBits2Float(0x0000206b), SkBits2Float(0x6d6d6d6d), SkBits2Float(0x6d6d6d6d), SkBits2Float(0x6d6d6d6d)); // 1.16294e-41f, 4.59251e+27f, 4.59251e+27f, 4.59251e+27f
@@ -11326,11 +11326,11 @@
static void fuzz763_32(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.cubicTo(SkBits2Float(0xdedcdcdc), SkBits2Float(0xdcdcdcdc), SkBits2Float(0xdcdcdcdc), SkBits2Float(0xdcdcdcdc), SkBits2Float(0x55dcdcdc), SkBits2Float(0x29407d7f)); // -7.95742e+18f, -4.97339e+17f, -4.97339e+17f, -4.97339e+17f, 3.03551e+13f, 4.27414e-14f
path.cubicTo(SkBits2Float(0x7b93ed4b), SkBits2Float(0x29521472), SkBits2Float(0xdfc83c28), SkBits2Float(0x1a3a834e), SkBits2Float(0x6855e84f), SkBits2Float(0xf2f22a80)); // 1.53616e+36f, 4.66471e-14f, -2.88569e+19f, 3.857e-23f, 4.0406e+24f, -9.59318e+30f
@@ -11346,7 +11346,7 @@
static void fuzz763_34(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x63a95a6c), SkBits2Float(0x6cc8e7e2)); // 6.24803e+21f, 1.94304e+27f
path.quadTo(SkBits2Float(0x63690f37), SkBits2Float(0x6d0a3d9b), SkBits2Float(0x00000000), SkBits2Float(0x6d3e3e3e)); // 4.29919e+21f, 2.67396e+27f, 0, 3.67984e+27f
path.conicTo(SkBits2Float(0x6b9253fc), SkBits2Float(0x6c956a8b), SkBits2Float(0x6c6ac798), SkBits2Float(0x692a5d27), SkBits2Float(0x3e56eb72)); // 3.538e+26f, 1.44506e+27f, 1.13532e+27f, 1.28723e+25f, 0.209883f
@@ -11364,7 +11364,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x6c3e3e3e), SkBits2Float(0x586c79ff)); // 9.19959e+26f, 1.04003e+15f
path.quadTo(SkBits2Float(0x6c6c4a6c), SkBits2Float(0x6c6c6c6c), SkBits2Float(0xc83e6c6c), SkBits2Float(0x3e313e3e)); // 1.14263e+27f, 1.14327e+27f, -194994, 0.173089f
@@ -11374,11 +11374,11 @@
static void fuzz763_36(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x68556829), SkBits2Float(0x555b2d29)); // 4.03114e+24f, 1.50617e+13f
path.moveTo(SkBits2Float(0x1f2a312a), SkBits2Float(0xc0032108)); // 3.60396e-20f, -2.04889f
path.cubicTo(SkBits2Float(0x68392d55), SkBits2Float(0xf05b684b), SkBits2Float(0x8c55272d), SkBits2Float(0x212a292a), SkBits2Float(0x0321082a), SkBits2Float(0x6a4b7bc0)); // 3.4979e+24f, -2.71613e+29f, -1.64207e-31f, 5.76527e-19f, 4.7323e-37f, 6.14991e+25f
@@ -11428,11 +11428,11 @@
static void fuzz763_35(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x2aed2a8c), SkBits2Float(0x03210a1f)); // 4.21292e-13f, 4.73253e-37f
path.conicTo(SkBits2Float(0x0000007b), SkBits2Float(0x7474747f), SkBits2Float(0x74747474), SkBits2Float(0x747474c4), SkBits2Float(0x74747474)); // 1.7236e-43f, 7.74709e+31f, 7.74708e+31f, 7.74712e+31f, 7.74708e+31f
path.quadTo(SkBits2Float(0x74747474), SkBits2Float(0x74747474), SkBits2Float(0x20437474), SkBits2Float(0x43a52b02)); // 7.74708e+31f, 7.74708e+31f, 1.65557e-19f, 330.336f
@@ -11467,7 +11467,7 @@
static void fuzz763_37(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x5568392a), SkBits2Float(0x5b2d3368)); // 1.59583e+13f, 4.87517e+16f
path.conicTo(SkBits2Float(0x5b2d555b), SkBits2Float(0x68275b2d), SkBits2Float(0x21685527), SkBits2Float(0x0321082a), SkBits2Float(0x6ab485c0)); // 4.8789e+16f, 3.16127e+24f, 7.87174e-19f, 4.7323e-37f, 1.09119e+26f
path.conicTo(SkBits2Float(0x212a8ced), SkBits2Float(0x0321081f), SkBits2Float(0x6a4b7bc0), SkBits2Float(0x2829ed84), SkBits2Float(0x5b2d2d55)); // 5.77848e-19f, 4.7323e-37f, 6.14991e+25f, 9.43289e-15f, 4.8745e+16f
@@ -11511,7 +11511,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.cubicTo(SkBits2Float(0xbcb4bcac), SkBits2Float(0x000029ff), SkBits2Float(0x010000bc), SkBits2Float(0x00bcbc00), SkBits2Float(0xbebcbcbc), SkBits2Float(0xb6aebcae)); // -0.0220626f, 1.50654e-41f, 2.35104e-38f, 1.73325e-38f, -0.368627f, -5.20757e-06f
@@ -11521,7 +11521,7 @@
static void fuzz763_38(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.conicTo(SkBits2Float(0x5b682968), SkBits2Float(0x5b292d11), SkBits2Float(0x212a8c55), SkBits2Float(0x555b2d2d), SkBits2Float(0x52525268)); // 6.53477e+16f, 4.76188e+16f, 5.7784e-19f, 1.50617e+13f, 2.25831e+11f
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
@@ -11575,7 +11575,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x52528c55), SkBits2Float(0x29215252)); // 2.26074e+11f, 3.58206e-14f
SkPath path2(path);
@@ -11584,11 +11584,11 @@
static void fuzz763_41(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.quadTo(SkBits2Float(0x7a057c72), SkBits2Float(0x72727272), SkBits2Float(0x725b5e72), SkBits2Float(0x055f0089)); // 1.73275e+35f, 4.80216e+30f, 4.34505e+30f, 1.04855e-35f
path.quadTo(SkBits2Float(0x00057272), SkBits2Float(0x72ff0000), SkBits2Float(0xba405e72), SkBits2Float(0x031b0074)); // 5.00233e-40f, 1.01016e+31f, -0.000733829f, 4.55509e-37f
@@ -11623,11 +11623,11 @@
static void fuzz763_40(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x10190004), SkBits2Float(0x7272727a)); // 3.01739e-29f, 4.80216e+30f
path.quadTo(SkBits2Float(0xf3db5e64), SkBits2Float(0x5b97fc16), SkBits2Float(0x000039fc), SkBits2Float(0x01008000)); // -3.47604e+31f, 8.55598e+16f, 2.08009e-41f, 2.36017e-38f
path.quadTo(SkBits2Float(0x7a057272), SkBits2Float(0x72727272), SkBits2Float(0x725b5e72), SkBits2Float(0x41720089)); // 1.73224e+35f, 4.80216e+30f, 4.34505e+30f, 15.1251f
@@ -11650,11 +11650,11 @@
static void fuzz763_39(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.quadTo(SkBits2Float(0x7a057c72), SkBits2Float(0x72727272), SkBits2Float(0x725b5e72), SkBits2Float(0x055f0089)); // 1.73275e+35f, 4.80216e+30f, 4.34505e+30f, 1.04855e-35f
path.quadTo(SkBits2Float(0x7a057272), SkBits2Float(0x72727272), SkBits2Float(0xba405e72), SkBits2Float(0x03000074)); // 1.73224e+35f, 4.80216e+30f, -0.000733829f, 3.76163e-37f
@@ -11674,11 +11674,11 @@
static void fuzz763_42(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.quadTo(SkBits2Float(0x7a057272), SkBits2Float(0x72727272), SkBits2Float(0x725b5e72), SkBits2Float(0x05720089)); // 1.73224e+35f, 4.80216e+30f, 4.34505e+30f, 1.13789e-35f
path.quadTo(SkBits2Float(0x7a057272), SkBits2Float(0x72727272), SkBits2Float(0xba405e72), SkBits2Float(0x03000074)); // 1.73224e+35f, 4.80216e+30f, -0.000733829f, 3.76163e-37f
@@ -11705,11 +11705,11 @@
static void fuzz763_43(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x5c386c3a), SkBits2Float(0x4e691a3e)); // 2.07642e+17f, 9.77703e+08f
path.cubicTo(SkBits2Float(0x6f69f9f5), SkBits2Float(0x18ff8791), SkBits2Float(0x2492263c), SkBits2Float(0xbc6fdb48), SkBits2Float(0xc2f82107), SkBits2Float(0x729a18e1)); // 7.24122e+28f, 6.60528e-24f, 6.33822e-17f, -0.0146397f, -124.065f, 6.10442e+30f
path.cubicTo(SkBits2Float(0x07d729d1), SkBits2Float(0xdea6db48), SkBits2Float(0xcd1dfb88), SkBits2Float(0x90826769), SkBits2Float(0x1c20e5a4), SkBits2Float(0xa4c3ba9b)); // 3.23742e-34f, -6.01164e+18f, -1.65657e+08f, -5.14353e-29f, 5.32364e-22f, -8.48839e-17f
@@ -11740,7 +11740,7 @@
static void fuzz763_44(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x7c223bab), SkBits2Float(0x7cf35966)); // 3.36945e+36f, 1.01083e+37f
path.quadTo(SkBits2Float(0x00000000), SkBits2Float(0x7ccaca6d), SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 8.4236e+36f, 0, 0
path.lineTo(SkBits2Float(0x7d7d7d7d), SkBits2Float(0x00000000)); // 2.10591e+37f, 0
@@ -11749,7 +11749,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x109d0000), SkBits2Float(0xff7bc000)); // 6.19256e-29f, -3.34633e+38f
path.conicTo(SkBits2Float(0x979797ed), SkBits2Float(0x3a214797), SkBits2Float(0x28aa217a), SkBits2Float(0x01007272), SkBits2Float(0x00000072)); // -9.7965e-25f, 0.000615233f, 1.88883e-14f, 2.3592e-38f, 1.59748e-43f
path.quadTo(SkBits2Float(0x72728302), SkBits2Float(0x8b727272), SkBits2Float(0x72727272), SkBits2Float(0xc00308f6)); // 4.80344e+30f, -4.66936e-32f, 4.80216e+30f, -2.04742f
@@ -11761,11 +11761,11 @@
static void fuzz763_45(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.cubicTo(SkBits2Float(0x30303030), SkBits2Float(0x30303030), SkBits2Float(0x30303030), SkBits2Float(0x7a303030), SkBits2Float(0x7a303030), SkBits2Float(0x30303030)); // 6.40969e-10f, 6.40969e-10f, 6.40969e-10f, 2.28705e+35f, 2.28705e+35f, 6.40969e-10f
path.conicTo(SkBits2Float(0x30303030), SkBits2Float(0x74303030), SkBits2Float(0x74303030), SkBits2Float(0x30303030), SkBits2Float(0x74303030)); // 6.40969e-10f, 5.58363e+31f, 5.58363e+31f, 6.40969e-10f, 5.58363e+31f
@@ -11796,11 +11796,11 @@
static void fuzz763_46(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.conicTo(SkBits2Float(0x44444444), SkBits2Float(0x44444444), SkBits2Float(0x44263030), SkBits2Float(0x44304430), SkBits2Float(0x4c444430)); // 785.067f, 785.067f, 664.753f, 705.065f, 5.145e+07f
path.moveTo(SkBits2Float(0x44444444), SkBits2Float(0x44444444)); // 785.067f, 785.067f
@@ -11811,11 +11811,11 @@
static void fuzz763_47(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.cubicTo(SkBits2Float(0x7272728e), SkBits2Float(0x52527272), SkBits2Float(0x2d555252), SkBits2Float(0x68556829), SkBits2Float(0x555b2d29), SkBits2Float(0x2a212a8c)); // 4.80217e+30f, 2.25966e+11f, 1.21259e-11f, 4.03114e+24f, 1.50617e+13f, 1.43144e-13f
path.conicTo(SkBits2Float(0x00296808), SkBits2Float(0x00000002), SkBits2Float(0x52525252), SkBits2Float(0x72007272), SkBits2Float(0x52527272)); // 3.80257e-39f, 2.8026e-45f, 2.25831e+11f, 2.54416e+30f, 2.25966e+11f
@@ -11836,11 +11836,11 @@
static void fuzz763_48(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.lineTo(SkBits2Float(0xed0081bc), SkBits2Float(0x1b2d8040)); // -2.48568e+27f, 1.43517e-22f
path.moveTo(SkBits2Float(0x74747403), SkBits2Float(0x29747474)); // 7.74703e+31f, 5.42799e-14f
@@ -11874,11 +11874,11 @@
static void fuzz763_49(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.conicTo(SkBits2Float(0x30303030), SkBits2Float(0x78303030), SkBits2Float(0x78787881), SkBits2Float(0x78787878), SkBits2Float(0x30303030)); // 6.40969e-10f, 1.42941e+34f, 2.01583e+34f, 2.01583e+34f, 6.40969e-10f
path.lineTo(SkBits2Float(0x78787878), SkBits2Float(0x78787878)); // 2.01583e+34f, 2.01583e+34f
@@ -11907,7 +11907,7 @@
static void fuzz763_50(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x70621ede), SkBits2Float(0x00000000)); // 2.79924e+29f, 0
path.conicTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000), SkBits2Float(0x00000000), SkBits2Float(0x74fc5b97), SkBits2Float(0x7d458fe4)); // 0, 0, 0, 1.59951e+32f, 1.64128e+37f
path.lineTo(SkBits2Float(0xefea1ffe), SkBits2Float(0x00000000)); // -1.44916e+29f, 0
@@ -11920,7 +11920,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path2(path);
testPathOpFuzz(reporter, path1, path2, (SkPathOp) 3, filename);
@@ -11928,11 +11928,11 @@
static void fuzz763_51(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.quadTo(SkBits2Float(0x868b5aae), SkBits2Float(0x626c45ab), SkBits2Float(0xefea1ffe), SkBits2Float(0x0029fc76)); // -5.24192e-35f, 1.08961e+21f, -1.44916e+29f, 3.85582e-39f
path.moveTo(SkBits2Float(0xfacbff01), SkBits2Float(0x56fc5b97)); // -5.29604e+35f, 1.38735e+14f
@@ -11944,11 +11944,11 @@
static void fuzz763_52(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.quadTo(SkBits2Float(0x29ff4bae), SkBits2Float(0xa1d75590), SkBits2Float(0x9fd6f6c3), SkBits2Float(0x70621ede)); // 1.13374e-13f, -1.45916e-18f, -9.10408e-20f, 2.79924e+29f
path.quadTo(SkBits2Float(0x57a839d3), SkBits2Float(0x1a80d34b), SkBits2Float(0x0147a31b), SkBits2Float(0xff7fffff)); // 3.69933e+14f, 5.32809e-23f, 3.66675e-38f, -3.40282e+38f
@@ -11973,7 +11973,7 @@
static void fuzz763_53(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x7644b829), SkBits2Float(0x00000000)); // 9.97486e+32f, 0
path.lineTo(SkBits2Float(0x74fc5b97), SkBits2Float(0x77df944a)); // 1.59951e+32f, 9.06945e+33f
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xf8fbe3ff)); // 0, -4.08716e+34f
@@ -11982,7 +11982,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.quadTo(SkBits2Float(0x45ab86ae), SkBits2Float(0xd6d6626c), SkBits2Float(0xd6d6d6d6), SkBits2Float(0x7644d6d6)); // 5488.83f, -1.17859e+14f, -1.18109e+14f, 9.98093e+32f
path.moveTo(SkBits2Float(0xd6d6d6d6), SkBits2Float(0xd6d6d6d6)); // -1.18109e+14f, -1.18109e+14f
@@ -12003,7 +12003,7 @@
// hangs 654939
static void fuzz763_54(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.conicTo(SkBits2Float(0x5b682968), SkBits2Float(0xb3b32d11), SkBits2Float(0xb3b3b3b3), SkBits2Float(0x5b29b3b3), SkBits2Float(0x212a8c55)); // 6.53477e+16f, -8.34353e-08f, -8.36802e-08f, 4.77669e+16f, 5.7784e-19f
path.conicTo(SkBits2Float(0x68555b2d), SkBits2Float(0x28296869), SkBits2Float(0x5b252a08), SkBits2Float(0x5d68392a), SkBits2Float(0x29282780)); // 4.03018e+24f, 9.40402e-15f, 4.64896e+16f, 1.04584e+18f, 3.73378e-14f
@@ -12036,7 +12036,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path2(path);
testPathOpFuzz(reporter, path1, path2, (SkPathOp) 4, filename);
@@ -12046,7 +12046,7 @@
// afl crash
static void fuzz763_55(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x55415500)); // 0, 1.32857e+13f
path.lineTo(SkBits2Float(0x55555568), SkBits2Float(0x55555555)); // 1.46602e+13f, 1.46602e+13f
path.lineTo(SkBits2Float(0x98989898), SkBits2Float(0x55989898)); // -3.94452e-24f, 2.09726e+13f
@@ -12067,7 +12067,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path2(path);
testPathOpFuzz(reporter, path1, path2, (SkPathOp) 3, filename);
@@ -12076,7 +12076,7 @@
// 656149
static void fuzz763_56(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.conicTo(SkBits2Float(0x5b682968), SkBits2Float(0xb3b32d11), SkBits2Float(0xb3b3b3b3), SkBits2Float(0x5b29b3b3), SkBits2Float(0x72725255)); // 6.53477e+16f, -8.34353e-08f, -8.36802e-08f, 4.77669e+16f, 4.79967e+30f
path.quadTo(SkBits2Float(0x525252c7), SkBits2Float(0x72725252), SkBits2Float(0x72727272), SkBits2Float(0x72727255)); // 2.25833e+11f, 4.79967e+30f, 4.80216e+30f, 4.80215e+30f
@@ -12105,7 +12105,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path2(path);
testPathOpFuzz(reporter, path1, path2, (SkPathOp) 0, filename);
@@ -12113,11 +12113,11 @@
static void fuzz763_57(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x68546829), SkBits2Float(0x555b2d29)); // 4.01225e+24f, 1.50617e+13f
path.moveTo(SkBits2Float(0x1f2a322a), SkBits2Float(0x4b7b2108)); // 3.60404e-20f, 1.6458e+07f
path.lineTo(SkBits2Float(0x2829ed84), SkBits2Float(0x5b2d2d55)); // 9.43289e-15f, 4.8745e+16f
@@ -12162,7 +12162,7 @@
static void fuzzhang_1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.cubicTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000), SkBits2Float(0x668ece09), SkBits2Float(0x00000000), SkBits2Float(0x6751c81a), SkBits2Float(0x61c4b0fb)); // 0, 0, 3.37188e+23f, 0, 9.90666e+23f, 4.53539e+20f
path.conicTo(SkBits2Float(0x66f837a9), SkBits2Float(0x00000000), SkBits2Float(0x00000000), SkBits2Float(0x00000000), SkBits2Float(0x3f823406)); // 5.86087e+23f, 0, 0, 0, 1.01721f
@@ -12177,7 +12177,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.cubicTo(SkBits2Float(0x535353ec), SkBits2Float(0x98989898), SkBits2Float(0x98989898), SkBits2Float(0xf207f36e), SkBits2Float(0xf3f2f2f2), SkBits2Float(0xed3a9781)); // 9.07646e+11f, -3.94452e-24f, -3.94452e-24f, -2.69278e+30f, -3.84968e+31f, -3.60921e+27f
path.quadTo(SkBits2Float(0xf8f8c0ed), SkBits2Float(0xf8f8f8f8), SkBits2Float(0x9f9f9f9f), SkBits2Float(0x3014149f)); // -4.03626e+34f, -4.03981e+34f, -6.76032e-20f, 5.38714e-10f
@@ -12188,8 +12188,8 @@
static void release_13(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
-path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType((SkPath::FillType) 1);
+path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(SkBits2Float(0xd4438848), SkBits2Float(0xd488cf64)); // -3.35922e+12f, -4.70076e+12f
path.lineTo(SkBits2Float(0xd43a056e), SkBits2Float(0xd4851696)); // -3.19582e+12f, -4.57288e+12f
path.quadTo(SkBits2Float(0xd3d48e79), SkBits2Float(0xd49fb136), SkBits2Float(0x00000000), SkBits2Float(0xd4d4d4d4)); // -1.82585e+12f, -5.48698e+12f, 0, -7.31283e+12f
@@ -12246,8 +12246,8 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
-path.setFillType(SkPathFillType::kWinding);
+ path.setFillType((SkPath::FillType) 0);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.quadTo(SkBits2Float(0x00000000), SkBits2Float(0xa5a50000), SkBits2Float(0xd4d4a5a5), SkBits2Float(0xd4d4d4d4)); // 0, -2.86229e-16f, -7.3065e+12f, -7.31283e+12f
path.quadTo(SkBits2Float(0xd4d4d4d4), SkBits2Float(0xd4d4d4d4), SkBits2Float(0xd4cfd4d4), SkBits2Float(0xd4d41dd4)); // -7.31283e+12f, -7.31283e+12f, -7.14103e+12f, -7.28827e+12f
@@ -12264,8 +12264,8 @@
static void fuzzhang_2(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
-path.setFillType(SkPathFillType::kWinding);
+ path.setFillType((SkPath::FillType) 0);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x5568392a), SkBits2Float(0x72837268)); // 1.59583e+13f, 5.20715e+30f
path.quadTo(SkBits2Float(0xe0e02972), SkBits2Float(0xe0e060e0), SkBits2Float(0x728e4603), SkBits2Float(0x72727272)); // -1.29221e+20f, -1.29345e+20f, 5.63603e+30f, 4.80216e+30f
path.lineTo(SkBits2Float(0x5568392a), SkBits2Float(0x72837268)); // 1.59583e+13f, 5.20715e+30f
@@ -12293,8 +12293,8 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
-path.setFillType(SkPathFillType::kWinding);
+ path.setFillType((SkPath::FillType) 0);
+path.setFillType(SkPath::kWinding_FillType);
SkPath path2(path);
testPathOpFuzz(reporter, path1, path2, (SkPathOp) 1, filename);
@@ -12302,13 +12302,13 @@
static void fuzzhang_3(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
-path.setFillType(SkPathFillType::kWinding);
+ path.setFillType((SkPath::FillType) 0);
+path.setFillType(SkPath::kWinding_FillType);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
-path.setFillType(SkPathFillType::kWinding);
+ path.setFillType((SkPath::FillType) 0);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x46090052), SkBits2Float(0x7270726c)); // 8768.08f, 4.76254e+30f
path.moveTo(SkBits2Float(0xe0437272), SkBits2Float(0x03e0e060)); // -5.63338e+19f, 1.32171e-36f
path.close();
@@ -12354,13 +12354,13 @@
static void fuzz754434_1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
-path.setFillType(SkPathFillType::kWinding);
+ path.setFillType((SkPath::FillType) 0);
+path.setFillType(SkPath::kWinding_FillType);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
-path.setFillType(SkPathFillType::kWinding);
+ path.setFillType((SkPath::FillType) 0);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.cubicTo(SkBits2Float(0x535e5372), SkBits2Float(0x53536153), SkBits2Float(0x79530f53), SkBits2Float(0x101b6c88), SkBits2Float(0x5353735e), SkBits2Float(0x006df653)); // 9.54883e+11f, 9.07871e+11f, 6.84928e+34f, 3.0652e-29f, 9.08174e+11f, 1.00984e-38f
path.cubicTo(SkBits2Float(0xf26df46d), SkBits2Float(0xf6f6f6f6), SkBits2Float(0x5656f666), SkBits2Float(0x5a565656), SkBits2Float(0x00000056), SkBits2Float(0xf66e5600)); // -4.71318e+30f, -2.50452e+33f, 5.90884e+13f, 1.50826e+16f, 1.20512e-43f, -1.20851e+33f
@@ -12374,8 +12374,8 @@
static void fuzz754434_2(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
-path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType((SkPath::FillType) 1);
+path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(SkBits2Float(0xff00ff56), SkBits2Float(0x00000000)); // -1.71467e+38f, 0
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xf66e5600)); // 0, -1.20851e+33f
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xf629168b)); // 0, -8.57378e+32f
@@ -12385,8 +12385,8 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
-path.setFillType(SkPathFillType::kWinding);
+ path.setFillType((SkPath::FillType) 0);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.lineTo(SkBits2Float(0x03e8f6f6), SkBits2Float(0xf7060000)); // 1.36924e-36f, -2.71784e+33f
path.lineTo(SkBits2Float(0x4ff6f6f6), SkBits2Float(0x3e3e3e2a)); // 8.28676e+09f, 0.185784f
@@ -12398,13 +12398,13 @@
static void fuzz754434_3(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
-path.setFillType(SkPathFillType::kWinding);
+ path.setFillType((SkPath::FillType) 0);
+path.setFillType(SkPath::kWinding_FillType);
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
-path.setFillType(SkPathFillType::kWinding);
+ path.setFillType((SkPath::FillType) 0);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.cubicTo(SkBits2Float(0x535e5372), SkBits2Float(0x53536153), SkBits2Float(0x79530f53), SkBits2Float(0x101b6c88), SkBits2Float(0x5353735e), SkBits2Float(0x006df653)); // 9.54883e+11f, 9.07871e+11f, 6.84928e+34f, 3.0652e-29f, 9.08174e+11f, 1.00984e-38f
path.cubicTo(SkBits2Float(0xf26df46d), SkBits2Float(0xf6f6f6f6), SkBits2Float(0x5656f666), SkBits2Float(0x5a565656), SkBits2Float(0x00000056), SkBits2Float(0xf66e5600)); // -4.71318e+30f, -2.50452e+33f, 5.90884e+13f, 1.50826e+16f, 1.20512e-43f, -1.20851e+33f
@@ -12418,8 +12418,8 @@
static void fuzz754434_4(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
-path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType((SkPath::FillType) 1);
+path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(SkBits2Float(0xff00ff56), SkBits2Float(0x00000000)); // -1.71467e+38f, 0
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xf66e5600)); // 0, -1.20851e+33f
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0xf629168b)); // 0, -8.57378e+32f
@@ -12429,8 +12429,8 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
-path.setFillType(SkPathFillType::kWinding);
+ path.setFillType((SkPath::FillType) 0);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.lineTo(SkBits2Float(0x03e8f6f6), SkBits2Float(0xf7060000)); // 1.36924e-36f, -2.71784e+33f
path.lineTo(SkBits2Float(0x4ff6f6f6), SkBits2Float(0x3e3e3e2a)); // 8.28676e+09f, 0.185784f
diff --git a/tests/PathOpsSimplifyDegenerateThreadedTest.cpp b/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
index 7a94d07..cf36924 100644
--- a/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
+++ b/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
@@ -32,6 +32,7 @@
}
SkString pathStr;
SkPath path, out;
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkIntToScalar(ax), SkIntToScalar(ay));
path.lineTo(SkIntToScalar(bx), SkIntToScalar(by));
path.lineTo(SkIntToScalar(cx), SkIntToScalar(cy));
@@ -49,12 +50,12 @@
pathStr.appendf(" path.lineTo(%d, %d);\n", ex, ey);
pathStr.appendf(" path.lineTo(%d, %d);\n", fx, fy);
pathStr.appendf(" path.close();\n");
- state.outputProgress(pathStr.c_str(), SkPathFillType::kWinding);
+ state.outputProgress(pathStr.c_str(), SkPath::kWinding_FillType);
}
testSimplify(path, false, out, state, pathStr.c_str());
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
if (state.fReporter->verbose()) {
- state.outputProgress(pathStr.c_str(), SkPathFillType::kEvenOdd);
+ state.outputProgress(pathStr.c_str(), SkPath::kEvenOdd_FillType);
}
testSimplify(path, true, out, state, pathStr.c_str());
}
diff --git a/tests/PathOpsSimplifyFailTest.cpp b/tests/PathOpsSimplifyFailTest.cpp
index 7503c55..6e7c650 100644
--- a/tests/PathOpsSimplifyFailTest.cpp
+++ b/tests/PathOpsSimplifyFailTest.cpp
@@ -59,11 +59,11 @@
case 12: path.moveTo(nonFinitePts[i]); break;
}
SkPath result;
- result.setFillType(SkPathFillType::kWinding);
+ result.setFillType(SkPath::kWinding_FillType);
bool success = Simplify(path, &result);
REPORTER_ASSERT(reporter, !success);
REPORTER_ASSERT(reporter, result.isEmpty());
- REPORTER_ASSERT(reporter, result.getNewFillType() == SkPathFillType::kWinding);
+ REPORTER_ASSERT(reporter, result.getFillType() == SkPath::kWinding_FillType);
reporter->bumpTestCount();
}
@@ -85,10 +85,10 @@
case 10: path.moveTo(finitePts[f]); break;
}
SkPath result;
- result.setFillType(SkPathFillType::kWinding);
+ result.setFillType(SkPath::kWinding_FillType);
bool success = Simplify(path, &result);
REPORTER_ASSERT(reporter, success);
- REPORTER_ASSERT(reporter, result.getNewFillType() != SkPathFillType::kWinding);
+ REPORTER_ASSERT(reporter, result.getFillType() != SkPath::kWinding_FillType);
reporter->bumpTestCount();
}
@@ -126,6 +126,7 @@
static void fuzz763_1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.cubicTo(SkBits2Float(0xbcb63000), SkBits2Float(0xb6b6b6b7), SkBits2Float(0x38b6b6b6), SkBits2Float(0xafb63a5a), SkBits2Float(0xca000087), SkBits2Float(0xe93ae9e9)); // -0.0222397f, -5.44529e-06f, 8.71247e-05f, -3.31471e-10f, -2.09719e+06f, -1.41228e+25f
path.quadTo(SkBits2Float(0xb6007fb6), SkBits2Float(0xb69fb6b6), SkBits2Float(0xe9e964b6), SkBits2Float(0xe9e9e9e9)); // -1.91478e-06f, -4.75984e-06f, -3.52694e+25f, -3.5348e+25f
@@ -156,6 +157,7 @@
static void fuzz763_2s(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.cubicTo(SkBits2Float(0x76773011), SkBits2Float(0x5d66fe78), SkBits2Float(0xbbeeff66), SkBits2Float(0x637677a2), SkBits2Float(0x205266fe), SkBits2Float(0xec296fdf)); // 1.25339e+33f, 1.0403e+18f, -0.00729363f, 4.54652e+21f, 1.78218e-19f, -8.19347e+26f
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
@@ -215,6 +217,7 @@
static void fuzz_x3(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.cubicTo(SkBits2Float(0x92743420), SkBits2Float(0x74747474), SkBits2Float(0x0f747c74), SkBits2Float(0xff538565), SkBits2Float(0x74744374), SkBits2Float(0x20437474)); // -7.70571e-28f, 7.74708e+31f, 1.20541e-29f, -2.8116e+38f, 7.74102e+31f, 1.65557e-19f
path.conicTo(SkBits2Float(0x7474926d), SkBits2Float(0x7c747474), SkBits2Float(0x00170f74), SkBits2Float(0x3a7410d7), SkBits2Float(0x3a3a3a3a)); // 7.7508e+31f, 5.07713e+36f, 2.11776e-39f, 0.000931037f, 0.000710401f
@@ -226,6 +229,7 @@
static void fuzz_k1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.conicTo(SkBits2Float(0x2073732f), SkBits2Float(0x73f17f00), SkBits2Float(0x737b7b73), SkBits2Float(0x73916773), SkBits2Float(0x00738773)); // 2.0621e-19f, 3.82666e+31f, 1.99245e+31f, 2.30402e+31f, 1.06097e-38f
path.lineTo(SkBits2Float(0x5803736d), SkBits2Float(0x807b5ba1)); // 5.78127e+14f, -1.13286e-38f
diff --git a/tests/PathOpsSimplifyQuadThreadedTest.cpp b/tests/PathOpsSimplifyQuadThreadedTest.cpp
index 52fa8fc..fc5f646 100644
--- a/tests/PathOpsSimplifyQuadThreadedTest.cpp
+++ b/tests/PathOpsSimplifyQuadThreadedTest.cpp
@@ -36,6 +36,7 @@
int hx = h & 0x03;
int hy = h >> 2;
SkPath path, out;
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkIntToScalar(ax), SkIntToScalar(ay));
path.quadTo(SkIntToScalar(bx), SkIntToScalar(by),
SkIntToScalar(cx), SkIntToScalar(cy));
@@ -60,12 +61,12 @@
pathStr.appendf(" path.close();\n");
pathStr.appendf(" testSimplify(reporter, path, filename);\n");
pathStr.appendf("}\n");
- state.outputProgress(pathStr.c_str(), SkPathFillType::kWinding);
+ state.outputProgress(pathStr.c_str(), SkPath::kWinding_FillType);
}
testSimplify(path, false, out, state, pathStr.c_str());
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
if (state.fReporter->verbose()) {
- state.outputProgress(pathStr.c_str(), SkPathFillType::kEvenOdd);
+ state.outputProgress(pathStr.c_str(), SkPath::kEvenOdd_FillType);
}
testSimplify(path, true, out, state, pathStr.c_str());
}
diff --git a/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp b/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp
index ecb4f29..2cfca49 100644
--- a/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp
+++ b/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp
@@ -36,6 +36,7 @@
int hx = h & 0x03;
int hy = h >> 2;
SkPath path, out;
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkIntToScalar(ax), SkIntToScalar(ay));
path.lineTo(SkIntToScalar(bx), SkIntToScalar(by));
path.lineTo(SkIntToScalar(cx), SkIntToScalar(cy));
@@ -62,12 +63,12 @@
pathStr.appendf(" path.close();\n");
pathStr.appendf(" testPathSimplify(reporter, path, filename);\n");
pathStr.appendf("}\n");
- state.outputProgress(pathStr.c_str(), SkPathFillType::kWinding);
+ state.outputProgress(pathStr.c_str(), SkPath::kWinding_FillType);
}
testSimplify(path, false, out, state, pathStr.c_str());
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
if (state.fReporter->verbose()) {
- state.outputProgress(pathStr.c_str(), SkPathFillType::kEvenOdd);
+ state.outputProgress(pathStr.c_str(), SkPath::kEvenOdd_FillType);
}
testSimplify(path, true, out, state, pathStr.c_str());
}
diff --git a/tests/PathOpsSimplifyRectThreadedTest.cpp b/tests/PathOpsSimplifyRectThreadedTest.cpp
index 588b6b3..914eef1 100644
--- a/tests/PathOpsSimplifyRectThreadedTest.cpp
+++ b/tests/PathOpsSimplifyRectThreadedTest.cpp
@@ -39,6 +39,7 @@
for (int dYAlign = 0; dYAlign < 5; ++dYAlign) {
SkString pathStr;
SkPath path, out;
+ path.setFillType(SkPath::kWinding_FillType);
int l SK_INIT_TO_AVOID_WARNING, t SK_INIT_TO_AVOID_WARNING,
r SK_INIT_TO_AVOID_WARNING, b SK_INIT_TO_AVOID_WARNING;
if (aShape) {
@@ -171,11 +172,11 @@
}
path.close();
if (state.fReporter->verbose()) {
- state.outputProgress(pathStr.c_str(), SkPathFillType::kWinding);
+ state.outputProgress(pathStr.c_str(), SkPath::kWinding_FillType);
}
testSimplify(path, false, out, state, pathStr.c_str());
if (state.fReporter->verbose()) {
- state.outputProgress(pathStr.c_str(), SkPathFillType::kEvenOdd);
+ state.outputProgress(pathStr.c_str(), SkPath::kEvenOdd_FillType);
}
testSimplify(path, true, out, state, pathStr.c_str());
}
diff --git a/tests/PathOpsSimplifyTest.cpp b/tests/PathOpsSimplifyTest.cpp
index 9d8e6b6..3771141 100644
--- a/tests/PathOpsSimplifyTest.cpp
+++ b/tests/PathOpsSimplifyTest.cpp
@@ -19,7 +19,7 @@
static void testLine1x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(2,0);
path.lineTo(1,1);
path.lineTo(0,0);
@@ -64,7 +64,7 @@
static void testLine2x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
addInnerCWTriangle(path);
addOuterCWTriangle(path);
testSimplify(reporter, path, filename);
@@ -79,7 +79,7 @@
static void testLine3x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
addInnerCCWTriangle(path);
addOuterCWTriangle(path);
testSimplify(reporter, path, filename);
@@ -94,7 +94,7 @@
static void testLine3ax(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
addInnerCWTriangle(path);
addOuterCCWTriangle(path);
testSimplify(reporter, path, filename);
@@ -109,7 +109,7 @@
static void testLine3bx(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
addInnerCCWTriangle(path);
addOuterCCWTriangle(path);
testSimplify(reporter, path, filename);
@@ -124,7 +124,7 @@
static void testLine4x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
addOuterCCWTriangle(path);
addOuterCWTriangle(path);
testSimplify(reporter, path, filename);
@@ -139,7 +139,7 @@
static void testLine5x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
addOuterCWTriangle(path);
addOuterCWTriangle(path);
testSimplify(reporter, path, filename);
@@ -160,7 +160,7 @@
static void testLine6x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0,0);
path.lineTo(4,0);
path.lineTo(2,2);
@@ -187,7 +187,7 @@
static void testLine7x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0,0);
path.lineTo(4,0);
path.lineTo(2,2);
@@ -210,7 +210,7 @@
static void testLine7ax(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0,0);
path.lineTo(4,0);
path.lineTo(2,2);
@@ -232,7 +232,7 @@
static void testLine7bx(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0,0);
path.lineTo(4,0);
path.close();
@@ -258,7 +258,7 @@
static void testLine8x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0,4);
path.lineTo(4,4);
path.lineTo(2,2);
@@ -285,7 +285,7 @@
static void testLine9x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0,4);
path.lineTo(4,4);
path.lineTo(2,2);
@@ -312,7 +312,7 @@
static void testLine10x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0,4);
path.lineTo(4,4);
path.lineTo(2,2);
@@ -339,7 +339,7 @@
static void testLine10ax(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0,4);
path.lineTo(8,4);
path.lineTo(4,0);
@@ -388,7 +388,7 @@
static void testLine11x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
addCWContainer(path);
addCWContents(path);
testSimplify(reporter, path, filename);
@@ -403,7 +403,7 @@
static void testLine12x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
addCCWContainer(path);
addCWContents(path);
testSimplify(reporter, path, filename);
@@ -418,7 +418,7 @@
static void testLine13x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
addCWContainer(path);
addCCWContents(path);
testSimplify(reporter, path, filename);
@@ -433,7 +433,7 @@
static void testLine14x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
addCCWContainer(path);
addCCWContents(path);
testSimplify(reporter, path, filename);
@@ -447,7 +447,7 @@
static void testLine15x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 9, 9, SkPathDirection::kCW);
testSimplify(reporter, path, filename);
}
@@ -461,7 +461,7 @@
static void testLine16x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 12, 12, SkPathDirection::kCW);
path.addRect(0, 4, 9, 9, SkPathDirection::kCW);
testSimplify(reporter, path, filename);
@@ -476,7 +476,7 @@
static void testLine17x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 12, 12, SkPathDirection::kCW);
path.addRect(4, 12, 13, 13, SkPathDirection::kCW);
testSimplify(reporter, path, filename);
@@ -491,7 +491,7 @@
static void testLine18x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 12, 12, SkPathDirection::kCW);
path.addRect(12, 4, 21, 21, SkPathDirection::kCW);
testSimplify(reporter, path, filename);
@@ -506,7 +506,7 @@
static void testLine19x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 12, 12, SkPathDirection::kCW);
path.addRect(12, 16, 21, 21, SkPathDirection::kCW);
testSimplify(reporter, path, filename);
@@ -521,7 +521,7 @@
static void testLine20x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 12, 12, 12, SkPathDirection::kCW);
path.addRect(0, 12, 9, 9, SkPathDirection::kCW);
testSimplify(reporter, path, filename);
@@ -536,7 +536,7 @@
static void testLine21x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 12, 12, 12, SkPathDirection::kCW);
path.addRect(0, 16, 9, 9, SkPathDirection::kCW);
testSimplify(reporter, path, filename);
@@ -551,7 +551,7 @@
static void testLine22x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 12, 12, 12, SkPathDirection::kCW);
path.addRect(4, 12, 13, 13, SkPathDirection::kCW);
testSimplify(reporter, path, filename);
@@ -566,7 +566,7 @@
static void testLine23x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 12, 12, 12, SkPathDirection::kCW);
path.addRect(12, 0, 21, 21, SkPathDirection::kCW);
testSimplify(reporter, path, filename);
@@ -587,7 +587,7 @@
static void testLine24ax(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(2,0);
path.lineTo(4,4);
path.lineTo(0,4);
@@ -608,7 +608,7 @@
static void testLine24x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 18, 12, 12, SkPathDirection::kCW);
path.addRect(4, 12, 13, 13, SkPathDirection::kCW);
testSimplify(reporter, path, filename);
@@ -623,7 +623,7 @@
static void testLine25x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 6, 12, 12, SkPathDirection::kCW);
path.addRect(12, 0, 21, 21, SkPathDirection::kCW);
testSimplify(reporter, path, filename);
@@ -638,7 +638,7 @@
static void testLine26x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 18, 12, 12, SkPathDirection::kCW);
path.addRect(0, 12, 9, 9, SkPathDirection::kCW);
testSimplify(reporter, path, filename);
@@ -653,7 +653,7 @@
static void testLine27x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 18, 12, 12, SkPathDirection::kCW);
path.addRect(12, 8, 21, 21, SkPathDirection::kCW);
testSimplify(reporter, path, filename);
@@ -668,7 +668,7 @@
static void testLine28x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 6, 12, 12, SkPathDirection::kCW);
path.addRect(0, 0, 9, 9, SkPathDirection::kCW);
testSimplify(reporter, path, filename);
@@ -683,7 +683,7 @@
static void testLine29x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 18, 12, 12, SkPathDirection::kCW);
path.addRect(12, 12, 21, 21, SkPathDirection::kCW);
testSimplify(reporter, path, filename);
@@ -699,7 +699,7 @@
static void testLine30x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(0, 0, 12, 12, SkPathDirection::kCW);
path.addRect(4, 4, 13, 13, SkPathDirection::kCW);
@@ -716,7 +716,7 @@
static void testLine31x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(0, 0, 12, 12, SkPathDirection::kCW);
path.addRect(0, 4, 9, 9, SkPathDirection::kCW);
@@ -733,7 +733,7 @@
static void testLine32x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(0, 0, 12, 12, SkPathDirection::kCW);
path.addRect(4, 12, 13, 13, SkPathDirection::kCW);
@@ -750,7 +750,7 @@
static void testLine33x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(0, 0, 12, 12, SkPathDirection::kCW);
path.addRect(4, 16, 13, 13, SkPathDirection::kCW);
@@ -767,7 +767,7 @@
static void testLine34x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(0, 6, 12, 12, SkPathDirection::kCW);
path.addRect(4, 12, 13, 13, SkPathDirection::kCW);
@@ -784,7 +784,7 @@
static void testLine35x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(6, 0, 18, 18, SkPathDirection::kCW);
path.addRect(4, 16, 13, 13, SkPathDirection::kCW);
@@ -801,7 +801,7 @@
static void testLine36x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 10, 20, 20, SkPathDirection::kCW);
path.addRect(6, 12, 18, 18, SkPathDirection::kCW);
path.addRect(4, 16, 13, 13, SkPathDirection::kCW);
@@ -818,7 +818,7 @@
static void testLine37x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 20, 20, 20, SkPathDirection::kCW);
path.addRect(18, 24, 30, 30, SkPathDirection::kCW);
path.addRect(0, 0, 9, 9, SkPathDirection::kCW);
@@ -835,7 +835,7 @@
static void testLine38x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(10, 0, 30, 30, SkPathDirection::kCW);
path.addRect(6, 12, 18, 18, SkPathDirection::kCW);
path.addRect(12, 12, 21, 21, SkPathDirection::kCW);
@@ -852,7 +852,7 @@
static void testLine40x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(10, 0, 30, 30, SkPathDirection::kCW);
path.addRect(12, 18, 24, 24, SkPathDirection::kCW);
path.addRect(4, 16, 13, 13, SkPathDirection::kCW);
@@ -869,7 +869,7 @@
static void testLine41x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(18, 24, 30, 30, SkPathDirection::kCW);
path.addRect(12, 0, 21, 21, SkPathDirection::kCW);
@@ -886,7 +886,7 @@
static void testLine42x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(0, 0, 12, 12, SkPathDirection::kCW);
path.addRect(8, 16, 17, 17, SkPathDirection::kCW);
@@ -903,7 +903,7 @@
static void testLine43x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(6, 24, 18, 18, SkPathDirection::kCW);
path.addRect(0, 32, 9, 36, SkPathDirection::kCCW);
@@ -920,7 +920,7 @@
static void testLine44x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(10, 40, 30, 30, SkPathDirection::kCW);
path.addRect(18, 0, 30, 30, SkPathDirection::kCW);
path.addRect(18, 32, 27, 36, SkPathDirection::kCCW);
@@ -937,7 +937,7 @@
static void testLine45x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(10, 0, 30, 30, SkPathDirection::kCW);
path.addRect(18, 0, 30, 30, SkPathDirection::kCW);
path.addRect(24, 32, 33, 36, SkPathDirection::kCW);
@@ -954,7 +954,7 @@
static void testLine46x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(10, 40, 30, 30, SkPathDirection::kCW);
path.addRect(24, 0, 36, 36, SkPathDirection::kCW);
path.addRect(24, 32, 33, 36, SkPathDirection::kCW);
@@ -971,7 +971,7 @@
static void testLine47x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(0, 0, 12, 12, SkPathDirection::kCW);
path.addRect(0, 0, 9, 9, SkPathDirection::kCCW);
@@ -988,7 +988,7 @@
static void testLine48x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(0, 6, 12, 12, SkPathDirection::kCW);
path.addRect(0, 0, 9, 9, SkPathDirection::kCCW);
@@ -1005,7 +1005,7 @@
static void testLine49x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(0, 0, 12, 12, SkPathDirection::kCW);
path.addRect(0, 0, 9, 9, SkPathDirection::kCW);
@@ -1021,7 +1021,7 @@
static void testLine50x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(10, 30, 30, 30, SkPathDirection::kCW);
path.addRect(24, 20, 36, 30, SkPathDirection::kCW);
testSimplify(reporter, path, filename);
@@ -1037,7 +1037,7 @@
static void testLine51x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(0, 12, 12, 12, SkPathDirection::kCW);
path.addRect(4, 12, 13, 13, SkPathDirection::kCCW);
@@ -1054,7 +1054,7 @@
static void testLine52x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 30, 20, 20, SkPathDirection::kCW);
path.addRect(6, 20, 18, 30, SkPathDirection::kCW);
path.addRect(32, 0, 36, 41, SkPathDirection::kCW);
@@ -1071,7 +1071,7 @@
static void testLine53x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(10, 30, 30, 30, SkPathDirection::kCW);
path.addRect(12, 20, 24, 30, SkPathDirection::kCW);
path.addRect(12, 32, 21, 36, SkPathDirection::kCCW);
@@ -1088,7 +1088,7 @@
static void testLine54x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(6, 0, 18, 18, SkPathDirection::kCW);
path.addRect(8, 4, 17, 17, SkPathDirection::kCCW);
@@ -1105,7 +1105,7 @@
static void testLine55x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(6, 6, 18, 18, SkPathDirection::kCW);
path.addRect(4, 4, 13, 13, SkPathDirection::kCCW);
@@ -1122,7 +1122,7 @@
static void testLine56x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 20, 20, 20, SkPathDirection::kCW);
path.addRect(18, 20, 30, 30, SkPathDirection::kCW);
path.addRect(12, 0, 21, 21, SkPathDirection::kCCW);
@@ -1139,7 +1139,7 @@
static void testLine57x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(20, 0, 40, 40, SkPathDirection::kCW);
path.addRect(20, 0, 30, 40, SkPathDirection::kCW);
path.addRect(12, 0, 21, 21, SkPathDirection::kCCW);
@@ -1156,7 +1156,7 @@
static void testLine58x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(0, 0, 12, 12, SkPathDirection::kCCW);
path.addRect(0, 12, 9, 9, SkPathDirection::kCCW);
@@ -1173,7 +1173,7 @@
static void testLine59x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(6, 6, 18, 18, SkPathDirection::kCCW);
path.addRect(4, 4, 13, 13, SkPathDirection::kCCW);
@@ -1190,7 +1190,7 @@
static void testLine60x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(6, 12, 18, 18, SkPathDirection::kCCW);
path.addRect(4, 12, 13, 13, SkPathDirection::kCCW);
@@ -1207,7 +1207,7 @@
static void testLine61x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(12, 0, 24, 24, SkPathDirection::kCCW);
path.addRect(12, 0, 21, 21, SkPathDirection::kCCW);
@@ -1225,7 +1225,7 @@
static void testLine62x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 60, 60, SkPathDirection::kCW);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(0, 12, 12, 12, SkPathDirection::kCW);
@@ -1244,7 +1244,7 @@
static void testLine63x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 60, 60, SkPathDirection::kCW);
path.addRect(0, 10, 20, 20, SkPathDirection::kCW);
path.addRect(0, 6, 12, 12, SkPathDirection::kCCW);
@@ -1262,7 +1262,7 @@
static void testLine64x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 60, 60, SkPathDirection::kCW);
path.addRect(10, 40, 30, 30, SkPathDirection::kCW);
path.addRect(18, 6, 30, 30, SkPathDirection::kCW);
@@ -1280,7 +1280,7 @@
static void testLine65x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 60, 60, SkPathDirection::kCW);
path.addRect(10, 0, 30, 30, SkPathDirection::kCW);
path.addRect(24, 0, 36, 36, SkPathDirection::kCW);
@@ -1298,7 +1298,7 @@
static void testLine66x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 60, 60, SkPathDirection::kCW);
path.addRect(0, 30, 20, 20, SkPathDirection::kCW);
path.addRect(12, 20, 24, 30, SkPathDirection::kCW);
@@ -1316,7 +1316,7 @@
static void testLine67x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 60, 60, SkPathDirection::kCW);
path.addRect(10, 40, 30, 30, SkPathDirection::kCW);
path.addRect(24, 20, 36, 30, SkPathDirection::kCW);
@@ -1334,7 +1334,7 @@
static void testLine68ax(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 8, 8, SkPathDirection::kCW);
path.addRect(2, 2, 6, 6, SkPathDirection::kCW);
path.addRect(1, 2, 4, 2, SkPathDirection::kCW);
@@ -1351,7 +1351,7 @@
static void testLine68bx(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 8, 8, SkPathDirection::kCW);
path.addRect(2, 2, 6, 6, SkPathDirection::kCCW);
path.addRect(1, 2, 2, 2, SkPathDirection::kCW);
@@ -1368,7 +1368,7 @@
static void testLine68cx(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 8, 8, SkPathDirection::kCCW);
path.addRect(2, 2, 6, 6, SkPathDirection::kCW);
path.addRect(1, 2, 4, 2, SkPathDirection::kCW);
@@ -1385,7 +1385,7 @@
static void testLine68dx(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 8, 8, SkPathDirection::kCCW);
path.addRect(2, 2, 6, 6, SkPathDirection::kCCW);
path.addRect(1, 2, 4, 2, SkPathDirection::kCW);
@@ -1403,7 +1403,7 @@
static void testLine68ex(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 8, 8, SkPathDirection::kCW);
path.addRect(0, 0, 8, 8, SkPathDirection::kCW);
path.addRect(2, 2, 6, 6, SkPathDirection::kCCW);
@@ -1422,7 +1422,7 @@
static void testLine68fx(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 8, 8, SkPathDirection::kCW);
path.addRect(2, 2, 6, 6, SkPathDirection::kCCW);
path.addRect(2, 2, 6, 6, SkPathDirection::kCCW);
@@ -1442,7 +1442,7 @@
static void testLine68gx(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 8, 8, SkPathDirection::kCW);
path.addRect(0, 0, 8, 8, SkPathDirection::kCW);
path.addRect(2, 2, 6, 6, SkPathDirection::kCCW);
@@ -1463,7 +1463,7 @@
static void testLine68hx(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 8, 8, SkPathDirection::kCW);
path.addRect(2, 2, 6, 6, SkPathDirection::kCCW);
path.addRect(2, 2, 6, 6, SkPathDirection::kCCW);
@@ -1482,7 +1482,7 @@
static void testLine69x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 20, 20, 20, SkPathDirection::kCW);
path.addRect(0, 20, 12, 30, SkPathDirection::kCW);
path.addRect(12, 32, 21, 36, SkPathDirection::kCW);
@@ -1499,7 +1499,7 @@
static void testLine70x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(0, 24, 12, 12, SkPathDirection::kCW);
path.addRect(12, 32, 21, 36, SkPathDirection::kCCW);
@@ -1516,7 +1516,7 @@
static void testLine71x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 20, 20, SkPathDirection::kCW);
path.addRect(12, 0, 24, 24, SkPathDirection::kCW);
path.addRect(12, 32, 21, 36, SkPathDirection::kCW);
@@ -1533,7 +1533,7 @@
static void testLine72x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 60, 60, SkPathDirection::kCW);
path.addRect(10, 40, 30, 30, SkPathDirection::kCW);
path.addRect(6, 20, 18, 30, SkPathDirection::kCW);
@@ -1551,7 +1551,7 @@
static void testLine73x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 60, 60, SkPathDirection::kCW);
path.addRect(0, 40, 20, 20, SkPathDirection::kCW);
path.addRect(0, 20, 12, 30, SkPathDirection::kCW);
@@ -1569,7 +1569,7 @@
static void testLine74x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(20, 30, 40, 40, SkPathDirection::kCW);
path.addRect(24, 20, 36, 30, SkPathDirection::kCCW);
path.addRect(32, 24, 36, 41, SkPathDirection::kCCW);
@@ -1587,7 +1587,7 @@
static void testLine75x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 60, 60, SkPathDirection::kCW);
path.addRect(10, 0, 30, 30, SkPathDirection::kCCW);
path.addRect(18, 0, 30, 30, SkPathDirection::kCCW);
@@ -1606,7 +1606,7 @@
static void testLine76x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(36, 0, 66, 60, SkPathDirection::kCW);
path.addRect(10, 20, 40, 30, SkPathDirection::kCW);
path.addRect(24, 20, 36, 30, SkPathDirection::kCCW);
@@ -1624,7 +1624,7 @@
static void testLine77x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(20, 0, 40, 40, SkPathDirection::kCW);
path.addRect(24, 6, 36, 36, SkPathDirection::kCCW);
path.addRect(24, 32, 33, 36, SkPathDirection::kCCW);
@@ -1642,7 +1642,7 @@
static void testLine78x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 30, 60, SkPathDirection::kCW);
path.addRect(10, 20, 30, 30, SkPathDirection::kCCW);
path.addRect(18, 20, 30, 30, SkPathDirection::kCCW);
@@ -1661,7 +1661,7 @@
static void testLine79x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 36, 60, 30, SkPathDirection::kCW);
path.addRect(10, 30, 40, 30, SkPathDirection::kCW);
path.addRect(0, 20, 12, 30, SkPathDirection::kCCW);
@@ -1694,7 +1694,7 @@
static void testDegenerate1x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(0, 0);
path.lineTo(2, 0);
@@ -1721,7 +1721,7 @@
static void testDegenerate2x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(0, 0);
path.lineTo(0, 0);
@@ -1748,7 +1748,7 @@
static void testDegenerate3x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(2, 0);
path.lineTo(1, 0);
@@ -1775,7 +1775,7 @@
static void testDegenerate4x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(1, 0);
path.lineTo(1, 3);
@@ -1802,7 +1802,7 @@
static void testNondegenerate1x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(3, 0);
path.lineTo(1, 3);
@@ -1829,7 +1829,7 @@
static void testNondegenerate2x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1, 0);
path.lineTo(0, 1);
path.lineTo(1, 1);
@@ -1856,7 +1856,7 @@
static void testNondegenerate3x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(1, 0);
path.lineTo(2, 1);
@@ -1883,7 +1883,7 @@
static void testNondegenerate4x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1, 0);
path.lineTo(0, 1);
path.lineTo(1, 2);
@@ -1912,7 +1912,7 @@
static void testQuadralateral5x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(0, 0);
path.lineTo(1, 0);
@@ -1943,7 +1943,7 @@
static void testQuadralateral6x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(0, 0);
path.lineTo(1, 0);
@@ -1976,7 +1976,7 @@
static void testFauxQuadralateral6x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(1, 0);
path.lineTo(1, 1);
@@ -2011,7 +2011,7 @@
static void testFauxQuadralateral6ax(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(3, 0);
path.lineTo(3, 3);
@@ -2046,7 +2046,7 @@
static void testFauxQuadralateral6bx(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(3, 0);
path.lineTo(3, 3);
@@ -2081,7 +2081,7 @@
static void testFauxQuadralateral6cx(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(3, 3);
path.lineTo(3, 0);
@@ -2116,7 +2116,7 @@
static void testFauxQuadralateral6dx(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(3, 3);
path.lineTo(3, 0);
@@ -2149,7 +2149,7 @@
static void testQuadralateral6ax(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(0, 0);
path.lineTo(3, 0);
@@ -2180,7 +2180,7 @@
static void testQuadralateral7x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(0, 0);
path.lineTo(1, 0);
@@ -2211,7 +2211,7 @@
static void testQuadralateral8x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(3, 1);
path.lineTo(1, 3);
@@ -2242,7 +2242,7 @@
static void testQuadralateral9x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(1, 0);
path.lineTo(1, 2);
@@ -2258,7 +2258,7 @@
static void testLine1a(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.addRect(0, 0, 12, 12, SkPathDirection::kCW);
path.addRect(4, 0, 13, 13, SkPathDirection::kCCW);
testSimplify(reporter, path, filename);
@@ -2266,7 +2266,7 @@
static void testLine1ax(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 12, 12, SkPathDirection::kCW);
path.addRect(4, 0, 13, 13, SkPathDirection::kCCW);
testSimplify(reporter, path, filename);
@@ -2274,7 +2274,7 @@
static void testLine2ax(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 20, 20, 20, SkPathDirection::kCW);
path.addRect(0, 20, 12, 30, SkPathDirection::kCW);
path.addRect(12, 0, 21, 21, SkPathDirection::kCCW);
@@ -2283,7 +2283,7 @@
static void testLine3aax(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(10, 30, 30, 30, SkPathDirection::kCW);
path.addRect(18, 20, 30, 30, SkPathDirection::kCCW);
path.addRect(0, 32, 9, 36, SkPathDirection::kCCW);
@@ -2292,7 +2292,7 @@
static void testLine4ax(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(10, 30, 30, 30, SkPathDirection::kCW);
path.addRect(24, 20, 36, 30, SkPathDirection::kCCW);
path.addRect(0, 32, 9, 36, SkPathDirection::kCCW);
@@ -2314,7 +2314,7 @@
static void testQuadratic1x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.quadTo(0, 0, 0, 0);
path.lineTo(1, 0);
@@ -2341,7 +2341,7 @@
static void testQuadratic2x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.quadTo(0, 0, 0, 0);
path.lineTo(3, 0);
@@ -2368,7 +2368,7 @@
static void testQuadratic3x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.quadTo(0, 0, 1, 0);
path.lineTo(0, 2);
@@ -2395,7 +2395,7 @@
static void testQuadratic4x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.quadTo(0, 0, 1, 0);
path.lineTo(0, 2);
@@ -2501,7 +2501,7 @@
static void testQuadratic17x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.quadTo(0, 0, 3, 1);
path.lineTo(0, 2);
@@ -2892,7 +2892,7 @@
static void testQuadratic59x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.quadTo(0, 0, 0, 0);
path.lineTo(2, 2);
@@ -2906,7 +2906,7 @@
static void testQuadratic59(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 0);
path.quadTo(0, 0, 0, 0);
path.lineTo(2, 2);
@@ -2959,7 +2959,7 @@
static void testQuadratic67x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.quadTo(0, 0, 2, 1);
path.lineTo(2, 2);
@@ -3000,7 +3000,7 @@
static void testQuadratic70x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.quadTo(1, 0, 0, 1);
path.lineTo(1, 2);
@@ -3348,7 +3348,7 @@
static void testQuadratic89x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.quadTo(3, 1, 2, 2);
path.lineTo(0, 3);
@@ -3362,7 +3362,7 @@
static void testQuadratic90x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.quadTo(3, 0, 2, 2);
path.lineTo(1, 3);
@@ -3389,7 +3389,7 @@
static void testQuadratic92x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1, 0);
path.quadTo(3, 0, 2, 2);
path.lineTo(2, 2);
@@ -3492,7 +3492,7 @@
static void testLine84x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 12, 60, 30, SkPathDirection::kCCW);
path.addRect(10, 20, 40, 30, SkPathDirection::kCCW);
path.addRect(0, 12, 12, 12, SkPathDirection::kCCW);
@@ -3814,7 +3814,7 @@
static void skphealth_com76s(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(708.099182f, 7.09919119f);
path.lineTo(708.099182f, 7.09920025f);
path.quadTo(704.000000f, 11.2010098f, 704.000000f, 17.0000000f);
@@ -3856,7 +3856,7 @@
static void testRect2s(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 0);
path.lineTo(60, 0);
path.lineTo(60, 60);
@@ -3882,7 +3882,7 @@
static void testTriangles3x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1, 0);
path.quadTo(0, 1, 3, 2);
path.lineTo(1, 3);
@@ -3909,7 +3909,7 @@
static void testTriangles4x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.quadTo(2, 0, 0, 3);
path.lineTo(2, 3);
@@ -3923,7 +3923,7 @@
static void testQuad9(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1, 0);
path.quadTo(0, 1, 3, 2);
path.lineTo(1, 3);
@@ -3976,7 +3976,7 @@
static void testQuadralateral3(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.lineTo(0, 0);
path.lineTo(0, 0);
@@ -4047,7 +4047,7 @@
static void testQuad14(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 0);
path.quadTo(0, 0, 1, 1);
path.lineTo(1, 2);
@@ -4349,7 +4349,7 @@
static void testQuads37(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1, 0);
path.quadTo(2, 0, 1, 2);
path.lineTo(2, 2);
@@ -4512,7 +4512,7 @@
static void testQuads46x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(2, 0);
path.quadTo(0, 1, 3, 2);
path.lineTo(1, 3);
@@ -4643,7 +4643,7 @@
static void testQuads61(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 0);
path.quadTo(0, 0, 2, 0);
path.lineTo(1, 1);
@@ -4657,7 +4657,7 @@
static void testQuadralateral10(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(0, 0);
path.lineTo(0, 0);
path.lineTo(0, 0);
@@ -4673,7 +4673,7 @@
static void testRect3(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 60, 60, SkPathDirection::kCCW);
path.addRect(10, 30, 40, 30, SkPathDirection::kCCW);
path.addRect(24, 6, 36, 36, SkPathDirection::kCCW);
@@ -4683,7 +4683,7 @@
static void testRect4(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.addRect(0, 0, 30, 60, SkPathDirection::kCCW);
path.addRect(10, 0, 40, 30, SkPathDirection::kCCW);
path.addRect(20, 0, 30, 40, SkPathDirection::kCCW);
@@ -4897,7 +4897,7 @@
static void fuzz994s_11(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x41200000), SkBits2Float(0x42b40000)); // 10, 90
path.lineTo(SkBits2Float(0x41200000), SkBits2Float(0x42b40000)); // 10, 90
path.lineTo(SkBits2Float(0x41200000), SkBits2Float(0x41f00000)); // 10, 30
@@ -4963,7 +4963,7 @@
static void fuzz994s_3414(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42c80000), SkBits2Float(0x42480000)); // 100, 50
path.conicTo(SkBits2Float(0x42c80000), SkBits2Float(0x00000000), SkBits2Float(0x42480000), SkBits2Float(0x00000000), SkBits2Float(0x3f3504f3)); // 100, 0, 50, 0, 0.707107f
path.conicTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000), SkBits2Float(0x00000000), SkBits2Float(0x42480000), SkBits2Float(0x3f3504f3)); // 0, 0, 0, 50, 0.707107f
@@ -5000,7 +5000,7 @@
static void fuzz_twister(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(0, 600);
path.lineTo(3.35544e+07f, 600);
path.lineTo(3.35544e+07f, 0);
@@ -5061,7 +5061,7 @@
static void fuzz763_4713_b(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42240000), SkBits2Float(0x42040000));
path.quadTo(SkBits2Float(0x42240000), SkBits2Float(0x4211413d), SkBits2Float(0x421aa09e), SkBits2Float(0x421aa09e));
path.quadTo(SkBits2Float(0x4211413d), SkBits2Float(0x42240000), SkBits2Float(0x42040000), SkBits2Float(0x42240000));
@@ -5553,7 +5553,7 @@
static void tiger8_393(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42b93333), SkBits2Float(0x43d5a666)); // 92.6f, 427.3f
path.cubicTo(SkBits2Float(0x42b93333), SkBits2Float(0x43d5a666), SkBits2Float(0x42b5cccd), SkBits2Float(0x43da1999), SkBits2Float(0x42b80000), SkBits2Float(0x43ddf333)); // 92.6f, 427.3f, 90.9f, 436.2f, 92, 443.9f
path.cubicTo(SkBits2Float(0x42b80000), SkBits2Float(0x43ddf333), SkBits2Float(0x42b30000), SkBits2Float(0x43e17333), SkBits2Float(0x42cf999a), SkBits2Float(0x43e1b333)); // 92, 443.9f, 89.5f, 450.9f, 103.8f, 451.4f
@@ -5565,7 +5565,7 @@
// triggers angle assert from distance field code
static void carsvg_1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4393d61e), SkBits2Float(0x43e768f9)); // 295.673f, 462.82f
path.cubicTo(SkBits2Float(0x4396b50e), SkBits2Float(0x43e63c20), SkBits2Float(0x43998931), SkBits2Float(0x43e6c43e), SkBits2Float(0x439cb6a8), SkBits2Float(0x43e70ef9)); // 301.414f, 460.47f, 307.072f, 461.533f, 313.427f, 462.117f
path.cubicTo(SkBits2Float(0x439dfc1e), SkBits2Float(0x43e72ce0), SkBits2Float(0x439a285c), SkBits2Float(0x43e717fb), SkBits2Float(0x4398e23c), SkBits2Float(0x43e7027c)); // 315.97f, 462.351f, 308.315f, 462.187f, 305.767f, 462.019f
@@ -5584,7 +5584,7 @@
static void simplifyTest_1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x42bfefd4), SkBits2Float(0x42ef80ef)); // 95.9684f, 119.752f
path.quadTo(SkBits2Float(0x42c26810), SkBits2Float(0x42e214b8), SkBits2Float(0x42cdcad5), SkBits2Float(0x42d82aa2)); // 97.2032f, 113.04f, 102.896f, 108.083f
path.lineTo(SkBits2Float(0x42cdcb21), SkBits2Float(0x42d82a61)); // 102.897f, 108.083f
@@ -5629,7 +5629,7 @@
static void joel_1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(144.859f, 285.172f);
path.lineTo(144.859f, 285.172f);
path.lineTo(144.859f, 285.172f);
@@ -5686,7 +5686,7 @@
static void joel_2(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(403.283f, 497.197f);
path.cubicTo(403.424f, 497.244f, 391.111f, 495.556f, 391.111f, 495.556f);
@@ -5721,7 +5721,7 @@
static void joel_3(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(391.097f, 334.453f);
path.lineTo(390.761f, 334.617f);
path.lineTo(390.425f, 333.937f);
@@ -5784,7 +5784,7 @@
static void joel_4(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4199d4fe), SkBits2Float(0x4265ac08)); // 19.229f, 57.418f
path.cubicTo(SkBits2Float(0x419be979), SkBits2Float(0x426574bc), SkBits2Float(0x419c2b02), SkBits2Float(0x42653c6a), SkBits2Float(0x419af5c3), SkBits2Float(0x42645f3b)); // 19.489f, 57.364f, 19.521f, 57.309f, 19.37f, 57.093f
path.cubicTo(SkBits2Float(0x419a1894), SkBits2Float(0x4263a3d7), SkBits2Float(0x4198cccd), SkBits2Float(0x4262f2b0), SkBits2Float(0x4197c290), SkBits2Float(0x4262374b)); // 19.262f, 56.91f, 19.1f, 56.737f, 18.97f, 56.554f
@@ -6538,7 +6538,7 @@
static void joel_5(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x43c5145a), SkBits2Float(0x43dc82f2)); // 394.159f, 441.023f
path.lineTo(SkBits2Float(0x43c5145a), SkBits2Float(0x43dc82f2)); // 394.159f, 441.023f
path.close();
@@ -7163,7 +7163,7 @@
static void joel_12x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
make_joel_12(path);
testSimplify(reporter, path, filename);
}
@@ -7186,7 +7186,7 @@
static void joel_13x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
make_joel_13(path);
testSimplify(reporter, path, filename);
}
@@ -7384,7 +7384,7 @@
static void joel_14x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
make_joel_14(path);
testSimplify(reporter, path, filename);
}
@@ -7540,7 +7540,7 @@
static void joel_15x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
make_joel_15(path);
testSimplify(reporter, path, filename);
}
@@ -7678,7 +7678,7 @@
static void joel_16x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
make_joel_16(path);
testSimplify(reporter, path, filename);
}
@@ -7698,7 +7698,7 @@
static void grshapearc(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
-path.setFillType(SkPathFillType::kWinding);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(25.0098f, 23.1973f);
path.lineTo(25.5689f, 22.3682f);
path.conicTo(26.1281f, 21.5392f, 26.9572f, 22.0984f, 0.707107f);
@@ -9273,7 +9273,7 @@
static void bug8249(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
-path.setFillType(SkPathFillType::kWinding);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x43310000), SkBits2Float(0x43810000)); // 177, 258
path.lineTo(SkBits2Float(0x43480000), SkBits2Float(0x43868000)); // 200, 269
path.cubicTo(SkBits2Float(0x43480000), SkBits2Float(0x43b20000), SkBits2Float(0x437a0000), SkBits2Float(0x43cd0000), SkBits2Float(0x43c80000), SkBits2Float(0x43cd0000)); // 200, 356, 250, 410, 400, 410
@@ -9300,7 +9300,7 @@
static void bug8290(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(-1e+09, -1e+09);
path.lineTo(1e+09, -1e+09);
path.lineTo(1e+09, 1e+09);
diff --git a/tests/PathOpsSimplifyTrianglesThreadedTest.cpp b/tests/PathOpsSimplifyTrianglesThreadedTest.cpp
index d9bdb53..52f0a84 100644
--- a/tests/PathOpsSimplifyTrianglesThreadedTest.cpp
+++ b/tests/PathOpsSimplifyTrianglesThreadedTest.cpp
@@ -35,6 +35,7 @@
}
SkString pathStr;
SkPath path, out;
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkIntToScalar(ax), SkIntToScalar(ay));
path.lineTo(SkIntToScalar(bx), SkIntToScalar(by));
path.lineTo(SkIntToScalar(cx), SkIntToScalar(cy));
@@ -52,13 +53,13 @@
pathStr.appendf(" path.lineTo(%d, %d);\n", ex, ey);
pathStr.appendf(" path.lineTo(%d, %d);\n", fx, fy);
pathStr.appendf(" path.close();\n");
- state.outputProgress(pathStr.c_str(), SkPathFillType::kWinding);
+ state.outputProgress(pathStr.c_str(), SkPath::kWinding_FillType);
}
ShowTestName(&state, d, e, f, 0);
testSimplify(path, false, out, state, pathStr.c_str());
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
if (state.fReporter->verbose()) {
- state.outputProgress(pathStr.c_str(), SkPathFillType::kEvenOdd);
+ state.outputProgress(pathStr.c_str(), SkPath::kEvenOdd_FillType);
}
ShowTestName(&state, d, e, f, 1);
testSimplify(path, true, out, state, pathStr.c_str());
diff --git a/tests/PathOpsSkpTest.cpp b/tests/PathOpsSkpTest.cpp
index dd0c9ac..efbe0e5 100644
--- a/tests/PathOpsSkpTest.cpp
+++ b/tests/PathOpsSkpTest.cpp
@@ -10,7 +10,7 @@
static void skpcheeseandburger_com225(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(555, 468);
path.lineTo(555, 362);
path.lineTo(872, 362);
@@ -18,7 +18,7 @@
path.lineTo(555, 468);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(859.11792f, 397.320343f);
pathB.cubicTo(855.523071f, 399.691284f, 853.721191f, 402.40863f, 853.721191f, 405.552216f);
pathB.cubicTo(853.721191f, 407.911163f, 854.727478f, 410.115387f, 857.043518f, 412.252716f);
@@ -371,7 +371,7 @@
static void skpeverytechpro_blogspot_com100(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1074.29285f, 627.292786f);
path.quadTo(1074.58582f, 627, 1075, 627);
path.lineTo(1117, 627);
@@ -395,7 +395,7 @@
path.lineTo(1076, 629);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1074, 627);
pathB.lineTo(1075, 628);
pathB.lineTo(1116.5f, 644.5f);
@@ -405,7 +405,7 @@
static void skpflite_com41(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(301.464081f, 424);
path.lineTo(296, 433.46405f);
path.lineTo(296, 433.810822f);
@@ -417,7 +417,7 @@
path.lineTo(301.464081f, 424);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(302.849854f, 421.599762f);
pathB.lineTo(311.510101f, 426.599762f);
pathB.lineTo(304.510101f, 438.724121f);
@@ -428,7 +428,7 @@
static void skpilkoora_com37(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(818, 157);
path.cubicTo(818, 148.715729f, 824.715698f, 142, 833, 142);
path.lineTo(909, 142);
@@ -450,7 +450,7 @@
path.lineTo(1184, 926);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1185, 142);
pathB.lineTo(1001.5f, 325.5f);
pathB.lineTo(1001.5f, 782.5f);
@@ -460,7 +460,7 @@
static void skpmm4everfriends_com43(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(540.74231f, 215.922546f);
path.cubicTo(540.893127f, 215.391159f, 541.443909f, 215.090134f, 541.972473f, 215.250168f);
path.lineTo(581.213318f, 227.131104f);
@@ -472,7 +472,7 @@
path.lineTo(540.74231f, 215.922546f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(541.015381f, 214.960388f);
pathB.lineTo(582.17041f, 227.420883f);
pathB.lineTo(576.435852f, 247.626068f);
@@ -483,7 +483,7 @@
static void skpmtrk_uz27(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(33, 787);
path.lineTo(33, 412);
path.lineTo(1233, 412);
@@ -495,7 +495,7 @@
path.quadTo(33, 793.213196f, 33, 787);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(33, 412);
pathB.lineTo(1233, 412);
pathB.lineTo(1233, 787);
@@ -510,7 +510,7 @@
static void skpfrauen_magazin_com83(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(808, 886);
path.cubicTo(805.581055f, 886, 803.563293f, 887.717773f, 803.100037f, 890);
path.lineTo(1122.90002f, 890);
@@ -518,7 +518,7 @@
path.lineTo(808, 886);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(808, 886);
pathB.lineTo(1118, 886);
pathB.cubicTo(1120.76147f, 886, 1123, 888.238586f, 1123, 891);
@@ -534,7 +534,7 @@
static void skpi_gino_com16(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(184, 734);
path.quadTo(133.051727f, 734, 97.0258636f, 770.025879f);
path.quadTo(61, 806.051758f, 61, 857);
@@ -545,7 +545,7 @@
path.quadTo(234.948273f, 734, 184, 734);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(185, 734);
pathB.cubicTo(252.93103f, 734, 308, 789.06897f, 308, 857);
pathB.cubicTo(308, 924.93103f, 252.93103f, 980, 185, 980);
@@ -559,7 +559,7 @@
static void skppchappy_com_au102(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(363, 493);
path.cubicTo(360.790863f, 493, 359, 494.790863f, 359, 497);
path.lineTo(359, 656);
@@ -571,7 +571,7 @@
path.lineTo(363, 493);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(362, 494);
pathB.lineTo(623, 494);
pathB.cubicTo(624.65686f, 494, 626, 494.895416f, 626, 496);
@@ -587,7 +587,7 @@
static void skpsciality_com161(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(656, 728);
path.cubicTo(653.790833f, 728, 652, 729.790833f, 652, 732);
path.lineTo(652, 789);
@@ -599,7 +599,7 @@
path.lineTo(656, 728);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(655, 729);
pathB.lineTo(769, 729);
pathB.cubicTo(770.65686f, 729, 772, 729.895447f, 772, 731);
@@ -615,7 +615,7 @@
static void skpsudoestenegocios_com186(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 495);
path.lineTo(1.23685242e-14f, 293);
path.lineTo(44, 293);
@@ -635,7 +635,7 @@
path.lineTo(1, 294);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(48, 495);
pathB.lineTo(24, 471);
pathB.lineTo(24, 317);
@@ -645,7 +645,7 @@
static void skpthesuburbanite_com213(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(863.439026f, 692);
path.lineTo(863.283264f, 692);
path.lineTo(802, 708.420837f);
@@ -655,7 +655,7 @@
path.lineTo(863.439026f, 692);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(783.256775f, 713.443054f);
pathB.lineTo(863.428589f, 691.96106f);
pathB.lineTo(866.016724f, 701.620361f);
@@ -666,7 +666,7 @@
static void skphostloco_com11(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(6.66133815e-16f, 648);
path.lineTo(25.8522835f, 648);
path.quadTo(27.5087376f, 647.999634f, 28.6807098f, 646.82843f);
@@ -678,7 +678,7 @@
path.lineTo(6.66133815e-16f, 648);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(0, 463);
pathB.lineTo(30, 463);
pathB.lineTo(30, 648);
@@ -689,7 +689,7 @@
static void skpsergeychunkevich_com8(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 926);
path.lineTo(0, 0);
path.lineTo(1265, 0);
@@ -697,7 +697,7 @@
path.lineTo(0, 926);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(37, 374);
pathB.lineTo(37, 535);
pathB.cubicTo(37, 536.65686f, 35.6568565f, 538, 34, 538);
@@ -711,7 +711,7 @@
static void skptracksflow_com9(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(16, 56);
path.lineTo(32, 56);
path.lineTo(32, 72);
@@ -719,7 +719,7 @@
path.lineTo(16, 56);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(31.65625f, 70.0555649f);
pathB.lineTo(31.65625f, 70.0554962f);
pathB.lineTo(26.9727192f, 65.3615341f);
@@ -745,7 +745,7 @@
static void skpautobutler_dk29(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 926);
path.lineTo(0, 0);
path.lineTo(1265, 0);
@@ -753,7 +753,7 @@
path.lineTo(0, 926);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(21, 162);
pathB.lineTo(21, 301);
pathB.lineTo(8.57224448e-15f, 301);
@@ -764,7 +764,7 @@
static void skponlinecollege_org144(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(179, 407);
path.cubicTo(177.34314f, 407, 176, 408.34314f, 176, 410);
path.lineTo(176, 436);
@@ -776,7 +776,7 @@
path.lineTo(179, 407);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(179, 408);
pathB.lineTo(337, 408);
pathB.cubicTo(338.65686f, 408, 340, 408.895416f, 340, 410);
@@ -792,7 +792,7 @@
static void skpnational_com_au81(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(807, 817);
path.quadTo(806.585876f, 817.000122f, 806.292908f, 817.292908f);
path.quadTo(806.000122f, 817.585876f, 806, 818);
@@ -804,7 +804,7 @@
path.lineTo(807, 817);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(807, 817);
pathB.lineTo(1110, 817);
pathB.cubicTo(1110.55225f, 817, 1111, 817.447693f, 1111, 818);
@@ -818,7 +818,7 @@
static void skprentacheat_com30(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(967, 263);
path.quadTo(966.585876f, 263.000092f, 966.292908f, 263.292908f);
path.quadTo(966.000122f, 263.585876f, 966, 264);
@@ -830,7 +830,7 @@
path.lineTo(967, 263);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(967, 263);
pathB.lineTo(1213, 263);
pathB.cubicTo(1213.55225f, 263, 1214, 263.447723f, 1214, 264);
@@ -844,7 +844,7 @@
static void skpbreakmystyle_com10(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(271.032867f, -5.32907052e-15f);
path.lineTo(56.9671326f, -5.16253706e-15f);
path.quadTo(52.7835083f, 3.69968891f, 48.7416f, 7.74160004f);
@@ -857,7 +857,7 @@
path.quadTo(275.216431f, 3.69964004f, 271.032867f, -5.32907052e-15f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(327, 123);
pathB.quadTo(327, 190.516815f, 279.258392f, 238.258392f);
pathB.quadTo(231.516815f, 286, 164, 286);
@@ -873,7 +873,7 @@
static void skpsd_graphic_net104(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(475.421448f, 836.985962f);
path.lineTo(461.280975f, 841.990662f);
path.cubicTo(466.80899f, 857.609802f, 458.62854f, 874.752991f, 443.009399f, 880.281006f);
@@ -888,7 +888,7 @@
path.quadTo(477.528076f, 842.93811f, 475.421448f, 836.985962f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(405.592621f, 909.435547f);
pathB.lineTo(390.578583f, 867.014099f);
pathB.lineTo(433, 852.000061f);
@@ -898,7 +898,7 @@
static void skpnaoxrane_ru23(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(458.703552f, 275.050262f);
path.quadTo(487.41687f, 273.000702f, 528, 273);
path.lineTo(529, 273);
@@ -914,7 +914,7 @@
path.quadTo(430.009796f, 277.101196f, 458.703552f, 275.050262f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(528, 278);
pathB.lineTo(529, 278);
pathB.cubicTo(530.65686f, 278, 532, 278, 532, 278);
@@ -930,7 +930,7 @@
static void skptcmevents_org23(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(465.503998f, 546);
path.lineTo(347, 546);
path.lineTo(347, 632);
@@ -942,7 +942,7 @@
path.quadTo(465.670349f, 546.601501f, 465.503998f, 546);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(363.052246f, 542.495361f);
pathB.lineTo(463.779907f, 542.671143f);
pathB.cubicTo(464.829529f, 542.672974f, 466.946289f, 550.755676f, 468.507751f, 560.724426f);
@@ -958,7 +958,7 @@
static void skpredbullskatearcade_es16(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(936.765625f, 458.965302f);
path.cubicTo(937.028442f, 453.863251f, 933.145813f, 449.864502f, 928.093445f, 450.033905f);
path.lineTo(661.882263f, 458.958862f);
@@ -973,7 +973,7 @@
path.lineTo(936.765625f, 458.965302f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(661.882263f, 458.958862f);
pathB.lineTo(928.093445f, 450.033905f);
pathB.cubicTo(929.103882f, 450, 929.709961f, 454.108612f, 929.447144f, 459.210663f);
@@ -989,7 +989,7 @@
static void skpfinanzasdigital_com9(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(156, 126);
path.quadTo(154.343552f, 126.000397f, 153.17157f, 127.17157f);
path.quadTo(152.000397f, 128.343552f, 152, 130);
@@ -1001,7 +1001,7 @@
path.lineTo(156, 126);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(156, 126);
pathB.lineTo(1110, 126);
pathB.cubicTo(1111.65686f, 126, 1113, 127.790863f, 1113, 130);
@@ -1015,7 +1015,7 @@
static void skppartainasdemo250_org56(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(182.000015f, 645);
path.lineTo(182, 640);
path.cubicTo(174.322327f, 640, 166.644669f, 637.071045f, 160.786804f, 631.213196f);
@@ -1028,7 +1028,7 @@
path.quadTo(167.517334f, 645, 182.000015f, 645);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(182, 659.497498f);
pathB.lineTo(206.748749f, 634.748718f);
pathB.lineTo(182.000015f, 610);
@@ -1038,7 +1038,7 @@
static void skpmlk_com326(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(154, 670);
path.cubicTo(151.238571f, 670, 149, 672.238586f, 149, 675);
path.lineTo(149, 710.001465f);
@@ -1050,7 +1050,7 @@
path.lineTo(154, 670);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(154, 671);
pathB.lineTo(188, 671);
pathB.cubicTo(190.761429f, 671, 193, 672.790833f, 193, 675);
@@ -1066,7 +1066,7 @@
static void skpcyclist_friends_gr52(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(50, 182);
path.lineTo(1215, 182);
path.lineTo(1215, 202);
@@ -1078,7 +1078,7 @@
path.lineTo(50, 182);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(50, 183);
pathB.lineTo(1215, 183);
pathB.lineTo(1215, 202);
@@ -1092,7 +1092,7 @@
static void skpwww_fj_p_com_22(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(172, 201);
path.lineTo(172, 202);
path.lineTo(220, 202);
@@ -1101,7 +1101,7 @@
path.lineTo(172, 201);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(161, 202);
pathB.lineTo(161, 199);
pathB.lineTo(223, 199.000015f);
@@ -1111,7 +1111,7 @@
static void skpwww_lavoixdunord_fr_11(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(806, 57);
path.cubicTo(806, 55.3431473f, 807.34314f, 54, 809, 54);
path.lineTo(930, 54);
@@ -1133,7 +1133,7 @@
path.lineTo(808, 58);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(806, 54);
pathB.lineTo(808, 56);
pathB.lineTo(935.02002f, 56.0200005f);
@@ -1143,7 +1143,7 @@
static void skppptv_com_62(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(173, 5342);
path.quadTo(171.343536f, 5342.00049f, 170.17157f, 5343.17139f);
path.quadTo(169.000397f, 5344.34375f, 169, 5346);
@@ -1155,7 +1155,7 @@
path.lineTo(173, 5342);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(173, 5342);
pathB.lineTo(230, 5342);
pathB.cubicTo(231.65686f, 5342, 233, 5343.79102f, 233, 5346);
@@ -1169,7 +1169,7 @@
static void skpwww_booking_com_68(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(90, 187);
path.cubicTo(90, 185.34314f, 91.3431473f, 184, 93, 184);
path.lineTo(588, 184);
@@ -1191,7 +1191,7 @@
path.lineTo(92, 188);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(90, 184);
pathB.lineTo(92, 186);
pathB.lineTo(593.02002f, 186.020004f);
@@ -1201,7 +1201,7 @@
static void skpwww_despegar_com_mx_272(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(635, 1788);
path.cubicTo(635, 1786.34314f, 636.34314f, 1785, 638, 1785);
path.lineTo(832, 1785);
@@ -1223,7 +1223,7 @@
path.lineTo(637, 1789);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(835, 1785);
pathB.lineTo(833, 1787);
pathB.lineTo(832.97998f, 1817.02002f);
@@ -1233,7 +1233,7 @@
static void skpwww_joomla_org_23(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(320, 347);
path.cubicTo(320, 344.238586f, 322.238586f, 342, 325, 342);
path.lineTo(416, 342);
@@ -1251,7 +1251,7 @@
path.cubicTo(322.238586f, 382, 320, 380.209137f, 320, 378);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(320, 383);
pathB.lineTo(320, 378);
pathB.lineTo(421, 378.000031f);
@@ -1261,7 +1261,7 @@
static void skpwww_macrumors_com_131(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(136, 14089);
path.lineTo(136, 14056);
path.lineTo(778, 14056);
@@ -1273,7 +1273,7 @@
path.quadTo(136.000397f, 14090.6562f, 136, 14089);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(136, 14057);
pathB.lineTo(778, 14057);
pathB.lineTo(778, 14089);
@@ -1287,7 +1287,7 @@
static void skpwww_leadpages_net_84(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(377.1716f, 5910.17139f);
path.cubicTo(376.447723f, 5910.89551f, 376, 5911.89551f, 376, 5913);
path.lineTo(376, 5972);
@@ -1298,7 +1298,7 @@
path.lineTo(377.1716f, 5910.17139f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(376, 5909);
pathB.lineTo(378.481873f, 5909);
pathB.lineTo(379.999878f, 5976);
@@ -1308,7 +1308,7 @@
static void skpwww_briian_com_34(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(843, 216);
path.cubicTo(843, 213.238571f, 845.238586f, 211, 848, 211);
path.lineTo(1191, 211);
@@ -1330,7 +1330,7 @@
path.lineTo(844, 217);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(843, 784);
pathB.lineTo(843, 779);
pathB.lineTo(1196, 779.000061f);
@@ -1340,7 +1340,7 @@
static void skpwww_sciality_com_100(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(162, 468);
path.cubicTo(159.790863f, 468, 158, 469.790863f, 158, 472);
path.lineTo(158, 528);
@@ -1352,7 +1352,7 @@
path.lineTo(162, 468);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(275, 468);
pathB.cubicTo(276.65686f, 468, 278, 469.34314f, 278, 471);
pathB.lineTo(278, 529);
@@ -1368,7 +1368,7 @@
static void skpwww_sciality_com_101(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(162, 468);
path.cubicTo(159.790863f, 468, 158, 469.790863f, 158, 472);
path.lineTo(158, 528);
@@ -1380,7 +1380,7 @@
path.lineTo(162, 468);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(161, 469);
pathB.lineTo(275, 469);
pathB.cubicTo(276.65686f, 469, 278, 469.895416f, 278, 471);
@@ -1396,7 +1396,7 @@
static void skpwww_meb_gov_tr_5(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(137.34314f, 145.34314f);
path.quadTo(139.687088f, 143.000793f, 143, 143);
path.lineTo(242, 143);
@@ -1408,7 +1408,7 @@
path.quadTo(135.000793f, 147.687088f, 137.34314f, 145.34314f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(135, 143);
pathB.lineTo(250, 143);
pathB.lineTo(250, 177);
@@ -1419,7 +1419,7 @@
static void skpwww_meb_gov_tr_6(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(143, 143);
path.quadTo(139.687088f, 143.000793f, 137.34314f, 145.34314f);
path.quadTo(135.000793f, 147.687088f, 135, 151);
@@ -1431,7 +1431,7 @@
path.lineTo(143, 143);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(143, 143);
pathB.lineTo(242, 143);
pathB.cubicTo(245.865997f, 143, 249, 146.581726f, 249, 151);
@@ -1445,7 +1445,7 @@
static void skpgithub_io_25(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1001.87866f, 14.8786793f);
path.quadTo(1002.75745f, 14.0001001f, 1004, 14);
path.lineTo(1105, 14);
@@ -1461,7 +1461,7 @@
path.quadTo(1001.00012f, 15.7574596f, 1001.87866f, 14.8786793f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(1005, 16);
pathB.lineTo(1104, 16);
pathB.cubicTo(1105.10461f, 16, 1106, 16.8954296f, 1106, 18);
@@ -1477,7 +1477,7 @@
static void skpgithub_io_26(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1001.87866f, 14.8786793f);
path.quadTo(1002.75745f, 14.0001001f, 1004, 14);
path.lineTo(1105, 14);
@@ -1503,7 +1503,7 @@
path.lineTo(1003, 18);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1108, 14);
pathB.lineTo(1106, 16);
pathB.lineTo(1105.97998f, 46.0200005f);
@@ -1513,7 +1513,7 @@
static void skpskpicture14(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 994);
path.lineTo(0, 0);
path.lineTo(512, 0);
@@ -1521,7 +1521,7 @@
path.lineTo(0, 994);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(-317, 168);
pathB.quadTo(-317, 166.757385f, -316.121338f, 165.878662f);
pathB.quadTo(-315.242645f, 165, -314, 165);
@@ -1536,7 +1536,7 @@
static void skpskpicture15(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 193);
path.lineTo(323, 193);
path.lineTo(323, 168);
@@ -1546,7 +1546,7 @@
path.lineTo(0, 193);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kInverseWinding);
+ pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(-314, 165);
pathB.lineTo(320, 165);
pathB.cubicTo(321.65686f, 165, 323, 166.34314f, 323, 168);
@@ -1560,7 +1560,7 @@
static void skpelpais_com_18(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(183, 8507);
path.lineTo(552, 8506.99023f);
path.lineTo(552, 8508);
@@ -1568,7 +1568,7 @@
path.lineTo(183, 8507);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(183, 8508);
pathB.lineTo(183, 8506.99023f);
pathB.lineTo(552, 8507);
@@ -1578,7 +1578,7 @@
static void skpnamecheap_com_405(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(140, 1000);
path.lineTo(140, 842);
path.lineTo(141, 842);
@@ -1586,7 +1586,7 @@
path.lineTo(140, 1000);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(140, 842);
pathB.lineTo(141.008835f, 837.9646f);
pathB.lineTo(141.235291f, 1109.05884f);
@@ -1596,7 +1596,7 @@
static void skpwww_alrakoba_net_62(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(134.34314f, 9802.34277f);
path.quadTo(132, 9804.68652f, 132, 9808);
path.lineTo(132, 9822);
@@ -1611,7 +1611,7 @@
path.lineTo(134.34314f, 9802.34277f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(132, 9800);
pathB.lineTo(135.962357f, 9800);
pathB.lineTo(140, 9830);
@@ -1621,7 +1621,7 @@
static void skpwww_cityads_ru_249(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(817.464478f, 11.4644661f);
path.quadTo(818.928955f, 10, 821, 10);
path.lineTo(998, 10);
@@ -1647,7 +1647,7 @@
path.quadTo(816, 12.9289322f, 817.464478f, 11.4644661f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1003, 10);
pathB.lineTo(1000, 13);
pathB.lineTo(999.969971f, 37.0299988f);
@@ -1657,7 +1657,7 @@
static void skpwww_dealnews_com_315(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(966.464478f, 4261.46436f);
path.quadTo(965, 4262.92871f, 965, 4265);
path.lineTo(965, 4276);
@@ -1673,7 +1673,7 @@
path.lineTo(966.464478f, 4261.46436f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(965, 4260);
pathB.lineTo(967.716675f, 4260);
pathB.lineTo(970, 4281);
@@ -1683,7 +1683,7 @@
static void skpwww_inmotionhosting_com_9(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(991.633911f, 1839);
path.lineTo(964.265015f, 1839);
path.lineTo(963.734985f, 1893.73242f);
@@ -1694,7 +1694,7 @@
path.lineTo(991.633911f, 1839);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(964.267578f, 1838.73499f);
pathB.lineTo(1019.26501f, 1839.26758f);
pathB.lineTo(1018.73242f, 1894.26501f);
@@ -1705,7 +1705,7 @@
static void skpwww_alucinados_net_101(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1129.53552f, 1164.46448f);
path.lineTo(1128, 1166);
path.lineTo(1128.12231f, 1166.49548f);
@@ -1717,7 +1717,7 @@
path.quadTo(1131, 1165.92896f, 1129.53552f, 1164.46448f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1131, 1163);
pathB.lineTo(-43515.8555f, -177415.594f);
pathB.lineTo(1129.76465f, 1173.05884f);
@@ -1727,7 +1727,7 @@
static void skpwww_hairjobsearch_com_31(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(143.292892f, 0.707106769f);
path.quadTo(143, 0.414213538f, 143, 0);
path.lineTo(1123, 0);
@@ -1737,7 +1737,7 @@
path.quadTo(143.585785f, 1, 143.292892f, 0.707106769f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(143, 1);
pathB.lineTo(144, 0);
pathB.lineTo(1122, 0);
@@ -1747,7 +1747,7 @@
static void skpwww_heartiste_wordpress_com_86(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(741, 9432);
path.lineTo(761, 9431.99023f);
path.lineTo(761, 9433);
@@ -1755,7 +1755,7 @@
path.lineTo(741, 9432);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(741, 9433);
pathB.lineTo(741, 9431.99023f);
pathB.lineTo(761, 9432);
@@ -1765,7 +1765,7 @@
static void skpwww_argus_presse_fr_41(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1000, 343);
path.lineTo(165, 343);
path.lineTo(165, 364.869873f);
@@ -1773,7 +1773,7 @@
path.lineTo(1000, 343);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(165, 343.000031f);
pathB.lineTo(1000, 343.000031f);
pathB.lineTo(1000, 364.869904f);
@@ -1784,7 +1784,7 @@
static void skpwww_320kbps_net_2231(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(838, 9125);
path.lineTo(862, 9124.99023f);
path.lineTo(862, 9126);
@@ -1792,7 +1792,7 @@
path.lineTo(838, 9125);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(838, 9126);
pathB.lineTo(838, 9124.99023f);
pathB.lineTo(862, 9125);
@@ -1802,7 +1802,7 @@
static void skpwww_exystence_net_61(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(143, 9075);
path.lineTo(316, 9075);
path.lineTo(316, 9073.99023f);
@@ -1810,7 +1810,7 @@
path.lineTo(143, 9075);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(143, 9075);
pathB.lineTo(143, 9073.99023f);
pathB.lineTo(316, 9074);
@@ -1820,7 +1820,7 @@
static void skpwww_trashness_com_36(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(541.5f, 4835.99512f);
path.lineTo(91.5f, 4836);
path.lineTo(91.5f, 4836.5f);
@@ -1828,7 +1828,7 @@
path.lineTo(541.5f, 4835.99512f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(91.5f, 4836.5f);
pathB.lineTo(91.5f, 4835.99512f);
pathB.lineTo(541.5f, 4836);
@@ -1838,7 +1838,7 @@
static void skpwww_getgold_jp_731(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(284.878693f, 10134.8789f);
path.quadTo(284, 10135.7578f, 284, 10137);
path.lineTo(284, 10216);
@@ -1849,7 +1849,7 @@
path.lineTo(284.878693f, 10134.8789f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(284, 10134);
pathB.lineTo(286.05957f, 10129.8809f);
pathB.lineTo(285.399994f, 10216.2002f);
@@ -1859,7 +1859,7 @@
static void skpwww_maturesupertube_com_21(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(3.17157292f, 11831.1719f);
path.quadTo(4.34314585f, 11830, 6, 11830);
path.lineTo(1259, 11830);
@@ -1889,7 +1889,7 @@
path.quadTo(3, 11832.7578f, 3.87867975f, 11831.8789f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(2, 11830);
pathB.lineTo(4.5f, 11832.5f);
pathB.lineTo(1260.5f, 11832.5f);
@@ -1899,7 +1899,7 @@
static void skpwww_hubbyscook_com_22(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1000, 902.329346f);
path.quadTo(998, 905.250427f, 998, 909);
path.lineTo(998, 910);
@@ -1907,7 +1907,7 @@
path.lineTo(1000, 902.329346f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(998, 910);
pathB.lineTo(998, 909);
pathB.quadTo(998, 904.029419f, 1001.51471f, 900.514709f);
@@ -1927,7 +1927,7 @@
static void skpwww_gruposejaumdivulgador_com_br_4(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(610.5f, 5.78626502e-14f);
path.lineTo(1083.5f, -6.12303177e-17f);
path.lineTo(1083.5f, 469);
@@ -1935,7 +1935,7 @@
path.lineTo(610.5f, 5.78626502e-14f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(611, 0);
pathB.lineTo(1084, 0);
pathB.lineTo(1084, 469);
@@ -1946,7 +1946,7 @@
static void skpwww_phototransferapp_com_24(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(85.6091843f, 5.92893219f);
path.quadTo(89.6041641f, 3, 93.7462997f, 3);
path.lineTo(1212.74634f, 3);
@@ -1960,7 +1960,7 @@
path.quadTo(81.614212f, 8.85786438f, 85.6091843f, 5.92893219f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(83.7462997f, 3);
pathB.lineTo(1222.74634f, 3);
pathB.lineTo(1219.10657f, 13);
@@ -1971,7 +1971,7 @@
static void skpwww_phototransferapp_com_24x(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(85.6091843f, 5.92893219f);
path.quadTo(89.6041641f, 3, 93.7462997f, 3);
path.lineTo(112.74634f, 3);
@@ -1985,7 +1985,7 @@
path.quadTo(81.614212f, 8.85786438f, 85.6091843f, 5.92893219f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(83.7462997f, 3);
pathB.lineTo(122.74634f, 3);
pathB.lineTo(119.10657f, 13);
@@ -1996,7 +1996,7 @@
static void skpwww_helha_be_109(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(117.686981f, 3339.08423f);
path.lineTo(109.533035f, 3350.72925f);
path.quadTo(107.120552f, 3354.17456f, 103.879379f, 3354.41821f);
@@ -2008,7 +2008,7 @@
path.lineTo(117.686981f, 3339.08423f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(118.269409f, 3339.91602f);
pathB.lineTo(117.686981f, 3339.08423f);
pathB.lineTo(98.4669647f, 3351.56104f);
@@ -2018,7 +2018,7 @@
static void skpwww_cooksnaps_com_32(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(509.34021f, 176);
path.lineTo(505, 176);
path.quadTo(500.964233f, 176, 497.299988f, 176.896912f);
@@ -2050,7 +2050,7 @@
path.quadTo(511.503082f, 176.282898f, 509.34021f, 176);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(478.470215f, 223.683014f);
pathB.lineTo(477.970215f, 222.816986f);
pathB.quadTo(471.549896f, 211.696686f, 474.873322f, 199.293594f);
@@ -2070,13 +2070,13 @@
static void skpwww_cooksnaps_com_32a(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(497.299988f, 176.896912f);
path.quadTo(493.678162f, 177.952286f, 490.183014f, 179.9702f);
path.lineTo(489.316986f, 180.4702f);
path.quadTo(485.175385f, 182.861359f, 482.115265f, 186.082397f);
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(474.873322f, 199.293594f);
pathB.quadTo(478.196686f, 186.890503f, 489.316986f, 180.4702f);
pathB.lineTo(490.183014f, 179.9702f);
@@ -2086,7 +2086,7 @@
static void skpwww_contextualnewsfeeds_com_346(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(460.257355f, 1202.27808f);
path.lineTo(460.257355f, 1204.27808f);
path.quadTo(461.081207f, 1204.27808f, 461.665161f, 1203.69873f);
@@ -2099,7 +2099,7 @@
path.lineTo(460.257355f, 1202.27808f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(460.257355f, 1205.10657f);
pathB.lineTo(458.828979f, 1203.67822f);
pathB.lineTo(465.914215f, 1196.62122f);
@@ -2109,7 +2109,7 @@
static void skpwww_pindosiya_com_99(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(899.17157f, 548.17157f);
path.quadTo(898, 549.34314f, 898, 551);
path.lineTo(898, 556);
@@ -2120,7 +2120,7 @@
path.lineTo(899.17157f, 548.17157f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(898, 547);
pathB.lineTo(901.086914f, 547);
pathB.lineTo(899, 556);
@@ -2130,7 +2130,7 @@
static void skpwww_karnivool_com_au_11(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 1431);
path.lineTo(0, 775);
path.lineTo(1265, 775);
@@ -2138,7 +2138,7 @@
path.lineTo(0, 1431);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(32.3243904f, 851);
pathB.lineTo(459.324402f, 851);
pathB.lineTo(427, 1081);
@@ -2149,7 +2149,7 @@
static void skpwww_tunero_de_24(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1020.79303f, 2252);
path.quadTo(1018.72198f, 2252, 1016.86798f, 2253.46436f);
path.quadTo(1015.02032f, 2254.92383f, 1014.4668f, 2256.98584f);
@@ -2168,7 +2168,7 @@
path.lineTo(1020.79303f, 2252);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1011.53705f, 2268);
pathB.lineTo(1014.46301f, 2257);
pathB.quadTo(1015.01392f, 2254.92896f, 1016.86798f, 2253.46436f);
@@ -2188,7 +2188,7 @@
static void skpwww_docgelo_com_66(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(22.5f, 24174.5f);
path.lineTo(185.5f, 24174.498f);
path.lineTo(185.5f, 24174.75f);
@@ -2196,7 +2196,7 @@
path.lineTo(22.5f, 24174.5f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(22.5f, 24174.75f);
pathB.lineTo(22.5f, 24174.498f);
pathB.lineTo(185.5f, 24174.5f);
@@ -2206,7 +2206,7 @@
static void skpwww_kpopexplorer_net_22(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1000, 866.329346f);
path.quadTo(998, 869.250427f, 998, 873);
path.lineTo(998, 874);
@@ -2214,7 +2214,7 @@
path.lineTo(1000, 866.329346f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(998, 874);
pathB.lineTo(998, 873);
pathB.quadTo(998, 868.029419f, 1001.51471f, 864.514709f);
@@ -2234,7 +2234,7 @@
static void skpwww_artblart_com_8(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(22.5f, 24527.25f);
path.lineTo(45, 24527.248f);
path.lineTo(45, 24527.5f);
@@ -2242,7 +2242,7 @@
path.lineTo(22.5f, 24527.25f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(22.5f, 24527.5f);
pathB.lineTo(22.5f, 24527.248f);
pathB.lineTo(45, 24527.25f);
@@ -2252,7 +2252,7 @@
static void skpwww_jessicaslens_wordpress_com_222(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1000, 844.329346f);
path.quadTo(998, 847.250427f, 998, 851);
path.lineTo(998, 852);
@@ -2260,7 +2260,7 @@
path.lineTo(1000, 844.329346f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(998, 852);
pathB.lineTo(998, 851);
pathB.quadTo(998, 846.029419f, 1001.51471f, 842.514709f);
@@ -2280,7 +2280,7 @@
static void skpwww_simplysaru_com_40(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1000, 866.329346f);
path.quadTo(998, 869.250427f, 998, 873);
path.lineTo(998, 874);
@@ -2288,7 +2288,7 @@
path.lineTo(1000, 866.329346f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(998, 874);
pathB.lineTo(998, 873);
pathB.quadTo(998, 868.029419f, 1001.51471f, 864.514709f);
@@ -2308,7 +2308,7 @@
static void skpwww_partsdata_de_53(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(407, 119);
path.lineTo(407, 28);
path.lineTo(647, 28);
@@ -2316,7 +2316,7 @@
path.lineTo(407, 119);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(471.228394f, 64.443222f);
pathB.cubicTo(471.193878f, 60.953373f, 470.234985f, 52.4797592f, 462.201569f, 46.6231461f);
pathB.cubicTo(454.168152f, 40.7665405f, 446.592804f, 41.993145f, 443.033936f, 42.8568878f);
@@ -2606,7 +2606,7 @@
static void skpwww_seopack_blogspot_com_2153(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(999.892212f, 246);
path.lineTo(927.340759f, 245.505722f);
path.quadTo(928.068054f, 246, 929, 246);
@@ -2619,7 +2619,7 @@
path.lineTo(1000, 248);
path.lineTo(1000, 246);
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(924, 248);
pathB.lineTo(924, 245.472672f);
pathB.lineTo(1143, 247);
@@ -2629,7 +2629,7 @@
static void skpwww_lokado_de_173(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1000, 896.991394f);
path.quadTo(999.789917f, 896.718872f, 999.535522f, 896.464478f);
path.quadTo(998.071045f, 895, 996, 895);
@@ -2645,7 +2645,7 @@
path.lineTo(1000, 896.991394f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(946, 906);
pathB.lineTo(946, 905);
pathB.quadTo(946, 901.272095f, 948.928955f, 898.636047f);
@@ -2665,7 +2665,7 @@
static void skpwww_wartepop_blogspot_com_br_6(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(90.9763107f, 153.309662f);
path.quadTo(91.9526215f, 152.333344f, 93.3333359f, 152.333344f);
path.lineTo(124.666664f, 152.333344f);
@@ -2677,7 +2677,7 @@
path.quadTo(90, 154.285965f, 90.9763107f, 153.309662f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(90, 163.666672f);
pathB.lineTo(90, 155.666672f);
pathB.quadTo(90, 154.285965f, 90.9763107f, 153.309662f);
@@ -2697,7 +2697,7 @@
static void skpwww_wartepop_blogspot_com_br_6a(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(90.9763107f, 153.309662f);
path.quadTo(91.9526215f, 152.333344f, 93.3333359f, 152.333344f);
path.lineTo(124.666672f, 152.333344f);
@@ -2709,7 +2709,7 @@
path.quadTo(90, 154.285965f, 90.9763107f, 153.309662f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(90, 163.666672f);
pathB.lineTo(90, 155.666672f);
pathB.quadTo(90, 154.285965f, 90.9763107f, 153.309662f);
@@ -2729,7 +2729,7 @@
static void skpwww_odia_com_br_26(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(360.740479f, 741.040771f);
path.quadTo(360.378967f, 741, 360, 741);
path.quadTo(359.159821f, 741, 358.403076f, 741.200745f);
@@ -2765,7 +2765,7 @@
path.quadTo(361.102509f, 741.089966f, 360.740479f, 741.040771f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(355.654724f, 739.711792f);
pathB.lineTo(367.288269f, 742.654724f);
pathB.lineTo(364.345337f, 754.288269f);
@@ -2776,7 +2776,7 @@
static void skpwww_evolvehq_com_210(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(172, 972);
path.quadTo(170.757355f, 972, 169.878677f, 972.878662f);
path.quadTo(169, 973.757385f, 169, 975);
@@ -2792,7 +2792,7 @@
path.lineTo(172, 972);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(170, 1171);
pathB.lineTo(170, 975);
pathB.quadTo(170, 974.17157f, 170.585785f, 973.585815f);
@@ -2812,7 +2812,7 @@
static void skpwww_catingueiraonline_com_352(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(443, 8292);
path.lineTo(443, 8140);
path.lineTo(444, 8140);
@@ -2820,7 +2820,7 @@
path.lineTo(443, 8292);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(443, 8140);
pathB.lineTo(444.01001f, 8140);
pathB.lineTo(444, 8292);
@@ -2830,7 +2830,7 @@
static void skpwww_galaxystwo_com_4(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(10105, 2510);
path.lineTo(10123, 2509.98999f);
path.lineTo(10123, 2511);
@@ -2838,7 +2838,7 @@
path.lineTo(10105, 2510);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(10105, 2511);
pathB.lineTo(10105, 2509.98999f);
pathB.lineTo(10123, 2510);
@@ -2848,7 +2848,7 @@
static void skpwww_thaienews_blogspot_com_36(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(429.994995f, 6268);
path.lineTo(430, 2187);
path.lineTo(430.5f, 2187);
@@ -2856,7 +2856,7 @@
path.lineTo(429.994995f, 6268);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(430.5f, 2187);
pathB.lineTo(429.994995f, 2187);
pathB.lineTo(430, 6268);
@@ -2866,7 +2866,7 @@
static void skpwww_fashionscandal_com_94(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(25.9107456f, 272.577423f);
path.quadTo(26.1548233f, 272.333344f, 26.5000019f, 272.333344f);
path.lineTo(131.166672f, 272.333344f);
@@ -2882,7 +2882,7 @@
path.quadTo(25.6666679f, 272.821503f, 25.9107456f, 272.577423f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(25.833334f, 417.166656f);
pathB.lineTo(25.833334f, 273.166656f);
pathB.quadTo(25.833334f, 272.890533f, 26.0285969f, 272.695251f);
@@ -2902,7 +2902,7 @@
static void skpwww_kenlevine_blogspot_com_28(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(276, 9506);
path.lineTo(276, 7531);
path.lineTo(277, 7531);
@@ -2910,7 +2910,7 @@
path.lineTo(276, 9506);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(276, 7531);
pathB.lineTo(277.01001f, 7531);
pathB.lineTo(277, 9506);
@@ -2920,7 +2920,7 @@
static void skpwww_defense_studies_blogspot_com_64(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(276, 9600);
path.lineTo(276, 7703);
path.lineTo(277, 7703);
@@ -2928,7 +2928,7 @@
path.lineTo(276, 9600);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(276, 7703);
pathB.lineTo(277.01001f, 7703);
pathB.lineTo(277, 9600);
@@ -2938,7 +2938,7 @@
static void skpwww_uniquefx_net_442(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(960, 306);
path.lineTo(960, 305);
path.lineTo(1000, 305);
@@ -2946,7 +2946,7 @@
path.lineTo(960, 306);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(960, 305);
pathB.lineTo(958.997253f, 306.002747f);
pathB.lineTo(1017, 307);
@@ -2956,7 +2956,7 @@
static void skpwww_kitcheninspirations_wordpress_com_32(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(47.1666679f, 19651.334f);
path.lineTo(65.8333359f, 19651.332f);
path.lineTo(65.8333359f, 19651.5f);
@@ -2964,7 +2964,7 @@
path.lineTo(47.1666679f, 19651.334f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(47.1666679f, 19651.5f);
pathB.lineTo(47.1666679f, 19651.332f);
pathB.lineTo(65.8333359f, 19651.334f);
@@ -2974,7 +2974,7 @@
static void skpwww_educationalcraft_com_4(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(941, 1494);
path.lineTo(941, 1464);
path.lineTo(985, 1464);
@@ -2982,7 +2982,7 @@
path.lineTo(941, 1494);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(979.211975f, 1480.45496f);
pathB.cubicTo(979.211975f, 1480.45496f, 976.348999f, 1479.68506f, 977.495972f, 1475.59497f);
pathB.cubicTo(977.497009f, 1475.59497f, 981.072021f, 1477.88501f, 979.211975f, 1480.45496f);
@@ -3152,7 +3152,7 @@
static void skpwww_narayana_publishers_com_194(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1083.34314f, 445.65686f);
path.quadTo(1081, 443.313721f, 1081, 440);
path.lineTo(1257, 440);
@@ -3170,7 +3170,7 @@
path.quadTo(1083, 443.071075f, 1083, 441);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1081, 440);
pathB.lineTo(1082, 440);
pathB.lineTo(1090.01001f, 448);
@@ -3180,7 +3180,7 @@
static void skpwww_cooksnaps_com_17(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(170.340179f, 176);
path.lineTo(166, 176);
path.quadTo(161.964188f, 176, 158.299957f, 176.896912f);
@@ -3209,7 +3209,7 @@
path.quadTo(172.503067f, 176.282898f, 170.340179f, 176);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(139.4702f, 223.683014f);
pathB.lineTo(138.9702f, 222.816986f);
pathB.quadTo(132.549896f, 211.696686f, 135.873291f, 199.293594f);
@@ -3229,7 +3229,7 @@
static void skpwww_swapspacesystems_com_5(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(819.050781f, 5539.72412f);
path.quadTo(819.651672f, 5539.1543f, 820.479858f, 5539.17578f);
path.lineTo(1191.35278f, 5548.8877f);
@@ -3245,7 +3245,7 @@
path.quadTo(818.44989f, 5540.29492f, 819.050781f, 5539.72412f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(818.48053f, 5539.12354f);
pathB.lineTo(1193.35205f, 5548.93994f);
pathB.lineTo(1186.5199f, 5809.85059f);
@@ -3256,7 +3256,7 @@
static void skpwww_kitcheninspirations_wordpress_com_66(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(47.1666679f, 27820.668f);
path.lineTo(60.8333359f, 27820.668f);
path.lineTo(60.8333359f, 27820.498f);
@@ -3264,7 +3264,7 @@
path.lineTo(47.1666679f, 27820.668f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(47.1666679f, 27820.668f);
pathB.lineTo(47.1666679f, 27820.498f);
pathB.lineTo(60.8333359f, 27820.5f);
@@ -3274,7 +3274,7 @@
static void skpwww_etiqadd_com_2464(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(630.378662f, 1293.42896f);
path.quadTo(631.257385f, 1292.55029f, 632.5f, 1292.55029f);
path.quadTo(633.742615f, 1292.55029f, 634.621338f, 1293.42896f);
@@ -3290,7 +3290,7 @@
path.lineTo(630.378662f, 1293.42896f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(632.5f, 1291.30762f);
pathB.lineTo(641.692383f, 1300.5f);
pathB.lineTo(632.5f, 1309.69238f);
@@ -3301,7 +3301,7 @@
static void skpwww_narayana_verlag_de_194(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1083.34314f, 513.65686f);
path.quadTo(1081, 511.313721f, 1081, 508);
path.lineTo(1257, 508);
@@ -3319,7 +3319,7 @@
path.quadTo(1083, 511.071075f, 1083, 509);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(1081, 508);
pathB.lineTo(1082, 508);
pathB.lineTo(1090.01001f, 516);
@@ -3329,7 +3329,7 @@
static void skpwww_americascup_com_108(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(999.454102f, 689.17157f);
path.quadTo(1001.172f, 688, 1002.82886f, 688);
path.lineTo(1013.82886f, 688);
@@ -3341,7 +3341,7 @@
path.quadTo(997.736206f, 690.34314f, 999.454102f, 689.17157f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(998.828857f, 688);
pathB.lineTo(1013.82886f, 688);
pathB.lineTo(1002.17114f, 713);
@@ -3352,7 +3352,7 @@
static void skpwww_vantageproduction_com_109(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(794.514709f, 759.485291f);
path.quadTo(791, 755.970581f, 791, 751);
path.lineTo(1133, 751);
@@ -3370,7 +3370,7 @@
path.quadTo(793, 755.727905f, 793, 752);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(791, 751);
pathB.lineTo(792, 751);
pathB.lineTo(804.01001f, 763);
@@ -3380,7 +3380,7 @@
static void skpwww_aceinfographics_com_106(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(166.878677f, 7638.87891f);
path.quadTo(166, 7639.75732f, 166, 7641);
path.lineTo(166, 11577);
@@ -3394,7 +3394,7 @@
path.lineTo(166.878677f, 7638.87891f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(166, 7638);
pathB.lineTo(168.020004f, 7635.97998f);
pathB.lineTo(168, 11578);
@@ -3404,7 +3404,7 @@
static void skpwww_tcmevents_org_13(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(465.951904f, 547.960144f);
path.quadTo(465.66571f, 546.867371f, 465.404938f, 546);
path.lineTo(465.504089f, 546);
@@ -3420,7 +3420,7 @@
path.quadTo(474.905701f, 601.569519f, 470.591064f, 574.024353f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(322.992462f, 541.475708f);
pathB.lineTo(465.531616f, 541.724426f);
pathB.lineTo(468.507751f, 560.724426f);
@@ -3431,7 +3431,7 @@
static void skpwww_paseoitaigara_com_br_56(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(633.147217f, 1247);
path.lineTo(718, 1162.14722f);
path.lineTo(802.852783f, 1247);
@@ -3439,7 +3439,7 @@
path.lineTo(633.147217f, 1247);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(635.268494f, 1244.87866f);
pathB.lineTo(715.878662f, 1164.26855f);
pathB.quadTo(716.757385f, 1163.38989f, 718, 1163.38989f);
@@ -3459,7 +3459,7 @@
static void skpwww_mortgagemarketguide_com_109(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(816.514709f, 781.485291f);
path.quadTo(813, 777.970581f, 813, 773);
path.lineTo(1133, 773);
@@ -3477,7 +3477,7 @@
path.quadTo(815, 777.727905f, 815, 774);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(813, 773);
pathB.lineTo(814, 773);
pathB.lineTo(826.01001f, 785);
@@ -3487,7 +3487,7 @@
static void skpwww_9to5mac_com_64(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(365, 5101);
path.lineTo(365, 5082);
path.lineTo(366, 5083);
@@ -3499,7 +3499,7 @@
path.quadTo(365, 5103.07129f, 365, 5101);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(365, 5082);
pathB.lineTo(365.848175f, 5081.15186f);
pathB.lineTo(368, 5103);
@@ -3509,7 +3509,7 @@
static void skpwww_googleventures_com_32(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(725.911682f, 898.767456f);
path.lineTo(741.232544f, 885.911682f);
path.lineTo(754.088318f, 901.232544f);
@@ -3517,7 +3517,7 @@
path.lineTo(725.911682f, 898.767456f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(728.37677f, 870.59082f);
pathB.lineTo(754.088257f, 901.232605f);
pathB.lineTo(738.767395f, 914.088379f);
@@ -3528,7 +3528,7 @@
static void skpwww_devbridge_com_22(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(4915, 1523);
path.quadTo(4887.24756f, 1523, 4867.62402f, 1542.6239f);
path.quadTo(4848, 1562.24768f, 4848, 1590);
@@ -3540,7 +3540,7 @@
path.quadTo(4942.75244f, 1523, 4915, 1523);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(4981.99902f, 1590);
pathB.quadTo(4981.99902f, 1617.75232f, 4962.375f, 1637.3761f);
pathB.quadTo(4942.75146f, 1657, 4914.99902f, 1657);
@@ -3556,7 +3556,7 @@
static void skpwww_alamdi_com_3(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(10210.8789f, 5315.87891f);
path.quadTo(10211.7578f, 5315, 10213, 5315);
path.lineTo(10230, 5315);
@@ -3572,7 +3572,7 @@
path.quadTo(10210, 5316.75732f, 10210.8789f, 5315.87891f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(10213, 5315);
pathB.lineTo(10230, 5315);
pathB.cubicTo(10231.6572f, 5315, 10233, 5316.34326f, 10233, 5318);
@@ -3588,7 +3588,7 @@
static void skpwww_familysurvivalprotocol_wordpress_com_61(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(143, 14557);
path.lineTo(165, 14557);
path.lineTo(165, 14555.9902f);
@@ -3596,7 +3596,7 @@
path.lineTo(143, 14557);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(143, 14557);
pathB.lineTo(143, 14555.9902f);
pathB.lineTo(165, 14556);
@@ -3606,7 +3606,7 @@
static void skpwww_firstunitedbank_com_19(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(808.585815f, 11673.5859f);
path.quadTo(809.17157f, 11673, 810, 11673);
path.lineTo(1032, 11673);
@@ -3632,7 +3632,7 @@
path.quadTo(808, 11674.1719f, 808.585815f, 11673.5859f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(808, 11703);
pathB.lineTo(809.5f, 11701.5f);
pathB.lineTo(1062.91907f, 11687.0811f);
@@ -3642,7 +3642,7 @@
static void skpwww_shinydemos_com_5(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(205.884888f, 648.203857f);
path.lineTo(771.570374f, 82.5183716f);
path.lineTo(1110.98169f, 421.929626f);
@@ -3650,7 +3650,7 @@
path.lineTo(205.884888f, 648.203857f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(771.570374f, 82.5183716f);
pathB.lineTo(1110.98169f, 421.929626f);
pathB.lineTo(545.296204f, 987.615051f);
@@ -3661,7 +3661,7 @@
static void skpwww_lptemp_com_3(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(78.6429825f, 1394.30969f);
path.quadTo(79.6192932f, 1393.33337f, 81.0000076f, 1393.33337f);
path.lineTo(341, 1393.33337f);
@@ -3677,7 +3677,7 @@
path.quadTo(77.6666718f, 1395.28601f, 78.6429825f, 1394.30969f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(81, 1393.33337f);
pathB.lineTo(341, 1393.33337f);
pathB.cubicTo(342.840942f, 1393.33337f, 344.333344f, 1394.82568f, 344.333344f, 1396.66675f);
@@ -3693,7 +3693,7 @@
static void skpwww_shinydemos_com_15(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1000, 310.947968f);
path.lineTo(771.570374f, 82.5183716f);
path.lineTo(205.884888f, 648.203857f);
@@ -3703,7 +3703,7 @@
path.lineTo(1000, 310.947968f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(771.570374f, 82.5183716f);
pathB.lineTo(1110.98169f, 421.929626f);
pathB.lineTo(545.296204f, 987.615051f);
@@ -3714,7 +3714,7 @@
static void skpwww_lptemp_com_5(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(78.6429825f, 3150.97632f);
path.quadTo(79.6192932f, 3150, 81.0000076f, 3150);
path.lineTo(341, 3150);
@@ -3730,7 +3730,7 @@
path.quadTo(77.6666718f, 3151.95264f, 78.6429825f, 3150.97632f);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kEvenOdd);
+ pathB.setFillType(SkPath::kEvenOdd_FillType);
pathB.moveTo(81, 3150);
pathB.lineTo(341, 3150);
pathB.cubicTo(342.840942f, 3150, 344.333344f, 3151.49268f, 344.333344f, 3153.3335f);
@@ -3746,7 +3746,7 @@
static void skpwww_educationalcraft_com_4a(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(941, 1494);
path.lineTo(941, 1464);
path.lineTo(985, 1464);
@@ -3754,7 +3754,7 @@
path.lineTo(941, 1494);
path.close();
SkPath pathB;
- pathB.setFillType(SkPathFillType::kWinding);
+ pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(984.546021f, 1478.31494f);
pathB.cubicTo(984.546021f, 1478.31494f, 984.543213f, 1478.32239f, 984.537598f, 1478.33655f);
@@ -3767,7 +3767,7 @@
static void skpwww_woothemes_com_1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x44472795), SkBits2Float(0x455cdb8d)); // 796.618f, 3533.72f
path.lineTo(SkBits2Float(0x44467c27), SkBits2Float(0x455cdb8d)); // 793.94f, 3533.72f
path.lineTo(SkBits2Float(0x44467c27), SkBits2Float(0x455d055d)); // 793.94f, 3536.34f
@@ -3775,7 +3775,7 @@
path.lineTo(SkBits2Float(0x44472795), SkBits2Float(0x455cdb8d)); // 796.618f, 3533.72f
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x4446861c), SkBits2Float(0x455cdb8d)); // 794.095f, 3533.72f
path.cubicTo(SkBits2Float(0x4446a0d8), SkBits2Float(0x455cefbb), SkBits2Float(0x444727a5), SkBits2Float(0x455d055d), SkBits2Float(0x444727a5), SkBits2Float(0x455d055d)); // 794.513f, 3534.98f, 796.619f, 3536.34f, 796.619f, 3536.34f
path.cubicTo(SkBits2Float(0x4446c5b0), SkBits2Float(0x455cf8a4), SkBits2Float(0x444693af), SkBits2Float(0x455cedad), SkBits2Float(0x44467c1b), SkBits2Float(0x455ce4b8)); // 795.089f, 3535.54f, 794.308f, 3534.85f, 793.939f, 3534.29f
@@ -3787,7 +3787,7 @@
static void skpwww_gorcraft_ru_1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x44924000), SkBits2Float(0x458e7800)); // 1170, 4559
path.conicTo(SkBits2Float(0x44930000), SkBits2Float(0x458e7800), SkBits2Float(0x44930000), SkBits2Float(0x458ea800), SkBits2Float(0x3f3504f3)); // 1176, 4559, 1176, 4565, 0.707107f
path.lineTo(SkBits2Float(0x44930000), SkBits2Float(0x458f7000)); // 1176, 4590
@@ -3800,7 +3800,7 @@
path.close();
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x429c0000), SkBits2Float(0x458f7000)); // 78, 4590
path.lineTo(SkBits2Float(0x429c0000), SkBits2Float(0x458ea800)); // 78, 4565
path.conicTo(SkBits2Float(0x429c0000), SkBits2Float(0x458e7800), SkBits2Float(0x42a80000), SkBits2Float(0x458e7800), SkBits2Float(0x3f3504f3)); // 78, 4559, 84, 4559, 0.707107f
@@ -3818,7 +3818,7 @@
static void skpwww_neda_net_1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x447a0000), SkBits2Float(0x00000000)); // 1000, 0
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0x44b6e000)); // 0, 1463
@@ -3827,7 +3827,7 @@
path.close();
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x366a410f), SkBits2Float(0x43a38000)); // 3.49066e-06f, 327
path.lineTo(SkBits2Float(0x447a0000), SkBits2Float(0x43a38001)); // 1000, 327
path.lineTo(SkBits2Float(0x447a0000), SkBits2Float(0x4435c000)); // 1000, 727
@@ -3841,7 +3841,7 @@
// "http___www_neda_net.skp" dir=87
static void skpwww_neda_net_2(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x442fc000), SkBits2Float(0x4546a000)); // 703, 3178
path.lineTo(SkBits2Float(0x441f4000), SkBits2Float(0x4546a000)); // 637, 3178
path.lineTo(SkBits2Float(0x441f4000), SkBits2Float(0x454ab000)); // 637, 3243
@@ -3850,7 +3850,7 @@
path.close();
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x44220e6e), SkBits2Float(0x45469c4c)); // 648.225f, 3177.77f
path.lineTo(SkBits2Float(0x442fc01c), SkBits2Float(0x45475696)); // 703.002f, 3189.41f
path.lineTo(SkBits2Float(0x442cf191), SkBits2Float(0x454aa3b5)); // 691.774f, 3242.23f
@@ -3863,7 +3863,7 @@
static void skpwww_mybuilder_com_1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
-path.setFillType(SkPathFillType::kEvenOdd);
+path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(1000, 659);
path.lineTo(1000, 377);
path.lineTo(455, 377);
@@ -3872,7 +3872,7 @@
path.close();
SkPath path1(path);
path.reset();
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(921.472f, 414.086f);
path.lineTo(968.815f, 386.754f);
path.lineTo(993.069f, 428.761f);
@@ -3920,7 +3920,7 @@
static void skpwww_nimble_com_au_1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
-path.setFillType(SkPathFillType::kEvenOdd);
+path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(188.6f, 1988.8f);
path.lineTo(188.6f, 2041.6f);
path.cubicTo(188.6f, 2065.4f, 208, 2084.8f, 231.8f, 2084.8f);
@@ -3931,7 +3931,7 @@
path.close();
SkPath path1(path);
path.reset();
-path.setFillType(SkPathFillType::kWinding);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(275, 2041.6f);
path.conicTo(275, 2084.8f, 231.8f, 2084.8f, 0.707107f);
path.conicTo(188.6f, 2084.8f, 188.6f, 2041.6f, 0.707107f);
@@ -3944,7 +3944,7 @@
static void skpwww_tinytots_com_1(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
-path.setFillType(SkPathFillType::kEvenOdd);
+path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(75.96f, 26.318f);
path.lineTo(70.337f, 26.318f);
path.lineTo(70.337f, 32.376f);
@@ -3953,7 +3953,7 @@
path.close();
SkPath path1(path);
path.reset();
-path.setFillType(SkPathFillType::kWinding);
+path.setFillType(SkPath::kWinding_FillType);
path.moveTo(75.88f, 27.873f);
path.cubicTo(75.929f, 28.138f, 75.956f, 29.196f, 75.96f, 31.046f);
path.lineTo(72.766f, 32.376f);
@@ -3975,7 +3975,7 @@
static void http___www_emuleteca_cl_26(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x3f800000), SkBits2Float(0x44370000)); // 1, 732
path.conicTo(SkBits2Float(0x3f800000), SkBits2Float(0x4428c000), SkBits2Float(0x42680000), SkBits2Float(0x4428c000), SkBits2Float(0x3f3504f3)); // 1, 675, 58, 675, 0.707107f
path.conicTo(SkBits2Float(0x40400000), SkBits2Float(0x4428c000), SkBits2Float(0x40400000), SkBits2Float(0x44370000), SkBits2Float(0x3f3504f3)); // 3, 675, 3, 732, 0.707107f
@@ -3991,7 +3991,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f800000), SkBits2Float(0x4428c000)); // 1, 675
path.lineTo(SkBits2Float(0x42680000), SkBits2Float(0x4428c000)); // 58, 675
path.lineTo(SkBits2Float(0x3fc8f676), SkBits2Float(0x44454000)); // 1.57002f, 789
@@ -4003,7 +4003,7 @@
static void http___www_emuleteca_cl_27(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType((SkPathFillType) 1);
+ path.setFillType((SkPath::FillType) 1);
path.moveTo(SkBits2Float(0x42680000), SkBits2Float(0x4428c000)); // 58, 675
path.conicTo(SkBits2Float(0x3f800000), SkBits2Float(0x4428c000), SkBits2Float(0x3f800000), SkBits2Float(0x44370000), SkBits2Float(0x3f3504f3)); // 1, 675, 1, 732, 0.707107f
path.conicTo(SkBits2Float(0x3f800000), SkBits2Float(0x443bd045), SkBits2Float(0x414acf56), SkBits2Float(0x443fa420), SkBits2Float(0x3f778612)); // 1, 751.254f, 12.6756f, 766.564f, 0.96689f
@@ -4014,7 +4014,7 @@
SkPath path1(path);
path.reset();
- path.setFillType((SkPathFillType) 0);
+ path.setFillType((SkPath::FillType) 0);
path.moveTo(SkBits2Float(0x3f800000), SkBits2Float(0x4428c000)); // 1, 675
path.lineTo(SkBits2Float(0x4c4a3de6), SkBits2Float(0xccca3d89)); // 5.30165e+07f, -1.06032e+08f
path.lineTo(SkBits2Float(0x41a71147), SkBits2Float(0x443b4eec)); // 20.8834f, 749.233f
@@ -4026,11 +4026,11 @@
static void http___www_emuleteca_cl_28(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
SkPath path1(path);
path.reset();
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x3f800000), SkBits2Float(0x4428c000)); // 1, 675
path.lineTo(SkBits2Float(0x4c4a3de6), SkBits2Float(0xccca3d89)); // 5.30165e+07f, -1.06032e+08f
path.lineTo(SkBits2Float(0x41a71147), SkBits2Float(0x443b4eec)); // 20.8834f, 749.233f
@@ -4041,7 +4041,7 @@
static void http___www_project2061_org(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(751, 62);
path.lineTo(497, 62);
path.lineTo(497, 138);
@@ -4050,7 +4050,7 @@
path.close();
SkPath path1(path);
path.reset();
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(699.889f, 115.29f);
path.cubicTo(699.889f, 114.913f, 699.627f, 114.723f, 699.111f, 114.723f);
path.cubicTo(698.604f, 114.723f, 697.843f, 114.671f, 697.096f, 114.423f);
diff --git a/tests/PathOpsThreadedCommon.h b/tests/PathOpsThreadedCommon.h
index 1248fde..4b4c9b8 100644
--- a/tests/PathOpsThreadedCommon.h
+++ b/tests/PathOpsThreadedCommon.h
@@ -34,7 +34,7 @@
skiatest::Reporter* fReporter;
SkBitmap* fBitmap;
- void outputProgress(const char* pathStr, SkPathFillType);
+ void outputProgress(const char* pathStr, SkPath::FillType);
void outputProgress(const char* pathStr, SkPathOp);
};
diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index 611e0a6..5c0d748 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -3583,7 +3583,7 @@
REPORTER_ASSERT(reporter, 0 == p.countVerbs());
REPORTER_ASSERT(reporter, 0 == p.getSegmentMasks());
REPORTER_ASSERT(reporter, p.isConvex());
- REPORTER_ASSERT(reporter, p.getNewFillType() == SkPathFillType::kWinding);
+ REPORTER_ASSERT(reporter, p.getFillType() == SkPath::kWinding_FillType);
REPORTER_ASSERT(reporter, !p.isInverseFillType());
REPORTER_ASSERT(reporter, p == empty);
REPORTER_ASSERT(reporter, !(p != empty));
@@ -4026,9 +4026,9 @@
(void) p.contains(-77.2027664f, 15.3066053f);
p.reset();
- p.setFillType(SkPathFillType::kInverseWinding);
+ p.setFillType(SkPath::kInverseWinding_FillType);
REPORTER_ASSERT(reporter, p.contains(0, 0));
- p.setFillType(SkPathFillType::kWinding);
+ p.setFillType(SkPath::kWinding_FillType);
REPORTER_ASSERT(reporter, !p.contains(0, 0));
p.moveTo(4, 4);
p.lineTo(6, 8);
@@ -4153,7 +4153,7 @@
SkPoint pts[] = {{5, 4}, {6, 5}, {7, 6}, {6, 6}, {4, 6}, {5, 7}, {5, 5}, {5, 4}, {6, 5}, {7, 6}};
for (int i = 0; i < 3; ++i) {
p.reset();
- p.setFillType(SkPathFillType::kEvenOdd);
+ p.setFillType(SkPath::kEvenOdd_FillType);
p.moveTo(pts[i].fX, pts[i].fY);
p.cubicTo(pts[i + 1].fX, pts[i + 1].fY, pts[i + 2].fX, pts[i + 2].fY, pts[i + 3].fX, pts[i + 3].fY);
p.cubicTo(pts[i + 4].fX, pts[i + 4].fY, pts[i + 5].fX, pts[i + 5].fY, pts[i + 6].fX, pts[i + 6].fY);
@@ -4251,7 +4251,7 @@
SkPath b;
REPORTER_ASSERT(reporter, a == a);
REPORTER_ASSERT(reporter, a == b);
- a.setFillType(SkPathFillType::kInverseWinding);
+ a.setFillType(SkPath::kInverseWinding_FillType);
REPORTER_ASSERT(reporter, a != b);
a.reset();
REPORTER_ASSERT(reporter, a == b);
@@ -4282,51 +4282,51 @@
static void test_dump(skiatest::Reporter* reporter) {
SkPath p;
- compare_dump(reporter, p, false, false, "path.setFillType(SkPathFillType::kWinding);\n");
- compare_dump(reporter, p, true, false, "path.setFillType(SkPathFillType::kWinding);\n");
+ compare_dump(reporter, p, false, false, "path.setFillType(SkPath::kWinding_FillType);\n");
+ compare_dump(reporter, p, true, false, "path.setFillType(SkPath::kWinding_FillType);\n");
p.moveTo(1, 2);
p.lineTo(3, 4);
- compare_dump(reporter, p, false, false, "path.setFillType(SkPathFillType::kWinding);\n"
+ compare_dump(reporter, p, false, false, "path.setFillType(SkPath::kWinding_FillType);\n"
"path.moveTo(1, 2);\n"
"path.lineTo(3, 4);\n");
- compare_dump(reporter, p, true, false, "path.setFillType(SkPathFillType::kWinding);\n"
+ compare_dump(reporter, p, true, false, "path.setFillType(SkPath::kWinding_FillType);\n"
"path.moveTo(1, 2);\n"
"path.lineTo(3, 4);\n"
"path.lineTo(1, 2);\n"
"path.close();\n");
p.reset();
- p.setFillType(SkPathFillType::kEvenOdd);
+ p.setFillType(SkPath::kEvenOdd_FillType);
p.moveTo(1, 2);
p.quadTo(3, 4, 5, 6);
- compare_dump(reporter, p, false, false, "path.setFillType(SkPathFillType::kEvenOdd);\n"
+ compare_dump(reporter, p, false, false, "path.setFillType(SkPath::kEvenOdd_FillType);\n"
"path.moveTo(1, 2);\n"
"path.quadTo(3, 4, 5, 6);\n");
p.reset();
- p.setFillType(SkPathFillType::kInverseWinding);
+ p.setFillType(SkPath::kInverseWinding_FillType);
p.moveTo(1, 2);
p.conicTo(3, 4, 5, 6, 0.5f);
- compare_dump(reporter, p, false, false, "path.setFillType(SkPathFillType::kInverseWinding);\n"
+ compare_dump(reporter, p, false, false, "path.setFillType(SkPath::kInverseWinding_FillType);\n"
"path.moveTo(1, 2);\n"
"path.conicTo(3, 4, 5, 6, 0.5f);\n");
p.reset();
- p.setFillType(SkPathFillType::kInverseEvenOdd);
+ p.setFillType(SkPath::kInverseEvenOdd_FillType);
p.moveTo(1, 2);
p.cubicTo(3, 4, 5, 6, 7, 8);
- compare_dump(reporter, p, false, false, "path.setFillType(SkPathFillType::kInverseEvenOdd);\n"
+ compare_dump(reporter, p, false, false, "path.setFillType(SkPath::kInverseEvenOdd_FillType);\n"
"path.moveTo(1, 2);\n"
"path.cubicTo(3, 4, 5, 6, 7, 8);\n");
p.reset();
- p.setFillType(SkPathFillType::kWinding);
+ p.setFillType(SkPath::kWinding_FillType);
p.moveTo(1, 2);
p.lineTo(3, 4);
compare_dump(reporter, p, false, true,
- "path.setFillType(SkPathFillType::kWinding);\n"
+ "path.setFillType(SkPath::kWinding_FillType);\n"
"path.moveTo(SkBits2Float(0x3f800000), SkBits2Float(0x40000000)); // 1, 2\n"
"path.lineTo(SkBits2Float(0x40400000), SkBits2Float(0x40800000)); // 3, 4\n");
p.reset();
p.moveTo(SkBits2Float(0x3f800000), SkBits2Float(0x40000000));
p.lineTo(SkBits2Float(0x40400000), SkBits2Float(0x40800000));
- compare_dump(reporter, p, false, false, "path.setFillType(SkPathFillType::kWinding);\n"
+ compare_dump(reporter, p, false, false, "path.setFillType(SkPath::kWinding_FillType);\n"
"path.moveTo(1, 2);\n"
"path.lineTo(3, 4);\n");
}
@@ -4525,7 +4525,7 @@
static void test_skbug_7015() {
SkPath path;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x4388c000), SkBits2Float(0x43947c08)); // 273.5f, 296.969f
path.lineTo(SkBits2Float(0x4386c000), SkBits2Float(0x43947c08)); // 269.5f, 296.969f
// 269.297f, 292.172f, 273.695f, 292.172f, 273.5f, 296.969f
@@ -4549,7 +4549,7 @@
static void test_skbug_7435() {
SkPaint paint;
SkPath path;
- path.setFillType(SkPathFillType::kWinding);
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x7f07a5af), SkBits2Float(0xff07ff1d)); // 1.80306e+38f, -1.8077e+38f
path.lineTo(SkBits2Float(0x7edf4b2d), SkBits2Float(0xfedffe0a)); // 1.48404e+38f, -1.48868e+38f
path.lineTo(SkBits2Float(0x7edf4585), SkBits2Float(0xfee003b2)); // 1.48389e+38f, -1.48883e+38f
@@ -5147,7 +5147,7 @@
REPORTER_ASSERT(reporter, !canvas->isClipEmpty());
for (bool aa : {false, true}) {
- for (auto ft : {SkPathFillType::kWinding, SkPathFillType::kInverseWinding}) {
+ for (SkPath::FillType ft : {SkPath::kWinding_FillType, SkPath::kInverseWinding_FillType}) {
for (SkScalar bad : {SK_ScalarInfinity, SK_ScalarNaN}) {
for (int bits = 1; bits <= 15; ++bits) {
SkPoint p0 = { 0, 0 };
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index a73cd9e..27243c2 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -379,7 +379,7 @@
SkPath invPath;
invPath.addOval(rect1);
- invPath.setFillType(SkPathFillType::kInverseEvenOdd);
+ invPath.setFillType(SkPath::kInverseEvenOdd_FillType);
SkPath path;
path.addOval(rect2);
SkPath path2;
diff --git a/tests/RegionTest.cpp b/tests/RegionTest.cpp
index a7d585d..239ffaa 100644
--- a/tests/RegionTest.cpp
+++ b/tests/RegionTest.cpp
@@ -421,7 +421,7 @@
DEF_TEST(region_inverse_union_skbug_7491, reporter) {
SkPath path;
- path.setFillType(SkPathFillType::kInverseWinding);
+ path.setFillType(SkPath::kInverseWinding_FillType);
path.moveTo(10, 20); path.lineTo(10, 30); path.lineTo(10.1f, 10); path.close();
SkRegion clip;
diff --git a/tests/StrokeTest.cpp b/tests/StrokeTest.cpp
index 84cc5e1..e13a775 100644
--- a/tests/StrokeTest.cpp
+++ b/tests/StrokeTest.cpp
@@ -168,6 +168,7 @@
paint.setStrokeWidth(1.49679073e+10f);
SkPath path;
+ path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x46380000), SkBits2Float(0xc6380000)); // 11776, -11776
path.lineTo(SkBits2Float(0x46a00000), SkBits2Float(0xc6a00000)); // 20480, -20480
path.lineTo(SkBits2Float(0x468c0000), SkBits2Float(0xc68c0000)); // 17920, -17920
diff --git a/tools/ToolUtils.cpp b/tools/ToolUtils.cpp
index 90abac4..99e25ee 100644
--- a/tools/ToolUtils.cpp
+++ b/tools/ToolUtils.cpp
@@ -229,7 +229,7 @@
SkPath make_star(const SkRect& bounds, int numPts, int step) {
SkASSERT(numPts != step);
SkPath path;
- path.setFillType(SkPathFillType::kEvenOdd);
+ path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, -1);
for (int i = 1; i < numPts; ++i) {
int idx = i * step % numPts;
diff --git a/tools/debugger/DrawCommand.cpp b/tools/debugger/DrawCommand.cpp
index 44c4288..7571a48 100644
--- a/tools/debugger/DrawCommand.cpp
+++ b/tools/debugger/DrawCommand.cpp
@@ -518,18 +518,18 @@
void DrawCommand::MakeJsonPath(SkJSONWriter& writer, const SkPath& path) {
writer.beginObject();
- switch (path.getNewFillType()) {
- case SkPathFillType::kWinding:
+ switch (path.getFillType()) {
+ case SkPath::kWinding_FillType:
writer.appendString(DEBUGCANVAS_ATTRIBUTE_FILLTYPE, DEBUGCANVAS_FILLTYPE_WINDING);
break;
- case SkPathFillType::kEvenOdd:
+ case SkPath::kEvenOdd_FillType:
writer.appendString(DEBUGCANVAS_ATTRIBUTE_FILLTYPE, DEBUGCANVAS_FILLTYPE_EVENODD);
break;
- case SkPathFillType::kInverseWinding:
+ case SkPath::kInverseWinding_FillType:
writer.appendString(DEBUGCANVAS_ATTRIBUTE_FILLTYPE,
DEBUGCANVAS_FILLTYPE_INVERSEWINDING);
break;
- case SkPathFillType::kInverseEvenOdd:
+ case SkPath::kInverseEvenOdd_FillType:
writer.appendString(DEBUGCANVAS_ATTRIBUTE_FILLTYPE,
DEBUGCANVAS_FILLTYPE_INVERSEEVENODD);
break;