diff options
| author |  reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2010-05-18 21:23:30 +0000 |
|---|---|---|
| committer | reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2010-05-18 21:23:30 +0000 |
| commit | e89d3ec443563a77d0cf29f08c0d034b2a93ec18 (patch) | |
| tree | d7eaf440ed24e6bd25c132886d3268cb9b0ccada | |
| parent | 033e03cb191aff56e06e5d6aab917f60740dba63 (diff) | |
Fix 64-bit Mac warnings/memory corruption
git-svn-id: http://skia.googlecode.com/svn/trunk@569 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | include/core/SkThread_platform.h | 2 | ||||
| -rw-r--r-- | src/core/SkPaint.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkTypeface.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/core/SkThread_platform.h b/include/core/SkThread_platform.h index 825b737554..c2d0348178 100644 --- a/include/core/SkThread_platform.h +++ b/include/core/SkThread_platform.h @@ -61,7 +61,7 @@ public: private: bool fIsGlobal; enum { - kStorageIntCount = 12 + kStorageIntCount = 64 }; uint32_t fStorage[kStorageIntCount]; }; diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index da818c48c2..f28e15c332 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -717,7 +717,7 @@ typedef int64_t Sk48Dot16; #ifdef SK_SCALAR_IS_FLOAT static inline float Sk48Dot16ToScalar(Sk48Dot16 x) { - return x * 1.5258789e-5f; // x * (1 / 65536.0f) + return (float) (x * 1.5258789e-5); // x * (1 / 65536.0f) } #else static inline SkFixed Sk48Dot16ToScalar(Sk48Dot16 x) { diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp index 44337610c8..257df278ea 100644 --- a/src/core/SkTypeface.cpp +++ b/src/core/SkTypeface.cpp @@ -38,7 +38,7 @@ SkTypeface* SkTypeface::CreateForChars(const void* data, size_t bytelength, } SkTypeface* SkTypeface::CreateFromTypeface(const SkTypeface* family, Style s) { - return SkFontHost::CreateTypeface(family, NULL, NULL, NULL, s); + return SkFontHost::CreateTypeface(family, NULL, NULL, 0, s); } SkTypeface* SkTypeface::CreateFromStream(SkStream* stream) { |