fix size_t/int warnings

src/core/SkStream.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkStream.h"
@@ skipping 143 matching lines @@
     size_t len = 1;
     if (value <= SK_MAX_BYTE_FOR_U8) {
         data[0] = value;
         len = 1;
     } else if (value <= 0xFFFF) {
         uint16_t value16 = value;
         data[0] = SK_BYTE_SENTINEL_FOR_U16;
         memcpy(&data[1], &value16, 2);
         len = 3;
     } else {
-        uint32_t value32 = value;
+        uint32_t value32 = SkToU32(value);
         data[0] = SK_BYTE_SENTINEL_FOR_U32;
         memcpy(&data[1], &value32, 4);
         len = 5;
     }
     return this->write(data, len);
 }
 
 bool SkWStream::writeStream(SkStream* stream, size_t length) {
     char scratch[1024];
     const size_t MAX = sizeof(scratch);
 
     while (length != 0) {
         size_t n = length;
         if (n > MAX) {
             n = MAX;
         }
         stream->read(scratch, n);
         if (!this->write(scratch, n)) {
             return false;
         }
         length -= n;
     }
     return true;
 }
 
 bool SkWStream::writeData(const SkData* data) {
     if (data) {
-        this->write32(data->size());
+        this->write32(SkToU32(data->size()));
         this->write(data->data(), data->size());
     } else {
         this->write32(0);
     }
     return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFILEStream::SkFILEStream(const char file[]) : fName(file), fOwnership(kCallerPasses_Ownership) {
@@ skipping 271 matching lines @@
     }
 }
 
 ////////////////////////////////////////////////////////////////////////
 
 SkMemoryWStream::SkMemoryWStream(void* buffer, size_t size)
     : fBuffer((char*)buffer), fMaxLength(size), fBytesWritten(0)
 {
 }
 
-bool SkMemoryWStream::write(const void* buffer, size_t size)
-{
-    size = SkMin32(size, fMaxLength - fBytesWritten);
-    if (size > 0)
-    {
+bool SkMemoryWStream::write(const void* buffer, size_t size) {
+    size = SkTMin(size, fMaxLength - fBytesWritten);
+    if (size > 0) {
         memcpy(fBuffer + fBytesWritten, buffer, size);
         fBytesWritten += size;
         return true;
     }
     return false;
 }
 
 ////////////////////////////////////////////////////////////////////////
 
 #define SkDynamicMemoryWStream_MinBlockSize   256
@@ skipping 52 matching lines @@
 bool SkDynamicMemoryWStream::write(const void* buffer, size_t count)
 {
     if (count > 0) {
         this->invalidateCopy();
 
         fBytesWritten += count;
 
         size_t  size;
 
         if (fTail != NULL && fTail->avail() > 0) {
-            size = SkMin32(fTail->avail(), count);
+            size = SkTMin(fTail->avail(), count);
             buffer = fTail->append(buffer, size);
             SkASSERT(count >= size);
             count -= size;
             if (count == 0)
                 return true;
         }
 
-        size = SkMax32(count, SkDynamicMemoryWStream_MinBlockSize);
+        size = SkTMax<size_t>(count, SkDynamicMemoryWStream_MinBlockSize);
         Block* block = (Block*)sk_malloc_throw(sizeof(Block) + size);
         block->init(size);
         block->append(buffer, count);
 
         if (fTail != NULL)
             fTail->fNext = block;
         else
             fHead = fTail = block;
         fTail = block;
     }
@@ skipping 266 matching lines @@
 
     // If we get here, then our attempt at using mmap failed, so try normal
     // file access.
     SkFILEStream* stream = SkNEW_ARGS(SkFILEStream, (path));
     if (!stream->isValid()) {
         stream->unref();
         stream = NULL;
     }
     return stream;
 }