diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-19 22:00:40 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-19 22:00:40 +0000 |
| commit | 2cfa3200fda29279eba1240170c7e873d12f9d48 (patch) | |
| tree | 42c50379d08cfbbf9d2af7b316010feafe1b1f78 /src/core/SkPicturePlayback.cpp | |
| parent | 2dceedaa1e4dfb9accc82d8e3d3afac9ba5b2142 (diff) | |
fix warnings around size_t/int
fix warnings around undeclared (non-static) functions
TBR=bsalomon@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/242643008
git-svn-id: http://skia.googlecode.com/svn/trunk@14267 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkPicturePlayback.cpp')
| -rw-r--r-- | src/core/SkPicturePlayback.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp index 52ea56d5a0..ba18392c88 100644 --- a/src/core/SkPicturePlayback.cpp +++ b/src/core/SkPicturePlayback.cpp @@ -310,14 +310,14 @@ bool SkPicturePlayback::containsBitmaps() const { #include "SkStream.h" -static void write_tag_size(SkWriteBuffer& buffer, uint32_t tag, uint32_t size) { +static void write_tag_size(SkWriteBuffer& buffer, uint32_t tag, size_t size) { buffer.writeUInt(tag); buffer.writeUInt(size); } -static void write_tag_size(SkWStream* stream, uint32_t tag, uint32_t size) { +static void write_tag_size(SkWStream* stream, uint32_t tag, size_t size) { stream->write32(tag); - stream->write32(size); + stream->write32(SkToU32(size)); } static size_t compute_chunk_size(SkFlattenable::Factory* array, int count) { @@ -357,7 +357,7 @@ static void write_factories(SkWStream* stream, const SkFactorySet& rec) { if (NULL == name || 0 == *name) { stream->writePackedUInt(0); } else { - uint32_t len = strlen(name); + size_t len = strlen(name); stream->writePackedUInt(len); stream->write(name, len); } |