aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/codec/SkBmpCodec.h
diff options
context:
space:
mode:
authorGravatar Matt Sarett <msarett@google.com>2016-11-03 17:27:12 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-03 17:27:27 +0000
commit6193568fed3983e406544a46a5e1fd292729ca84 (patch)
tree58df1e720fe02886bff42acb52f19d8d6997bfec /src/codec/SkBmpCodec.h
parent668661700127e8e340c1d731d2b9fc5ea443163f (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/SkBmpCodec.h')
-rw-r--r--src/codec/SkBmpCodec.h16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/codec/SkBmpCodec.h b/src/codec/SkBmpCodec.h
index a51bbcecc3..0ece7ad6ce 100644
--- a/src/codec/SkBmpCodec.h
+++ b/src/codec/SkBmpCodec.h
@@ -99,16 +99,9 @@ protected:
* will be set to the number of colors in the
* color table.
*/
- virtual SkCodec::Result onPrepareToDecode(const SkImageInfo& dstInfo,
+ virtual SkCodec::Result prepareToDecode(const SkImageInfo& dstInfo,
const SkCodec::Options& options, SkPMColor inputColorPtr[],
int* inputColorCount) = 0;
- SkCodec::Result prepareToDecode(const SkImageInfo& dstInfo,
- const SkCodec::Options& options, SkPMColor inputColorPtr[],
- int* inputColorCount);
-
- void applyColorXform(const SkImageInfo& dstInfo, void* dst, void* src) const;
- uint32_t* xformBuffer() const { return fXformBuffer.get(); }
- void resetXformBuffer(int count) { fXformBuffer.reset(new uint32_t[count]); }
private:
@@ -145,10 +138,9 @@ private:
bool onSkipScanlines(int count) override;
- const uint16_t fBitsPerPixel;
- const SkScanlineOrder fRowOrder;
- const size_t fSrcRowBytes;
- std::unique_ptr<uint32_t[]> fXformBuffer;
+ const uint16_t fBitsPerPixel;
+ const SkScanlineOrder fRowOrder;
+ const size_t fSrcRowBytes;
typedef SkCodec INHERITED;
};