diff options
Diffstat (limited to 'tests/YUVCacheTest.cpp')
-rw-r--r-- | tests/YUVCacheTest.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/tests/YUVCacheTest.cpp b/tests/YUVCacheTest.cpp index f3a09f116b..b34cf060a5 100644 --- a/tests/YUVCacheTest.cpp +++ b/tests/YUVCacheTest.cpp @@ -32,11 +32,10 @@ DEF_TEST(YUVPlanesCache, reporter) { SkResourceCache cache(1024); SkYUVPlanesCache::Info yuvInfo; - for (int i = 0; i < 3; ++i) { - yuvInfo.fSize[i].fWidth = 20 * i; - yuvInfo.fSize[i].fHeight = 10 * i; - yuvInfo.fSizeInMemory[i] = 800 * i; - yuvInfo.fRowBytes[i] = 80 * i; + for (int i = 0; i < 3; i++) { + yuvInfo.fSizeInfo.fSizes[i].fWidth = 20 * i; + yuvInfo.fSizeInfo.fSizes[i].fHeight = 10 * i; + yuvInfo.fSizeInfo.fWidthBytes[i] = 80 * i; } yuvInfo.fColorSpace = kRec601_SkYUVColorSpace; @@ -61,10 +60,12 @@ DEF_TEST(YUVPlanesCache, reporter) { REPORTER_ASSERT(reporter, data); REPORTER_ASSERT(reporter, data->size() == size); for (int i = 0; i < 3; ++i) { - REPORTER_ASSERT(reporter, yuvInfo.fSize[i].fWidth == yuvInfoRead.fSize[i].fWidth); - REPORTER_ASSERT(reporter, yuvInfo.fSize[i].fHeight == yuvInfoRead.fSize[i].fHeight); - REPORTER_ASSERT(reporter, yuvInfo.fSizeInMemory[i] == yuvInfoRead.fSizeInMemory[i]); - REPORTER_ASSERT(reporter, yuvInfo.fRowBytes[i] == yuvInfoRead.fRowBytes[i]); + REPORTER_ASSERT(reporter, yuvInfo.fSizeInfo.fSizes[i].fWidth == + yuvInfoRead.fSizeInfo.fSizes[i].fWidth); + REPORTER_ASSERT(reporter, yuvInfo.fSizeInfo.fSizes[i].fHeight == + yuvInfoRead.fSizeInfo.fSizes[i].fHeight); + REPORTER_ASSERT(reporter, yuvInfo.fSizeInfo.fWidthBytes[i] == + yuvInfoRead.fSizeInfo.fWidthBytes[i]); } REPORTER_ASSERT(reporter, yuvInfo.fColorSpace == yuvInfoRead.fColorSpace); |