diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-15 17:47:36 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-15 17:47:36 +0000 |
| commit | 8b169311b59ab84e8ca6f3630a1e960cc1be751e (patch) | |
| tree | 5d9ec712d281a81183fed5b650b1f9a92ae7cad4 /src/pdf | |
| parent | baa15581f6cbd9ce4cc5ba5eb1d6fcbe27ae6741 (diff) | |
Second wave of Win64 warning cleanup
https://codereview.chromium.org/27343002/
git-svn-id: http://skia.googlecode.com/svn/trunk@11778 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/pdf')
| -rw-r--r-- | src/pdf/SkPDFResourceDict.cpp | 2 | ||||
| -rw-r--r-- | src/pdf/SkTSet.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/pdf/SkPDFResourceDict.cpp b/src/pdf/SkPDFResourceDict.cpp index 0102b3c49a..6f5d1679a3 100644 --- a/src/pdf/SkPDFResourceDict.cpp +++ b/src/pdf/SkPDFResourceDict.cpp @@ -65,7 +65,7 @@ SkPDFResourceDict::SkPDFResourceDict() : SkPDFDict() { // Actual sub-dicts will be lazily added later fTypes.setCount(kResourceTypeCount); - for (size_t i=0; i < kResourceTypeCount; i++) { + for (int i=0; i < kResourceTypeCount; i++) { fTypes[i] = NULL; } } diff --git a/src/pdf/SkTSet.h b/src/pdf/SkTSet.h index c2d2785f0f..1609a9de10 100644 --- a/src/pdf/SkTSet.h +++ b/src/pdf/SkTSet.h @@ -291,12 +291,12 @@ public: // A O(n log n) algorithm is necessary as O(n^2) will choke some GMs. SkAutoMalloc sortedArray(fOrderedArray->bytes()); T* sortedBase = reinterpret_cast<T*>(sortedArray.get()); - size_t count = fOrderedArray->count(); + int count = fOrderedArray->count(); fOrderedArray->copyRange(sortedBase, 0, count); SkTQSort<T>(sortedBase, sortedBase + count - 1); - for (size_t i = 0; i < count; ++i) { + for (int i = 0; i < count; ++i) { if (sortedBase[i] != (*fSetArray)[i]) { return false; } |