diff options
author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-25 18:58:29 +0000 |
---|---|---|
committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-25 18:58:29 +0000 |
commit | 2a1f4464d150d2dc8c3fe2f39e9fb3503b7f4f54 (patch) | |
tree | c98b392e7137117ae162bc6f434af0bee8e6ec48 /tests/BitmapGetColorTest.cpp | |
parent | 7578b3efc63539cb8140d1f4f5b2773ee9d17c5f (diff) |
remove kA1_Config, as it is no longer supported
BUG=
R=djsollen@google.com
Review URL: https://codereview.chromium.org/83093005
git-svn-id: http://skia.googlecode.com/svn/trunk@12384 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/BitmapGetColorTest.cpp')
-rw-r--r-- | tests/BitmapGetColorTest.cpp | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/tests/BitmapGetColorTest.cpp b/tests/BitmapGetColorTest.cpp index 11c22e6fa3..40aa3e26bf 100644 --- a/tests/BitmapGetColorTest.cpp +++ b/tests/BitmapGetColorTest.cpp @@ -10,67 +10,6 @@ #include "SkRect.h" #include "SkRandom.h" -static int nextRand(SkRandom& rand, int min, int max) { - return min + (int)rand.nextRangeU(0, max - min); -} - -static void rand_irect(SkIRect* rect, int W, int H, SkRandom& rand) { - const int DX = W / 2; - const int DY = H / 2; - - rect->fLeft = nextRand(rand, -DX, W + DX); - rect->fTop = nextRand(rand, -DY, H + DY); - rect->fRight = nextRand(rand, -DX, W + DX); - rect->fBottom = nextRand(rand, -DY, H + DY); - rect->sort(); -} - -static void test_equal_A1_A8(skiatest::Reporter* reporter, - const SkBitmap& bm1, const SkBitmap& bm8) { - SkASSERT(SkBitmap::kA1_Config == bm1.config()); - SkASSERT(SkBitmap::kA8_Config == bm8.config()); - - REPORTER_ASSERT(reporter, bm1.width() == bm8.width()); - REPORTER_ASSERT(reporter, bm1.height() == bm8.height()); - for (int y = 0; y < bm1.height(); ++y) { - for (int x = 0; x < bm1.width(); ++x) { - int p1 = *bm1.getAddr1(x, y) & (1 << (7 - (x & 7))); - SkASSERT(SkIsPow2(p1)); - p1 = p1 ? 0xFF : 0; - - int p8 = *bm8.getAddr8(x, y); - SkASSERT(0 == p8 || 0xFF == p8); - - REPORTER_ASSERT(reporter, p1 == p8); - } - } -} - -static void test_eraserect_A1(skiatest::Reporter* reporter) { - const int W = 43; - const int H = 13; - - SkBitmap bm1, bm8; - - bm1.setConfig(SkBitmap::kA1_Config, W, H); - bm1.allocPixels(); - bm8.setConfig(SkBitmap::kA8_Config, W, H); - bm8.allocPixels(); - - SkRandom rand; - for (int i = 0; i < 10000; ++i) { - SkIRect area; - rand_irect(&area, W, H, rand); - - bm1.eraseColor(0); - bm8.eraseColor(0); - - bm1.eraseArea(area, SK_ColorWHITE); - bm8.eraseArea(area, SK_ColorWHITE); - test_equal_A1_A8(reporter, bm1, bm8); - } -} - static void TestGetColor(skiatest::Reporter* reporter) { static const struct Rec { SkBitmap::Config fConfig; @@ -105,8 +44,6 @@ static void TestGetColor(skiatest::Reporter* reporter) { SkColor c = bm.getColor(1, 1); REPORTER_ASSERT(reporter, c == gRec[i].fOutColor); } - - test_eraserect_A1(reporter); } #include "TestClassDef.h" |