diff options
| author |  Matt Sarett <msarett@google.com> | 2017-01-20 16:59:02 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-23 15:23:31 +0000 |
| commit | 977f64cbfad1ecd7fd4b1231c694c7e828fda1f0 (patch) | |
| tree | d419cde9e63734448b8f01da25105123086d667c /tests | |
| parent | 6987b00fae08ef0731042bb341b4e002a2da72c2 (diff) | |
Refactor trimming logic for read/writePixels()
(1) Move trimming logic into Bitmap/Pixmap level for
raster. Everything goes through here, so we'll
only do the work once.
(2) This means it also goes to GPU level.
(3) Always use SkReadPixelsRec rather than inlining
the logic.
(4) Create an SkWritePixelsRec to encapsulate write
trimming.
(5) Disabled kIndex8 as a dst - always.
BUG=skia:6021
Change-Id: I748f50c3b726f7c6de5462e2b1ccb54bc387a510
Reviewed-on: https://skia-review.googlesource.com/7326
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/BitmapCopyTest.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/BitmapCopyTest.cpp b/tests/BitmapCopyTest.cpp index ab0ec30e16..d69f7df76e 100644 --- a/tests/BitmapCopyTest.cpp +++ b/tests/BitmapCopyTest.cpp @@ -184,7 +184,7 @@ static void writeCoordPixels(SkBitmap& bm, const Coordinates& coords) { static const Pair gPairs[] = { { kUnknown_SkColorType, "000000" }, { kAlpha_8_SkColorType, "010000" }, - { kIndex_8_SkColorType, "011111" }, + { kIndex_8_SkColorType, "010111" }, { kRGB_565_SkColorType, "010101" }, { kARGB_4444_SkColorType, "010111" }, { kN32_SkColorType, "010111" }, @@ -235,7 +235,8 @@ DEF_TEST(BitmapCopy_extractSubset, reporter) { if (!success) { // Skip checking that success matches fValid, which is redundant // with the code below. - REPORTER_ASSERT(reporter, gPairs[i].fColorType != gPairs[j].fColorType); + REPORTER_ASSERT(reporter, kIndex_8_SkColorType == gPairs[i].fColorType || + gPairs[i].fColorType != gPairs[j].fColorType); continue; } |