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

undo accidental checkin

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@4422 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2012-07-02 17:29:44 +00:00
parent ab69788571
commit 5ccbe38285
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/core/SkChecksum.h
View File

@ -59,27 +59,11 @@ inline uint32_t SkComputeChecksum32(const uint32_t* ptr, size_t size) {
SkASSERT(SkIsAlign4(size));
SkASSERT(SkIsAlign4((intptr_t)ptr));
uint32_t result;
if (8 == sizeof(void*)) {
uint64_t result8 = 0;
if (size & 4) {
result8 = *ptr++; // initial 32bit value
}
const uint64_t* ptr8 = (const uint64_t*)ptr;
const uint64_t* stop = ptr8 + (size >> 3);
while (ptr8 < stop) {
SkCHECKSUM_MASH(result8, *ptr8);
ptr8++;
}
result = static_cast<uint32_t>(result8 ^ (result8 >> 32));
} else {
result = 0;
const uint32_t* stop = ptr + (size >> 2);
while (ptr < stop) {
SkCHECKSUM_MASH(result, *ptr);
ptr++;
}
const uint32_t* stop = ptr + (size >> 2);
uint32_t result = 0;
while (ptr < stop) {
SkCHECKSUM_MASH(result, *ptr);
ptr++;
}
return result;
}