diff options
| author |  msarett <msarett@google.com> | 2015-11-16 13:30:20 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-16 13:30:20 -0800 |
| commit | 73d882e13fc54ff9ecc53a83838c2d900ebf8397 (patch) | |
| tree | 82763b937f310badcfdd754122a593a9701754e5 | |
| parent | 31b80a9dc60ae5411ad6abd10269c4f88c635ec2 (diff) | |
Only support jpeg, png, and webp for BRD
This a safety check to ensure that we don't accidentally ship subset
decoders for non-required formats.
BUG=skia:
Review URL: https://codereview.chromium.org/1446543002
| -rw-r--r-- | src/android/SkBitmapRegionDecoder.cpp | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/src/android/SkBitmapRegionDecoder.cpp b/src/android/SkBitmapRegionDecoder.cpp index 7dc05059e1..a153282b09 100644 --- a/src/android/SkBitmapRegionDecoder.cpp +++ b/src/android/SkBitmapRegionDecoder.cpp @@ -30,29 +30,43 @@ SkBitmapRegionDecoder* SkBitmapRegionDecoder::Create( return nullptr; } - if (SkEncodedFormat::kWEBP_SkEncodedFormat == codec->getEncodedFormat()) { - // FIXME: Support webp using a special case. Webp does not support - // scanline decoding. - return nullptr; - } - - switch (codec->getScanlineOrder()) { - case SkCodec::kTopDown_SkScanlineOrder: - case SkCodec::kNone_SkScanlineOrder: + SkEncodedFormat format = codec->getEncodedFormat(); + switch (format) { + case SkEncodedFormat::kJPEG_SkEncodedFormat: + case SkEncodedFormat::kPNG_SkEncodedFormat: break; default: - SkCodecPrintf("Error: Scanline ordering not supported.\n"); + // FIXME: Support webp using a special case. Webp does not support + // scanline decoding. return nullptr; } + + // If the image is a jpeg or a png, the scanline ordering should always be + // kTopDown or kNone. It is relevant to check because this implementation + // only supports these two scanline orderings. + SkASSERT(SkCodec::kTopDown_SkScanlineOrder == codec->getScanlineOrder() || + SkCodec::kNone_SkScanlineOrder == codec->getScanlineOrder()); + return new SkBitmapRegionCanvas(codec.detach()); } case kAndroidCodec_Strategy: { SkAutoTDelete<SkAndroidCodec> codec = SkAndroidCodec::NewFromStream(streamDeleter.detach()); - if (NULL == codec) { + if (nullptr == codec) { SkCodecPrintf("Error: Failed to create codec.\n"); return NULL; } + + SkEncodedFormat format = codec->getEncodedFormat(); + switch (format) { + case SkEncodedFormat::kJPEG_SkEncodedFormat: + case SkEncodedFormat::kPNG_SkEncodedFormat: + case SkEncodedFormat::kWEBP_SkEncodedFormat: + break; + default: + return nullptr; + } + return new SkBitmapRegionCodec(codec.detach()); } default: |