diff options
| author |  Matt Sarett <msarett@google.com> | 2016-11-03 17:27:12 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-03 17:27:27 +0000 |
| commit | 6193568fed3983e406544a46a5e1fd292729ca84 (patch) | |
| tree | 58df1e720fe02886bff42acb52f19d8d6997bfec /src/codec/SkBmpRLECodec.h | |
| parent | 668661700127e8e340c1d731d2b9fc5ea443163f (diff) | |
Revert "Add F16, SkColorSpaceXform support to SkBmpCodec"
This reverts commit d851795e7992565c1eb2b9474ee5ad01d1a01fad.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> Add F16, SkColorSpaceXform support to SkBmpCodec
>
> BUG=skia:4895
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4300
>
> Change-Id: I2f2b8d3854ea3a8c5904dd3c5bea0342e2be9789
> Reviewed-on: https://skia-review.googlesource.com/4300
> Reviewed-by: Leon Scroggins <scroggo@google.com>
> Commit-Queue: Matt Sarett <msarett@google.com>
>
Speculative revert for MSAN
TBR=borenet@google.com,msarett@google.com,scroggo@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ie48c03c0c3156267763fbcf96818477567c5069d
Reviewed-on: https://skia-review.googlesource.com/4378
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
Diffstat (limited to 'src/codec/SkBmpRLECodec.h')
| -rw-r--r-- | src/codec/SkBmpRLECodec.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/codec/SkBmpRLECodec.h b/src/codec/SkBmpRLECodec.h index c2459c0b22..1291e9f617 100644 --- a/src/codec/SkBmpRLECodec.h +++ b/src/codec/SkBmpRLECodec.h @@ -48,7 +48,7 @@ protected: size_t dstRowBytes, const Options&, SkPMColor*, int*, int*) override; - SkCodec::Result onPrepareToDecode(const SkImageInfo& dstInfo, + SkCodec::Result prepareToDecode(const SkImageInfo& dstInfo, const SkCodec::Options& options, SkPMColor inputColorPtr[], int* inputColorCount) override; @@ -89,7 +89,6 @@ private: */ int decodeRows(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes, const Options& opts) override; - int decodeRLE(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes); bool skipRows(int count) override; |