Index: tests/BitmapGetColorTest.cpp |
diff --git a/tests/BitmapGetColorTest.cpp b/tests/BitmapGetColorTest.cpp |
index 11c22e6fa3f2baaea8d307b26c2607d29276208c..40aa3e26bff813a53075064fb660cfa2d250d073 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" |