Index: src/codec/SkCodec.cpp |
diff --git a/src/codec/SkCodec.cpp b/src/codec/SkCodec.cpp |
index c4e488565e698d30c044270458cbf93cc45ec597..85f2414ecbf8a700a40aa2f87bcf6d54a1baef0e 100644 |
--- a/src/codec/SkCodec.cpp |
+++ b/src/codec/SkCodec.cpp |
@@ -90,7 +90,23 @@ SkCodec::RewindState SkCodec::rewindIfNeeded() { |
: kCouldNotRewind_RewindState; |
} |
-SkScanlineDecoder* SkCodec::getScanlineDecoder(const SkImageInfo& dstInfo) { |
- fScanlineDecoder.reset(this->onGetScanlineDecoder(dstInfo)); |
+SkScanlineDecoder* SkCodec::getScanlineDecoder(const SkImageInfo& dstInfo, const Options* options, |
+ SkPMColor ctable[], int* ctableCount) { |
+ |
+ // Set options. |
+ Options optsStorage; |
+ if (NULL == options) { |
+ options = &optsStorage; |
+ } |
+ |
+ fScanlineDecoder.reset(this->onGetScanlineDecoder(dstInfo, *options, ctable, ctableCount)); |
return fScanlineDecoder.get(); |
} |
+ |
+SkScanlineDecoder* SkCodec::getScanlineDecoder(const SkImageInfo& dstInfo) { |
+ SkASSERT(kIndex_8_SkColorType != dstInfo.colorType()); |
+ if (kIndex_8_SkColorType == dstInfo.colorType()) { |
+ return NULL; |
+ } |
+ return this->getScanlineDecoder(dstInfo, NULL, NULL, NULL); |
+} |