diff options
| author |  Kevin Lubick <kjlubick@users.noreply.github.com> | 2018-05-30 17:08:18 -0400 |
|---|---|---|
| committer |  jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com> | 2018-05-30 14:08:18 -0700 |
| commit | 6eaadbb408b8fefe1a3c9e81a2fea0a9011e8db7 (patch) | |
| tree | fc0a20f21ca5e0adbd929a936993ee3923bff2ec /projects/skia | |
| parent | 04be9ced8f1e10db3f2add6f138450d2fe89d5cf (diff) | |
[skia] Fix build (#1460)
Diffstat (limited to 'projects/skia')
| -rw-r--r-- | projects/skia/skia.diff | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/projects/skia/skia.diff b/projects/skia/skia.diff index 59ee8e9b..ec4a8b54 100644 --- a/projects/skia/skia.diff +++ b/projects/skia/skia.diff @@ -30,7 +30,7 @@ index b22b8ebebb..aec422fa96 100644 const uint8_t* rowA = nullptr; const uint8_t* rowB = nullptr; diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp -index 7e526e6098..c728d3e209 100644 +index b7150f85f8..dabe18e76e 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -1138,6 +1138,12 @@ void SkDraw::drawPath(const SkPath& origSrcPath, const SkPaint& origPaint, @@ -47,7 +47,7 @@ index 7e526e6098..c728d3e209 100644 } diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp -index a9447212d3..d12aefaad3 100644 +index aabfef09bb..f4cd14b6d1 100644 --- a/src/core/SkImageFilter.cpp +++ b/src/core/SkImageFilter.cpp @@ -117,6 +117,12 @@ bool SkImageFilter::Common::unflatten(SkReadBuffer& buffer, int expectedCount) { @@ -131,7 +131,7 @@ index 510efd6d9d..9692f8a461 100644 path->setIsVolatile(true); path->setFillType(SkPath::kWinding_FillType); diff --git a/src/core/SkReadBuffer.cpp b/src/core/SkReadBuffer.cpp -index d41f2902f2..dc90ddd2be 100644 +index 3491428658..8d53d8165d 100644 --- a/src/core/SkReadBuffer.cpp +++ b/src/core/SkReadBuffer.cpp @@ -279,7 +279,12 @@ sk_sp<SkData> SkReadBuffer::readByteArrayAsData() { @@ -146,7 +146,7 @@ index d41f2902f2..dc90ddd2be 100644 +#endif } - sk_sp<SkImage> SkReadBuffer::readImage() { + /* Format: diff --git a/src/core/SkScan_AAAPath.cpp b/src/core/SkScan_AAAPath.cpp index 5e7f232ff7..e8acd9a109 100644 --- a/src/core/SkScan_AAAPath.cpp @@ -194,7 +194,7 @@ index 815130d532..310d464bb7 100644 SkFixed startX = SkFDot6ToFixed(x0) + (slope * ((32 - y0) & 63) >> 6); diff --git a/src/core/SkScan_Path.cpp b/src/core/SkScan_Path.cpp -index 2373e62d46..410fa8a276 100644 +index 43240eae37..a6f8b254e6 100644 --- a/src/core/SkScan_Path.cpp +++ b/src/core/SkScan_Path.cpp @@ -245,6 +245,11 @@ static void walk_convex_edges(SkEdge* prevHead, SkPath::FillType, @@ -242,10 +242,10 @@ index a541b91476..53cd354b79 100644 const SkMatrix& mat = this->getMatrix(); SkPoint src, dst; diff --git a/src/effects/SkDashPathEffect.cpp b/src/effects/SkDashPathEffect.cpp -index 4cb98b3ad8..2710c122d8 100644 +index 1a2c635a7f..71cd050992 100644 --- a/src/effects/SkDashPathEffect.cpp +++ b/src/effects/SkDashPathEffect.cpp -@@ -373,6 +373,12 @@ sk_sp<SkFlattenable> SkDashImpl::CreateProc(SkReadBuffer& buffer) { +@@ -374,6 +374,12 @@ sk_sp<SkFlattenable> SkDashImpl::CreateProc(SkReadBuffer& buffer) { return nullptr; } @@ -275,7 +275,7 @@ index 57d8f9639e..148b1f756b 100644 if (fSegLength * (2 + doFill) > length) { meas.getSegment(0, length, dst, true); // to short for us to mangle diff --git a/src/effects/SkLayerDrawLooper.cpp b/src/effects/SkLayerDrawLooper.cpp -index 6a8254d894..b55371cfb7 100644 +index db61e08c4f..6329ee0447 100644 --- a/src/effects/SkLayerDrawLooper.cpp +++ b/src/effects/SkLayerDrawLooper.cpp @@ -261,6 +261,11 @@ void SkLayerDrawLooper::flatten(SkWriteBuffer& buffer) const { @@ -341,7 +341,7 @@ index 47b41250e2..ce69469e80 100755 int winding = get_winding(inputPolygonVerts, inputPolygonSize); if (0 == winding) { diff --git a/src/utils/SkShadowTessellator.cpp b/src/utils/SkShadowTessellator.cpp -index ee2375ebf2..3ffe7147a8 100755 +index c377579de2..8f155e46d9 100755 --- a/src/utils/SkShadowTessellator.cpp +++ b/src/utils/SkShadowTessellator.cpp @@ -270,6 +270,11 @@ bool SkBaseShadowTessellator::addArc(const SkVector& nextNormal, bool finishArc) |