From 304a07c6c93298c3481bc0d4852d08c22a539504 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Wed, 12 Jul 2017 15:10:28 -0400 Subject: remove references to kIndex_8_SkColorType from our tools/tests Bug: skia:6828 Change-Id: Ib5049c28c11b7320bece20f5a0a886de8b2a4343 Reviewed-on: https://skia-review.googlesource.com/22728 Reviewed-by: Leon Scroggins Reviewed-by: Florin Malita Commit-Queue: Mike Reed --- tests/ReadPixelsTest.cpp | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) (limited to 'tests/ReadPixelsTest.cpp') diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp index a30576f74c..f426e5ffff 100644 --- a/tests/ReadPixelsTest.cpp +++ b/tests/ReadPixelsTest.cpp @@ -503,16 +503,6 @@ static const uint64_t f16[kNumPixels] = { kAlpha | kRed, kAlpha | kGreen, kAlpha | kBlue, kAlpha | kBlue | kGreen | kRed, kAlpha }; -#ifdef SK_PMCOLOR_IS_RGBA -static const SkPMColor index8colors[kNumPixels] = { - 0xFF0000FF, 0xFF00FF00, 0xFFFF0000, 0xFFFFFFFF, 0xFF000000 -}; -#else -static const SkPMColor index8colors[kNumPixels] = { - 0xFFFF0000, 0xFF00FF00, 0xFF0000FF, 0xFFFFFFFF, 0xFF000000 -}; -#endif -static const uint8_t index8[kNumPixels] = { 0, 1, 2, 3, 4 }; static const uint8_t alpha8[kNumPixels] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; static const uint8_t gray8[kNumPixels] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; @@ -530,12 +520,12 @@ static const void* five_reference_pixels(SkColorType colorType) { return rgba; case kBGRA_8888_SkColorType: return bgra; - case kIndex_8_SkColorType: - return index8; case kGray_8_SkColorType: return gray8; case kRGBA_F16_SkColorType: return f16; + default: + return nullptr; // remove me when kIndex_8 is removed from the enum } SkASSERT(false); @@ -548,21 +538,14 @@ static void test_conversion(skiatest::Reporter* r, const SkImageInfo& dstInfo, return; } - sk_sp srcColorTable = (kIndex_8_SkColorType == srcInfo.colorType()) - ? sk_make_sp(index8colors, 5) - : nullptr; - sk_sp dstColorTable = (kIndex_8_SkColorType == dstInfo.colorType()) - ? sk_make_sp(index8colors, 5) - : nullptr; - const void* srcPixels = five_reference_pixels(srcInfo.colorType()); - SkPixmap srcPixmap(srcInfo, srcPixels, srcInfo.minRowBytes(), srcColorTable.get()); + SkPixmap srcPixmap(srcInfo, srcPixels, srcInfo.minRowBytes()); sk_sp src = SkImage::MakeFromRaster(srcPixmap, nullptr, nullptr); REPORTER_ASSERT(r, src); // Enough space for 5 pixels when color type is F16, more than enough space in other cases. uint64_t dstPixels[kNumPixels]; - SkPixmap dstPixmap(dstInfo, dstPixels, dstInfo.minRowBytes(), dstColorTable.get()); + SkPixmap dstPixmap(dstInfo, dstPixels, dstInfo.minRowBytes()); bool success = src->readPixels(dstPixmap, 0, 0); REPORTER_ASSERT(r, success == SkImageInfoValidConversion(dstInfo, srcInfo)); -- cgit v1.2.3