| Index: tests/BitmapCopyTest.cpp
|
| diff --git a/tests/BitmapCopyTest.cpp b/tests/BitmapCopyTest.cpp
|
| index 57ac95009f79621da9501ed742b15be0b4fe5e30..08632445c6b4ce0ca535905014b44e53fc421804 100644
|
| --- a/tests/BitmapCopyTest.cpp
|
| +++ b/tests/BitmapCopyTest.cpp
|
| @@ -432,7 +432,7 @@ DEF_TEST(BitmapCopy, reporter) {
|
| // buf to a SkBitmap, but copies are done using the
|
| // raw buffer pointer.
|
| const size_t bufSize = subH *
|
| - SkBitmap::ComputeRowBytes(src.config(), subW) * 2;
|
| + SkColorTypeMinRowBytes(src.colorType(), subW) * 2;
|
| SkAutoMalloc autoBuf (bufSize);
|
| uint8_t* buf = static_cast<uint8_t*>(autoBuf.get());
|
|
|
| @@ -459,7 +459,7 @@ DEF_TEST(BitmapCopy, reporter) {
|
| memset(buf, 0xFF, bufSize);
|
| // Config with stride greater than src but that fits in buf.
|
| bufBm.setConfig(gPairs[i].fConfig, subW, subH,
|
| - SkBitmap::ComputeRowBytes(subset.config(), subW) * 2);
|
| + SkColorTypeMinRowBytes(subset.colorType(), subW) * 2);
|
| bufBm.setPixels(buf);
|
| successExpected = false;
|
| // Then attempt to copy with a stride that is too large
|
|
|