diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-20 15:56:14 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-20 15:56:14 +0000 |
| commit | 8c99c9f4a6fa14a4ade0fb39ff431f43a7306fc7 (patch) | |
| tree | 536610a55d61054d4b3478454779747b7d8a436c /include | |
| parent | 80051d38a3469adb67fa7f503cf43fc2960c28b7 (diff) | |
Reverting r12315 (More Windows 64b compilation warning fixes) due to compilation failures
git-svn-id: http://skia.googlecode.com/svn/trunk@12316 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkUtils.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/core/SkUtils.h b/include/core/SkUtils.h index d6bf8dd3ee..c2dcad950f 100644 --- a/include/core/SkUtils.h +++ b/include/core/SkUtils.h @@ -71,7 +71,8 @@ size_t SkUTF8_FromUnichar(SkUnichar uni, char utf8[] = NULL); #define SkUTF16_IsLowSurrogate(c) (((c) & 0xFC00) == 0xDC00) int SkUTF16_CountUnichars(const uint16_t utf16[]); -int SkUTF16_CountUnichars(const uint16_t utf16[], int numberOf16BitValues); +int SkUTF16_CountUnichars(const uint16_t utf16[], + int numberOf16BitValues); // returns the current unichar and then moves past it (*p++) SkUnichar SkUTF16_NextUnichar(const uint16_t**); // this guy backs up to the previus unichar value, and returns it (*--p) @@ -79,7 +80,7 @@ SkUnichar SkUTF16_PrevUnichar(const uint16_t**); size_t SkUTF16_FromUnichar(SkUnichar uni, uint16_t utf16[] = NULL); size_t SkUTF16_ToUTF8(const uint16_t utf16[], int numberOf16BitValues, - char utf8[] = NULL); + char utf8[] = NULL); inline bool SkUnichar_IsVariationSelector(SkUnichar uni) { /* The 'true' ranges are: |