aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar reed <reed@chromium.org>2014-07-12 13:16:10 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-07-12 13:16:10 -0700
commit651eaeadeb0b1407f5fe192aeda90db1680fa2b8 (patch)
tree2c1a2fbcb6f416e6f8899165c1373a0034daf2c9 /tests
parentdebba5c3d091159149f8a88ab5dcd44dd72e0dc7 (diff)
Revert of Add SkBitmap::readPixels() and reimplement copyTo and SkCanvas::readPixels (https://codereview.chromium.org/388803007/)
Reason for revert: still failing (randomly?) bench sometimes. need stack dump to diagnose. Original issue's description: > Add SkBitmap::readPixels() and reimplement copyTo and SkCanvas::readPixels > usning it. > > Revert "Revert of add readPixels() to SkBitmap (https://codereview.chromium.org/377303002/)" > > This reverts commit d08cb905a7cc80d8fb868bbd14fffe1cd68adcce. > > TBR=scroggo@google.com > > Committed: https://skia.googlesource.com/skia/+/debba5c3d091159149f8a88ab5dcd44dd72e0dc7 R=reed@google.com TBR=reed@google.com NOTREECHECKS=true NOTRY=true Author: reed@chromium.org Review URL: https://codereview.chromium.org/382543005
Diffstat (limited to 'tests')
-rw-r--r--tests/BitmapCopyTest.cpp95
1 files changed, 1 insertions, 94 deletions
diff --git a/tests/BitmapCopyTest.cpp b/tests/BitmapCopyTest.cpp
index 4a49a6b487..40cfbe0d54 100644
--- a/tests/BitmapCopyTest.cpp
+++ b/tests/BitmapCopyTest.cpp
@@ -185,7 +185,7 @@ static void writeCoordPixels(SkBitmap& bm, const Coordinates& coords) {
static const Pair gPairs[] = {
{ kUnknown_SkColorType, "000000" },
{ kAlpha_8_SkColorType, "010101" },
- { kIndex_8_SkColorType, "011111" },
+ { kIndex_8_SkColorType, "011101" },
{ kRGB_565_SkColorType, "010101" },
{ kARGB_4444_SkColorType, "010111" },
{ kN32_SkColorType, "010111" },
@@ -542,96 +542,3 @@ DEF_TEST(BitmapCopy, reporter) {
} // for (size_t copyCase ...
}
}
-
-#include "SkColorPriv.h"
-#include "SkUtils.h"
-
-/**
- * Construct 4x4 pixels where we can look at a color and determine where it should be in the grid.
- * alpha = 0xFF, blue = 0x80, red = x, green = y
- */
-static void fill_4x4_pixels(SkPMColor colors[16]) {
- for (int y = 0; y < 4; ++y) {
- for (int x = 0; x < 4; ++x) {
- colors[y*4+x] = SkPackARGB32(0xFF, x, y, 0x80);
- }
- }
-}
-
-static bool check_4x4_pixel(SkPMColor color, unsigned x, unsigned y) {
- SkASSERT(x < 4 && y < 4);
- return 0xFF == SkGetPackedA32(color) &&
- x == SkGetPackedR32(color) &&
- y == SkGetPackedG32(color) &&
- 0x80 == SkGetPackedB32(color);
-}
-
-/**
- * Fill with all zeros, which will never match any value from fill_4x4_pixels
- */
-static void clear_4x4_pixels(SkPMColor colors[16]) {
- sk_memset32(colors, 0, 16);
-}
-
-// Much of readPixels is exercised by copyTo testing, since readPixels is the backend for that
-// method. Here we explicitly test subset copies.
-//
-DEF_TEST(BitmapReadPixels, reporter) {
- const int W = 4;
- const int H = 4;
- const size_t rowBytes = W * sizeof(SkPMColor);
- const SkImageInfo srcInfo = SkImageInfo::MakeN32Premul(W, H);
- SkPMColor srcPixels[16];
- fill_4x4_pixels(srcPixels);
- SkBitmap srcBM;
- srcBM.installPixels(srcInfo, srcPixels, rowBytes);
-
- SkImageInfo dstInfo = SkImageInfo::MakeN32Premul(W, H);
- SkPMColor dstPixels[16];
-
- const struct {
- bool fExpectedSuccess;
- SkIPoint fRequestedSrcLoc;
- SkISize fRequestedDstSize;
- // If fExpectedSuccess, check these, otherwise ignore
- SkIPoint fExpectedDstLoc;
- SkIRect fExpectedSrcR;
- } gRec[] = {
- { true, { 0, 0 }, { 4, 4 }, { 0, 0 }, { 0, 0, 4, 4 } },
- { true, { 1, 1 }, { 2, 2 }, { 0, 0 }, { 1, 1, 3, 3 } },
- { true, { 2, 2 }, { 4, 4 }, { 0, 0 }, { 2, 2, 4, 4 } },
- { true, {-1,-1 }, { 2, 2 }, { 1, 1 }, { 0, 0, 1, 1 } },
- { false, {-1,-1 }, { 1, 1 }, { 0, 0 }, { 0, 0, 0, 0 } },
- };
-
- for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); ++i) {
- clear_4x4_pixels(dstPixels);
-
- dstInfo.fWidth = gRec[i].fRequestedDstSize.width();
- dstInfo.fHeight = gRec[i].fRequestedDstSize.height();
- bool success = srcBM.readPixels(dstInfo, dstPixels, rowBytes,
- gRec[i].fRequestedSrcLoc.x(), gRec[i].fRequestedSrcLoc.y());
-
- REPORTER_ASSERT(reporter, gRec[i].fExpectedSuccess == success);
- if (success) {
- const SkIRect srcR = gRec[i].fExpectedSrcR;
- const int dstX = gRec[i].fExpectedDstLoc.x();
- const int dstY = gRec[i].fExpectedDstLoc.y();
- // Walk the dst pixels, and check if we got what we expected
- for (int y = 0; y < H; ++y) {
- for (int x = 0; x < W; ++x) {
- SkPMColor dstC = dstPixels[y*4+x];
- // get into src coordinates
- int sx = x - dstX + srcR.x();
- int sy = y - dstY + srcR.y();
- if (srcR.contains(sx, sy)) {
- REPORTER_ASSERT(reporter, check_4x4_pixel(dstC, sx, sy));
- } else {
- REPORTER_ASSERT(reporter, 0 == dstC);
- }
- }
- }
- }
- }
-}
-