diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-03 17:35:39 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-03 17:35:39 +0000 |
| commit | b4ca46d748364236e82fdaccc08022dd89e29d40 (patch) | |
| tree | 1bb565bddd409b6e82e6dd5af39f39f80788438c /tests | |
| parent | 25720b4d7e6f86043997c040315f2874aa2c8c9a (diff) | |
SkBitmapHasher: use 64-bit-truncated MD5 instead of 64-bit CityHash
BUG=https://code.google.com/p/skia/issues/detail?id=1257
(if we change our mind within the next few days, we can toggle the
BITMAPHASHER_USES_TRUNCATED_MD5 #ifdef ; at some point, we'll remove that
option so we can delete our CityHash implementation entirely)
R=bungeman@google.com
Review URL: https://codereview.chromium.org/14054012
git-svn-id: http://skia.googlecode.com/svn/trunk@8992 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/BitmapHasherTest.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/tests/BitmapHasherTest.cpp b/tests/BitmapHasherTest.cpp index 6aa464d106..2823698a33 100644 --- a/tests/BitmapHasherTest.cpp +++ b/tests/BitmapHasherTest.cpp @@ -42,19 +42,35 @@ namespace skiatest { // initial test case CreateTestBitmap(bitmap, SkBitmap::kARGB_8888_Config, 333, 555, SK_ColorBLUE); REPORTER_ASSERT(fReporter, SkBitmapHasher::ComputeDigest(bitmap, &digest)); +#ifdef BITMAPHASHER_USES_TRUNCATED_MD5 + REPORTER_ASSERT(fReporter, digest == 0xfb2903562766ef87ULL); +#else REPORTER_ASSERT(fReporter, digest == 0x18f9df68b1b02f38ULL); +#endif // same pixel data but different dimensions should yield a different checksum CreateTestBitmap(bitmap, SkBitmap::kARGB_8888_Config, 555, 333, SK_ColorBLUE); REPORTER_ASSERT(fReporter, SkBitmapHasher::ComputeDigest(bitmap, &digest)); +#ifdef BITMAPHASHER_USES_TRUNCATED_MD5 + REPORTER_ASSERT(fReporter, digest == 0xfe04023fb97d0f61ULL); +#else REPORTER_ASSERT(fReporter, digest == 0x6b0298183f786c8eULL); +#endif // same dimensions but different color should yield a different checksum CreateTestBitmap(bitmap, SkBitmap::kARGB_8888_Config, 555, 333, SK_ColorGREEN); REPORTER_ASSERT(fReporter, SkBitmapHasher::ComputeDigest(bitmap, &digest)); +#ifdef BITMAPHASHER_USES_TRUNCATED_MD5 + REPORTER_ASSERT(fReporter, digest == 0x2423c51cad6d1edcULL); +#else REPORTER_ASSERT(fReporter, digest == 0xc6b4b3f6fadaaf37ULL); +#endif // same pixel colors in a different config should yield the same checksum CreateTestBitmap(bitmap, SkBitmap::kARGB_4444_Config, 555, 333, SK_ColorGREEN); REPORTER_ASSERT(fReporter, SkBitmapHasher::ComputeDigest(bitmap, &digest)); +#ifdef BITMAPHASHER_USES_TRUNCATED_MD5 + REPORTER_ASSERT(fReporter, digest == 0x2423c51cad6d1edcULL); +#else REPORTER_ASSERT(fReporter, digest == 0xc6b4b3f6fadaaf37ULL); +#endif } Reporter* fReporter; |