aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/utils/SkBitmapHasher.cpp
diff options
context:
space:
mode:
authorGravatar epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-05-08 14:49:50 +0000
committerGravatar epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-05-08 14:49:50 +0000
commitaaf7343e16c4bf9f9c6f07968689669fe6ba71d7 (patch)
treeb1de9d98fbedfe025db75eeab526f31eb6a680c6 /src/utils/SkBitmapHasher.cpp
parent0a01f5a2c44f3d6a7fa2d3c837f46894d9b29e5d (diff)
Remove third-party cityhash, unused since r8992
R=djsollen@google.com Review URL: https://codereview.chromium.org/15027013 git-svn-id: http://skia.googlecode.com/svn/trunk@9059 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/utils/SkBitmapHasher.cpp')
-rw-r--r--src/utils/SkBitmapHasher.cpp18
1 files changed, 0 insertions, 18 deletions
diff --git a/src/utils/SkBitmapHasher.cpp b/src/utils/SkBitmapHasher.cpp
index 82cbe9fa7e..5342d18d10 100644
--- a/src/utils/SkBitmapHasher.cpp
+++ b/src/utils/SkBitmapHasher.cpp
@@ -10,12 +10,7 @@
#include "SkEndian.h"
#include "SkImageEncoder.h"
-#ifdef BITMAPHASHER_USES_TRUNCATED_MD5
#include "SkMD5.h"
-#else
-#include "SkCityHash.h"
-#include "SkStream.h"
-#endif
/**
* Write an int32 value to a stream in little-endian order.
@@ -37,16 +32,7 @@ static inline uint64_t first_8_bytes_as_uint64(const uint8_t *bytearray) {
/*static*/ bool SkBitmapHasher::ComputeDigestInternal(const SkBitmap& bitmap,
SkHashDigest *result) {
-#ifdef BITMAPHASHER_USES_TRUNCATED_MD5
SkMD5 out;
-#else
- size_t pixelBufferSize = bitmap.width() * bitmap.height() * 4;
- size_t totalBufferSize = pixelBufferSize + 2 * sizeof(uint32_t);
-
- SkAutoMalloc bufferManager(totalBufferSize);
- char *bufferStart = static_cast<char *>(bufferManager.get());
- SkMemoryWStream out(bufferStart, totalBufferSize);
-#endif
// start with the x/y dimensions
write_int32_to_buffer(SkToU32(bitmap.width()), &out);
@@ -58,13 +44,9 @@ static inline uint64_t first_8_bytes_as_uint64(const uint8_t *bytearray) {
return false;
}
-#ifdef BITMAPHASHER_USES_TRUNCATED_MD5
SkMD5::Digest digest;
out.finish(digest);
*result = first_8_bytes_as_uint64(digest.data);
-#else
- *result = SkCityHash::Compute64(bufferStart, totalBufferSize);
-#endif
return true;
}