diff options
author | msarett <msarett@google.com> | 2016-03-01 12:12:27 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-01 12:12:27 -0800 |
commit | 7f7ec206de39fde8dc490e9feb0f65322af1b989 (patch) | |
tree | 03bcf8f57a63d0c1039b853679e65cdbad613507 /tests/CodecPriv.h | |
parent | 4a98cdb7612493a062358cebd1141c9bcaa37ab1 (diff) |
Fix bug in SkGifCodec / Switch SkImageDec tests to use Codec
SkImageDecoder is still used throughout tests, tools, gms etc.
Deleting it from tests is an easy first step.
Bonus is that we add tests of SkCodec.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1733863003
Review URL: https://codereview.chromium.org/1733863003
Diffstat (limited to 'tests/CodecPriv.h')
-rw-r--r-- | tests/CodecPriv.h | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/tests/CodecPriv.h b/tests/CodecPriv.h new file mode 100644 index 0000000000..1123a41dc9 --- /dev/null +++ b/tests/CodecPriv.h @@ -0,0 +1,36 @@ +/* + * Copyright 2016 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include "SkBitmap.h" +#include "SkCodec.h" +#include "SkData.h" + +inline bool decode_memory(const void* mem, size_t size, SkBitmap* bm) { + SkAutoTUnref<SkData> data(SkData::NewWithoutCopy(mem, size)); + + SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(data.get())); + if (!codec) { + return false; + } + + // Construct a color table for the decode if necessary + SkAutoTUnref<SkColorTable> colorTable(nullptr); + SkPMColor* colorPtr = nullptr; + int* colorCountPtr = nullptr; + int maxColors = 256; + if (kIndex_8_SkColorType == codec->getInfo().colorType()) { + SkPMColor colors[256]; + colorTable.reset(new SkColorTable(colors, maxColors)); + colorPtr = const_cast<SkPMColor*>(colorTable->readColors()); + colorCountPtr = &maxColors; + } + + bm->allocPixels(codec->getInfo(), nullptr, colorTable.get()); + const SkCodec::Result result = codec->getPixels(codec->getInfo(), bm->getPixels(), + bm->rowBytes(), nullptr, colorPtr, colorCountPtr); + return result == SkCodec::kSuccess || result == SkCodec::kIncompleteInput; +} |