diff options
| author |  msarett <msarett@google.com> | 2015-08-05 12:58:26 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-05 12:58:26 -0700 |
| commit | 99f567e617b6c5a81e6b822c30ccb0d357db21fc (patch) | |
| tree | c119d5f8abfd674533ef2ccb04d9bfa1ec188a0d /src/codec/SkCodec.cpp | |
| parent | dfcba473b0462be3ed4babc07b1d50f4fafaeded (diff) | |
Scanline decoding for wbmp
We are also changing the wbmp to use SkSwizzler. This
will allow us to take advantage of the sampling routines
that are being implemented in SkSwizzler.
The image in this upload came from:
https://commons.wikimedia.org/wiki/File:Android_robot.png
It is licensed under the Creative Commons Attribution-Share Alike 3.0 Unported license.
BUG=skia:
Review URL: https://codereview.chromium.org/1254483004
Diffstat (limited to 'src/codec/SkCodec.cpp')
| -rw-r--r-- | src/codec/SkCodec.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/codec/SkCodec.cpp b/src/codec/SkCodec.cpp index 6ef61b289a..ffe90af539 100644 --- a/src/codec/SkCodec.cpp +++ b/src/codec/SkCodec.cpp @@ -133,10 +133,5 @@ SkCodec::Result SkCodec::getPixels(const SkImageInfo& info, void* pixels, size_t } SkCodec::Result SkCodec::getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes) { - SkASSERT(kIndex_8_SkColorType != info.colorType()); - if (kIndex_8_SkColorType == info.colorType()) { - return kInvalidConversion; - } return this->getPixels(info, pixels, rowBytes, NULL, NULL, NULL); } - |