diff options
| author |  msarett <msarett@google.com> | 2015-12-02 07:02:41 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-02 07:02:41 -0800 |
| commit | 7d5105c4d2a9be7ef9ddba646471c35d4c966d97 (patch) | |
| tree | 988819b17423608e88532d1bddf16a4adf0cc1ff /src/codec/SkAndroidCodec.cpp | |
| parent | 2e8fec79658baef06f4a9fca5e91a4e116b47b3d (diff) | |
Allow SkAndroidCodec to use SkPngChunkReader
Also update documentation of SkPngChunkReader
in SkCodec.
BUG=skia:
Review URL: https://codereview.chromium.org/1487583003
Diffstat (limited to 'src/codec/SkAndroidCodec.cpp')
| -rw-r--r-- | src/codec/SkAndroidCodec.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/codec/SkAndroidCodec.cpp b/src/codec/SkAndroidCodec.cpp index 86c067558f..cf6e253d97 100644 --- a/src/codec/SkAndroidCodec.cpp +++ b/src/codec/SkAndroidCodec.cpp @@ -20,8 +20,8 @@ SkAndroidCodec::SkAndroidCodec(const SkImageInfo& info) : fInfo(info) {} -SkAndroidCodec* SkAndroidCodec::NewFromStream(SkStream* stream) { - SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream)); +SkAndroidCodec* SkAndroidCodec::NewFromStream(SkStream* stream, SkPngChunkReader* chunkReader) { + SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream, chunkReader)); if (nullptr == codec) { return nullptr; } @@ -43,12 +43,12 @@ SkAndroidCodec* SkAndroidCodec::NewFromStream(SkStream* stream) { } } -SkAndroidCodec* SkAndroidCodec::NewFromData(SkData* data) { +SkAndroidCodec* SkAndroidCodec::NewFromData(SkData* data, SkPngChunkReader* chunkReader) { if (!data) { return nullptr; } - return NewFromStream(new SkMemoryStream(data)); + return NewFromStream(new SkMemoryStream(data), chunkReader); } SkISize SkAndroidCodec::getSampledDimensions(int sampleSize) const { |