bbf9f6d1cb
Reason for revert: broke 10.6 compile [17:13:56.863876] [4/336] CXX obj/src/core/core.SkBBoxHierarchyRecord.o [17:13:56.863997] FAILED: c++ -MMD -MF obj/src/core/core.SkBBoxRecord.o.d -DSK_INTERNAL -DSK_GAMMA_SRGB -DSK_GAMMA_APPLY_TO_A8 -DSK_SCALAR_TO_FLOAT_EXCLUDED -DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1 -DSK_SUPPORT_GPU=1 -DSK_SUPPORT_OPENCL=0 -DSK_FORCE_DISTANCEFIELD_FONTS=0 -DSK_SCALAR_IS_FLOAT -DSK_BUILD_FOR_MAC -DSK_USE_POSIX_THREADS -DSK_RELEASE -DNDEBUG -I../../include/config -I../../include/core -I../../include/pathops -I../../include/pipe -I../../include/ports -I../../include/utils -I../../include/xml -I../../src/core -I../../src/sfnt -I../../src/image -I../../src/opts -I../../src/utils -I../../include/utils/mac -I../../include/gpu -I../../src/gpu -fasm-blocks -mpascal-strings -O3 -gdwarf-2 -Wnewline-eof -mmacosx-version-min=10.6 -arch x86_64 -mssse3 -fvisibility=hidden -fvisibility-inlines-hidden -c ../../src/core/SkBBoxRecord.cpp -o obj/src/core/core.SkBBoxRecord.o [17:13:56.864085] In file included from ../../src/core/SkPictureFlat.h:14, [17:13:56.864130] from ../../src/core/SkPictureData.h:14, [17:13:56.864173] from ../../src/core/SkPictureRecord.h:18, [17:13:56.864217] from ../../src/core/SkBBoxRecord.h:12, [17:13:56.864261] from ../../src/core/SkBBoxRecord.cpp:9: [17:13:56.864336] ../../src/core/SkChecksum.h: In static member function ‘static uint32_t SkChecksum::Compute(const uint32_t*, size_t)’: [17:13:56.864397] ../../src/core/SkChecksum.h:127: error: invalid conversion from ‘const uint32_t*’ to ‘const uint32_t*’ [17:13:56.864462] ../../src/core/SkChecksum.h:128: error: invalid conversion from ‘const uint32_t*’ to ‘const uint32_t*’ [17:13:56.864510] ../../src/core/SkChecksum.h:129: error: comparison between distinct pointer types ‘const uint32_t*’ and ‘const uint32_t*’ lacks a cast Original issue's description: > Slim Skia down to just one murmur3 implementation. > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/6ac0037b70410ff7d5ce5788bc89314223e1a587 > > Committed: https://skia.googlesource.com/skia/+/67a3271f0de9ccc32d559b042b862528272047cc > > Committed: https://skia.googlesource.com/skia/+/53d435990bdb4d14df78013da45a9364d0287ebe R=mtklein@google.com, mtklein@chromium.org TBR=mtklein@chromium.org, mtklein@google.com NOTREECHECKS=true NOTRY=true BUG=skia: Author: reed@google.com Review URL: https://codereview.chromium.org/381253003
53 lines
1.8 KiB
C++
53 lines
1.8 KiB
C++
/*
|
|
* Copyright 2012 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "SkChecksum.h"
|
|
#include "SkRandom.h"
|
|
#include "Test.h"
|
|
|
|
|
|
// Murmur3 has an optional third seed argument, so we wrap it to fit a uniform type.
|
|
static uint32_t murmur_noseed(const uint32_t* d, size_t l) { return SkChecksum::Murmur3(d, l); }
|
|
|
|
#define ASSERT(x) REPORTER_ASSERT(r, x)
|
|
|
|
DEF_TEST(Checksum, r) {
|
|
// Algorithms to test. They're currently all uint32_t(const uint32_t*, size_t).
|
|
typedef uint32_t(*algorithmProc)(const uint32_t*, size_t);
|
|
const algorithmProc kAlgorithms[] = { &SkChecksum::Compute, &murmur_noseed };
|
|
|
|
// Put 128 random bytes into two identical buffers. Any multiple of 4 will do.
|
|
const size_t kBytes = SkAlign4(128);
|
|
SkRandom rand;
|
|
uint32_t data[kBytes/4], tweaked[kBytes/4];
|
|
for (size_t i = 0; i < SK_ARRAY_COUNT(tweaked); ++i) {
|
|
data[i] = tweaked[i] = rand.nextU();
|
|
}
|
|
|
|
// Test each algorithm.
|
|
for (size_t i = 0; i < SK_ARRAY_COUNT(kAlgorithms); ++i) {
|
|
const algorithmProc algorithm = kAlgorithms[i];
|
|
|
|
// Hash of NULL is always 0.
|
|
ASSERT(algorithm(NULL, 0) == 0);
|
|
|
|
const uint32_t hash = algorithm(data, kBytes);
|
|
// Should be deterministic.
|
|
ASSERT(hash == algorithm(data, kBytes));
|
|
|
|
// Changing any single element should change the hash.
|
|
for (size_t j = 0; j < SK_ARRAY_COUNT(tweaked); ++j) {
|
|
const uint32_t saved = tweaked[j];
|
|
tweaked[j] = rand.nextU();
|
|
const uint32_t tweakedHash = algorithm(tweaked, kBytes);
|
|
ASSERT(tweakedHash != hash);
|
|
ASSERT(tweakedHash == algorithm(tweaked, kBytes));
|
|
tweaked[j] = saved;
|
|
}
|
|
}
|
|
}
|