diff options
Diffstat (limited to 'tests/MipMapTest.cpp')
| -rw-r--r-- | tests/MipMapTest.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/MipMapTest.cpp b/tests/MipMapTest.cpp index 5e5e894870..11021e6ebf 100644 --- a/tests/MipMapTest.cpp +++ b/tests/MipMapTest.cpp @@ -39,14 +39,14 @@ DEF_TEST(MipMap, reporter) { SkMipMap::Level level; if (mm->extractLevel(scale, &level)) { - REPORTER_ASSERT(reporter, level.fPixels); - REPORTER_ASSERT(reporter, level.fWidth > 0); - REPORTER_ASSERT(reporter, level.fHeight > 0); - REPORTER_ASSERT(reporter, level.fRowBytes >= level.fWidth * 4); - - if (prevLevel.fPixels) { - REPORTER_ASSERT(reporter, level.fWidth <= prevLevel.fWidth); - REPORTER_ASSERT(reporter, level.fHeight <= prevLevel.fHeight); + REPORTER_ASSERT(reporter, level.fPixmap.addr()); + REPORTER_ASSERT(reporter, level.fPixmap.width() > 0); + REPORTER_ASSERT(reporter, level.fPixmap.height() > 0); + REPORTER_ASSERT(reporter, (int)level.fPixmap.rowBytes() >= level.fPixmap.width() * 4); + + if (prevLevel.fPixmap.addr()) { + REPORTER_ASSERT(reporter, level.fPixmap.width() <= prevLevel.fPixmap.width()); + REPORTER_ASSERT(reporter, level.fPixmap.height() <= prevLevel.fPixmap.height()); } prevLevel = level; } |