diff options
| author |  caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-16 19:21:30 +0000 |
|---|---|---|
| committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-16 19:21:30 +0000 |
| commit | 95bfdedb371262905ae06b9c06b2c0f55869a441 (patch) | |
| tree | 78ee041b135b55480ee9b425b469b4e11c001ba6 | |
| parent | 82a7bfcb2dbd4f8845a85fc8bddf2c1e59528582 (diff) | |
Add cast to support 64 bit.
http://code.google.com/p/skia/issues/detail?id=524
Review URL: https://codereview.appspot.com/6038053
git-svn-id: http://skia.googlecode.com/svn/trunk@3701 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | include/core/SkFontHost.h | 2 | ||||
| -rw-r--r-- | src/ports/SkFontHost_mac_coretext.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/core/SkFontHost.h b/include/core/SkFontHost.h index e83ac6cb23..25c9ecba51 100644 --- a/include/core/SkFontHost.h +++ b/include/core/SkFontHost.h @@ -17,7 +17,7 @@ class SkDescriptor; class SkStream; class SkWStream; -typedef uintptr_t SkFontTableTag; +typedef uint32_t SkFontTableTag; /** \class SkFontHost diff --git a/src/ports/SkFontHost_mac_coretext.cpp b/src/ports/SkFontHost_mac_coretext.cpp index 130f1f7982..5c9f49d27d 100644 --- a/src/ports/SkFontHost_mac_coretext.cpp +++ b/src/ports/SkFontHost_mac_coretext.cpp @@ -1952,7 +1952,9 @@ int SkFontHost::GetTableTags(SkFontID fontID, SkFontTableTag tags[]) { int count = CFArrayGetCount(cfArray); if (tags) { for (int i = 0; i < count; ++i) { - tags[i] = (SkFontTableTag)CFArrayGetValueAtIndex(cfArray, i); + uintptr_t fontTag = reinterpret_cast<uintptr_t>( + CFArrayGetValueAtIndex(cfArray, i)); + tags[i] = static_cast<SkFontTableTag>(fontTag); } } return count; |