diff options
| author |  scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-04 17:17:36 +0000 |
|---|---|---|
| committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-04 17:17:36 +0000 |
| commit | 5af9b2032b552516c9223d9fb22185b022b13c62 (patch) | |
| tree | 7cc39054417af0eb346d09a4defb7a8ca3a5712f /src | |
| parent | da30999f2b71fdc2997fdb83fb65146c053759ed (diff) | |
Make the GM tool run GMs through an SkGPipe.
Add pipe to core gyp project.
Do not run samplerstress through the pipe, since its
custom MaskFilter will not draw correctly.
Fix an assert in SkGPipeWrite when writing a typeface.
Review URL: https://codereview.appspot.com/6276044
git-svn-id: http://skia.googlecode.com/svn/trunk@4139 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/pipe/SkGPipeWrite.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp index 08c6f49a39..5d359889a2 100644 --- a/src/pipe/SkGPipeWrite.cpp +++ b/src/pipe/SkGPipeWrite.cpp @@ -67,9 +67,9 @@ static size_t writeTypeface(SkWriter32* writer, SkTypeface* typeface) { if (writer) { writer->write32(size); SkAutoDataUnref data(stream.copyToData()); - writer->write(data.data(), size); + writer->writePad(data.data(), size); } - return 4 + size; + return 4 + SkAlign4(size); } /////////////////////////////////////////////////////////////////////////////// |