aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm
diff options
context:
space:
mode:
authorGravatar msarett <msarett@google.com>2015-04-29 07:38:43 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-04-29 07:38:43 -0700
commit9e43cabaa1ff26167e990f0bcb9a5c20d662d52c (patch)
treeeabfffdde1d3f2fbdbf34ec8ba5fe6ea74d21046 /dm
parent385e88cc16ed872ece98471513764c8e7ca1a26c (diff)
Requires a minor API change to pass the color table to getScanlineDecoder, as we do with getPixels().
Diffstat (limited to 'dm')
-rw-r--r--dm/DM.cpp5
-rw-r--r--dm/DMSrcSink.cpp3
2 files changed, 4 insertions, 4 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 57de4c1d7f..3822431ae4 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -212,9 +212,8 @@ static void push_codec_srcs(Path path) {
case kIndex_8_SkColorType:
push_src("image", "codec_kIndex8", new CodecSrc(path, CodecSrc::kNormal_Mode,
CodecSrc::kIndex8_Always_DstColorType));
- // FIXME: Need to implement scanline decoding for kIndex8.
- //push_src("image", "scanline kIndex8", new CodecSrc(path, CodecSrc::kScanline_Mode,
- // CodecSrc::kIndex8_Always_DstColorType));
+ push_src("image", "scanline_kIndex8", new CodecSrc(path, CodecSrc::kScanline_Mode,
+ CodecSrc::kIndex8_Always_DstColorType));
break;
default:
// Do nothing
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 6b3ec9749e..9811f9e426 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -139,7 +139,8 @@ Error CodecSrc::draw(SkCanvas* canvas) const {
}
break;
case kScanline_Mode: {
- SkScanlineDecoder* scanlineDecoder = codec->getScanlineDecoder(decodeInfo);
+ SkScanlineDecoder* scanlineDecoder = codec->getScanlineDecoder(decodeInfo, NULL,
+ colorPtr, colorCountPtr);
if (NULL == scanlineDecoder) {
return Error::Nonfatal("Cannot use scanline decoder for all images");
}