commit b4ca46d748364236e82fdaccc08022dd89e29d40
author epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 03 17:35:39 2013 +0000
committer epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 03 17:35:39 2013 +0000
tree 1bb565bddd409b6e82e6dd5af39f39f80788438c
parent 25720b4d7e6f86043997c040315f2874aa2c8c9a

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

tests/BitmapHasherTest.cpp

diff --git a/tests/BitmapHasherTest.cpp b/tests/BitmapHasherTest.cpp
index 6aa464d..2823698 100644
--- a/tests/BitmapHasherTest.cpp
+++ b/tests/BitmapHasherTest.cpp
@@ -42,19 +42,35 @@
             // 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;