More Windows 64b compilation warning fixes

src/core/SkUtils.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 "SkUtils.h"
@@ skipping 352 matching lines @@
             SkASSERT(SkUTF16_IsLowSurrogate(dst[1]));
         } else {
             dst[0] = SkToU16(uni);
             SkASSERT(!SkUTF16_IsHighSurrogate(dst[0]));
             SkASSERT(!SkUTF16_IsLowSurrogate(dst[0]));
         }
     }
     return 1 + extra;
 }
 
-size_t SkUTF16_ToUTF8(const uint16_t utf16[], int numberOf16BitValues,

[bsalomon, 2013/10/29 14:40:36]

not sure about this one

[robertphillips, 2013/11/18 20:22:41]

Done.

+size_t SkUTF16_ToUTF8(const uint16_t utf16[], size_t numberOf16BitValues,
                       char utf8[]) {
     SkASSERT(numberOf16BitValues >= 0);
     if (numberOf16BitValues <= 0) {
         return 0;
     }
 
     SkASSERT(utf16 != NULL);
 
     const uint16_t* stop = utf16 + numberOf16BitValues;
     size_t          size = 0;
 
     if (utf8 == NULL) {    // just count
         while (utf16 < stop) {
             size += SkUTF8_FromUnichar(SkUTF16_NextUnichar(&utf16), NULL);
         }
     } else {
         char* start = utf8;
         while (utf16 < stop) {
             utf8 += SkUTF8_FromUnichar(SkUTF16_NextUnichar(&utf16), utf8);
         }
         size = utf8 - start;
     }
     return size;
 }