From adacc7067ad617cdc7bbef39192ca80f4b4d27f9 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Mon, 14 Oct 2013 21:53:24 +0000 Subject: Start cleaning up 64bit Win warnings https://codereview.chromium.org/27192003/ git-svn-id: http://skia.googlecode.com/svn/trunk@11764 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/core/SkOrderedWriteBuffer.h | 4 ++-- src/core/SkRTree.cpp | 2 +- src/core/SkRTree.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core') diff --git a/src/core/SkOrderedWriteBuffer.h b/src/core/SkOrderedWriteBuffer.h index 180f9a4d63..277b7bfd81 100644 --- a/src/core/SkOrderedWriteBuffer.h +++ b/src/core/SkOrderedWriteBuffer.h @@ -42,9 +42,9 @@ public: void writeToMemory(void* dst) { fWriter.flatten(dst); } uint32_t* reserve(size_t size) { return fWriter.reserve(size); } - uint32_t bytesWritten() const { return fWriter.bytesWritten(); } + size_t bytesWritten() const { return fWriter.bytesWritten(); } // Deprecated. Please call bytesWritten instead. TODO(mtklein): clean up - uint32_t size() const { return this->bytesWritten(); } + size_t size() const { return this->bytesWritten(); } virtual void writeByteArray(const void* data, size_t size) SK_OVERRIDE; virtual void writeBool(bool value) SK_OVERRIDE; diff --git a/src/core/SkRTree.cpp b/src/core/SkRTree.cpp index b6f8e95dea..e3d2eb696d 100644 --- a/src/core/SkRTree.cpp +++ b/src/core/SkRTree.cpp @@ -406,7 +406,7 @@ void SkRTree::validate() { if (this->isEmpty()) { return; } - SkASSERT(fCount == (size_t)this->validateSubtree(fRoot.fChild.subtree, fRoot.fBounds, true)); + SkASSERT(fCount == this->validateSubtree(fRoot.fChild.subtree, fRoot.fBounds, true)); #endif } diff --git a/src/core/SkRTree.h b/src/core/SkRTree.h index 54421de14c..2f905e7909 100644 --- a/src/core/SkRTree.h +++ b/src/core/SkRTree.h @@ -179,7 +179,7 @@ private: const size_t fNodeSize; // This is the count of data elements (rather than total nodes in the tree) - size_t fCount; + int fCount; Branch fRoot; SkChunkAlloc fNodes; -- cgit v1.2.3