Chromium Code Reviews| Index: src/codec/SkAndroidCodec.cpp |
| diff --git a/src/codec/SkAndroidCodec.cpp b/src/codec/SkAndroidCodec.cpp |
| index d309d58501a80004c573e2dcbc39d440967a4f85..0eaef6559798c9922d5a939a9c5f369ee1eb077f 100644 |
| --- a/src/codec/SkAndroidCodec.cpp |
| +++ b/src/codec/SkAndroidCodec.cpp |
| @@ -8,6 +8,9 @@ |
| #include "SkAndroidCodec.h" |
| #include "SkCodec.h" |
| #include "SkCodecPriv.h" |
| +#ifdef SK_CODEC_DECODES_RAW |
| +#include "SkRawAdapterCodec.h" |
| +#endif |
| #include "SkSampledCodec.h" |
| #include "SkWebpAdapterCodec.h" |
| @@ -37,6 +40,10 @@ SkAndroidCodec* SkAndroidCodec::NewFromStream(SkStream* stream, SkPngChunkReader |
| case kGIF_SkEncodedFormat: |
| case kICO_SkEncodedFormat: |
| return new SkSampledCodec(codec.detach()); |
| +#ifdef SK_CODEC_DECODES_RAW |
| + case kRAW_SkEncodedFormat: |
| + return new SkRawAdapterCodec((SkRawCodec*)codec.detach()); |
| +#endif |
| default: |
| return nullptr; |
| } |
| @@ -182,3 +189,4 @@ SkCodec::Result SkAndroidCodec::getAndroidPixels(const SkImageInfo& info, void* |
| size_t rowBytes) { |
| return this->getAndroidPixels(info, pixels, rowBytes, nullptr); |
| } |
| + |
|
scroggo
2016/01/20 18:13:36
Why did you add this extra line?
yujieqin
2016/01/20 21:42:19
Removed.
|