diff options
| author |  Mike Reed <reed@google.com> | 2017-04-01 12:14:57 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-01 16:46:11 +0000 |
| commit | 9920b10f5292838f00600f676c4578cd11705e60 (patch) | |
| tree | 9217d23bf701b4ccfd15d818bfea44b766ad4fc3 /tests/CodecTest.cpp | |
| parent | ec61785bbb989a1901b063923da30c04ed41332f (diff) | |
Revert[2] "clean up (partially) colortable api""
This reverts commit 1d1165ca6575e082b892c5460492c411618783ad.
Bug: skia:
Change-Id: Idbc0634ae3cec2e79f592d252de8751b077e6408
Reviewed-on: https://skia-review.googlesource.com/11024
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tests/CodecTest.cpp')
| -rw-r--r-- | tests/CodecTest.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index dd11ff84fd..f3a393d7ac 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -700,8 +700,7 @@ static void test_invalid_parameters(skiatest::Reporter* r, const char path[]) { } else if (SkCodec::kUnimplemented == result) { // New method should be supported: SkBitmap bm; - sk_sp<SkColorTable> colorTable(new SkColorTable(colorStorage, 256)); - bm.allocPixels(info, nullptr, colorTable.get()); + bm.allocPixels(info, SkColorTable::Make(colorStorage, 256)); result = decoder->startIncrementalDecode(info, bm.getPixels(), bm.rowBytes(), nullptr, colorStorage, &colorCount); REPORTER_ASSERT(r, SkCodec::kSuccess == result); @@ -1108,8 +1107,8 @@ static bool alpha_type_match(SkAlphaType origAlphaType, SkAlphaType codecAlphaTy static void check_round_trip(skiatest::Reporter* r, SkCodec* origCodec, const SkImageInfo& info) { SkBitmap bm1; SkPMColor colors[256]; - sk_sp<SkColorTable> colorTable1(new SkColorTable(colors, 256)); - bm1.allocPixels(info, nullptr, colorTable1.get()); + sk_sp<SkColorTable> colorTable1 = SkColorTable::Make(colors, 256); + bm1.allocPixels(info, colorTable1); int numColors; SkCodec::Result result = origCodec->getPixels(info, bm1.getPixels(), bm1.rowBytes(), nullptr, const_cast<SkPMColor*>(colorTable1->readColors()), @@ -1126,8 +1125,8 @@ static void check_round_trip(skiatest::Reporter* r, SkCodec* origCodec, const Sk REPORTER_ASSERT(r, alpha_type_match(info.alphaType(), codec->getInfo().alphaType())); SkBitmap bm2; - sk_sp<SkColorTable> colorTable2(new SkColorTable(colors, 256)); - bm2.allocPixels(info, nullptr, colorTable2.get()); + sk_sp<SkColorTable> colorTable2 = SkColorTable::Make(colors, 256); + bm2.allocPixels(info, colorTable2); result = codec->getPixels(info, bm2.getPixels(), bm2.rowBytes(), nullptr, const_cast<SkPMColor*>(colorTable2->readColors()), &numColors); REPORTER_ASSERT(r, SkCodec::kSuccess == result); |