AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix 64-bit Mac warnings/memory corruption

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@569 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@android.com 2010-05-18 21:23:30 +00:00
parent 033e03cb19
commit e89d3ec443
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/core/SkThread_platform.h
View File

@ -61,7 +61,7 @@ public:
private:
bool fIsGlobal;
enum {
kStorageIntCount = 12
kStorageIntCount = 64
};
uint32_t fStorage[kStorageIntCount];
};

2
src/core/SkPaint.cpp
View File

@ -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) {

2
src/core/SkTypeface.cpp
View File

@ -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) {