From 908f5836626d792c5e33ad93f44c6a418a0cc8f5 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 12 Apr 2013 02:23:55 +0000 Subject: 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 --- tests/ChecksumTest.cpp | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'tests/ChecksumTest.cpp') diff --git a/tests/ChecksumTest.cpp b/tests/ChecksumTest.cpp index 03194907f5..81e7ef396c 100644 --- a/tests/ChecksumTest.cpp +++ b/tests/ChecksumTest.cpp @@ -7,11 +7,8 @@ */ #include "Test.h" -#include "SkBitmap.h" -#include "SkBitmapChecksummer.h" #include "SkChecksum.h" #include "SkCityHash.h" -#include "SkColor.h" // Word size that is large enough to hold results of any checksum type. typedef uint64_t checksum_result; @@ -107,15 +104,6 @@ namespace skiatest { return result; } - // Fill in bitmap with test data. - void CreateTestBitmap(SkBitmap &bitmap, SkBitmap::Config config, int width, int height, - SkColor color) { - bitmap.setConfig(config, width, height); - REPORTER_ASSERT(fReporter, bitmap.allocPixels()); - bitmap.setIsOpaque(true); - bitmap.eraseColor(color); - } - void RunTest() { // Test self-consistency of checksum algorithms. fWhichAlgorithm = kSkChecksum; @@ -156,25 +144,6 @@ namespace skiatest { GetTestDataChecksum(128) == GetTestDataChecksum(256)); REPORTER_ASSERT(fReporter, GetTestDataChecksum(132) == GetTestDataChecksum(260)); - - // Test SkBitmapChecksummer - SkBitmap bitmap; - // initial test case - CreateTestBitmap(bitmap, SkBitmap::kARGB_8888_Config, 333, 555, SK_ColorBLUE); - REPORTER_ASSERT(fReporter, - SkBitmapChecksummer::Compute64(bitmap) == 0x18f9df68b1b02f38ULL); - // same pixel data but different dimensions should yield a different checksum - CreateTestBitmap(bitmap, SkBitmap::kARGB_8888_Config, 555, 333, SK_ColorBLUE); - REPORTER_ASSERT(fReporter, - SkBitmapChecksummer::Compute64(bitmap) == 0x6b0298183f786c8eULL); - // same dimensions but different color should yield a different checksum - CreateTestBitmap(bitmap, SkBitmap::kARGB_8888_Config, 555, 333, SK_ColorGREEN); - REPORTER_ASSERT(fReporter, - SkBitmapChecksummer::Compute64(bitmap) == 0xc6b4b3f6fadaaf37ULL); - // 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, - SkBitmapChecksummer::Compute64(bitmap) == 0xc6b4b3f6fadaaf37ULL); } Reporter* fReporter; -- cgit v1.2.3