diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-12 02:23:55 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-12 02:23:55 +0000 |
| commit | 908f5836626d792c5e33ad93f44c6a418a0cc8f5 (patch) | |
| tree | 2387bc49caeabbd315b34d9973327a5fa310335e /gm/gm_expectations.h | |
| parent | bcbf5aa77ddce07c95efc51c567ce737da7f267d (diff) | |
rename SkBitmapChecksummer as SkBitmapHasher, and prepare for it to possibly use
some algorithm other than CityHash
Review URL: https://codereview.chromium.org/14170010
git-svn-id: http://skia.googlecode.com/svn/trunk@8639 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/gm_expectations.h')
| -rw-r--r-- | gm/gm_expectations.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gm/gm_expectations.h b/gm/gm_expectations.h index 3d3f2b55fa..84cb7fe255 100644 --- a/gm/gm_expectations.h +++ b/gm/gm_expectations.h @@ -10,7 +10,7 @@ #include <stdarg.h> #include "gm.h" #include "SkBitmap.h" -#include "SkBitmapChecksummer.h" +#include "SkBitmapHasher.h" #include "SkData.h" #include "SkImageDecoder.h" #include "SkOSFile.h" @@ -94,7 +94,13 @@ namespace skiagm { Expectations(const SkBitmap& bitmap, bool ignoreFailure=kDefaultIgnoreFailure) { fBitmap = bitmap; fIgnoreFailure = ignoreFailure; - fAllowedChecksums.push_back() = SkBitmapChecksummer::Compute64(bitmap); + SkHashDigest digest; + // TODO(epoger): Better handling for error returned by ComputeDigest()? + // For now, we just report a digest of 0 in error cases, like before. + if (!SkBitmapHasher::ComputeDigest(bitmap, &digest)) { + digest = 0; + } + fAllowedChecksums.push_back() = digest; } /** |