diff options
Diffstat (limited to 'src/pipe')
| -rw-r--r-- | src/pipe/SkPipeCanvas.cpp | 7 | ||||
| -rw-r--r-- | src/pipe/SkPipeReader.cpp | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/pipe/SkPipeCanvas.cpp b/src/pipe/SkPipeCanvas.cpp index b9fcd2d4b5..d53e40d83c 100644 --- a/src/pipe/SkPipeCanvas.cpp +++ b/src/pipe/SkPipeCanvas.cpp @@ -556,7 +556,7 @@ void SkPipeCanvas::onDrawImageLattice(const SkImage* image, const Lattice& latti if (paint) { extra |= kHasPaint_DrawImageLatticeMask; } - if (lattice.fFlags) { + if (lattice.fRectTypes) { extra |= kHasFlags_DrawImageLatticeMask; } if (lattice.fXCount >= kCount_DrawImageLatticeMask) { @@ -583,10 +583,11 @@ void SkPipeCanvas::onDrawImageLattice(const SkImage* image, const Lattice& latti // so we can store them smaller. writer.write(lattice.fXDivs, lattice.fXCount * sizeof(int32_t)); writer.write(lattice.fYDivs, lattice.fYCount * sizeof(int32_t)); - if (lattice.fFlags) { + if (lattice.fRectTypes) { int32_t count = (lattice.fXCount + 1) * (lattice.fYCount + 1); SkASSERT(count > 0); - write_pad(&writer, lattice.fFlags, count); + write_pad(&writer, lattice.fRectTypes, count); + write_pad(&writer, lattice.fColors, count*sizeof(SkColor)); } SkASSERT(lattice.fBounds); writer.write(&lattice.fBounds, sizeof(*lattice.fBounds)); diff --git a/src/pipe/SkPipeReader.cpp b/src/pipe/SkPipeReader.cpp index 593c8b3ce9..3afb22e3bf 100644 --- a/src/pipe/SkPipeReader.cpp +++ b/src/pipe/SkPipeReader.cpp @@ -560,9 +560,11 @@ static void drawImageLattice_handler(SkPipeReader& reader, uint32_t packedVerb, if (packedVerb & kHasFlags_DrawImageLatticeMask) { int32_t count = (lattice.fXCount + 1) * (lattice.fYCount + 1); SkASSERT(count > 0); - lattice.fFlags = skip<SkCanvas::Lattice::Flags>(reader, SkAlign4(count)); + lattice.fRectTypes = skip<SkCanvas::Lattice::RectType>(reader, SkAlign4(count)); + lattice.fColors = skip<SkColor>(reader, SkAlign4(count)); } else { - lattice.fFlags = nullptr; + lattice.fRectTypes = nullptr; + lattice.fColors = nullptr; } lattice.fBounds = skip<SkIRect>(reader); const SkRect* dst = skip<SkRect>(reader); |