Index: src/codec/SkAndroidCodec.cpp |
diff --git a/src/codec/SkAndroidCodec.cpp b/src/codec/SkAndroidCodec.cpp |
index d309d58501a80004c573e2dcbc39d440967a4f85..f7fdd194510fda2051629f001c6383f12f47a9f0 100644 |
--- a/src/codec/SkAndroidCodec.cpp |
+++ b/src/codec/SkAndroidCodec.cpp |
@@ -8,6 +8,7 @@ |
#include "SkAndroidCodec.h" |
#include "SkCodec.h" |
#include "SkCodecPriv.h" |
+#include "SkRawAndroidCodec.h" |
#include "SkSampledCodec.h" |
#include "SkWebpAdapterCodec.h" |
@@ -19,7 +20,8 @@ static bool is_valid_sample_size(int sampleSize) { |
SkAndroidCodec::SkAndroidCodec(SkCodec* codec) |
: fInfo(codec->getInfo()) |
, fCodec(codec) |
-{} |
+{ |
msarett
2016/01/06 22:50:24
nit: Please change back.
yujieqin
2016/01/07 09:22:25
Done.
|
+} |
SkAndroidCodec* SkAndroidCodec::NewFromStream(SkStream* stream, SkPngChunkReader* chunkReader) { |
SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream, chunkReader)); |
@@ -37,6 +39,8 @@ SkAndroidCodec* SkAndroidCodec::NewFromStream(SkStream* stream, SkPngChunkReader |
case kGIF_SkEncodedFormat: |
case kICO_SkEncodedFormat: |
return new SkSampledCodec(codec.detach()); |
+ case kRAW_SkEncodedFormat: |
+ return new SkRawAndroidCodec((SkRawCodec*)codec.detach()); |
default: |
return nullptr; |
} |
@@ -182,3 +186,4 @@ SkCodec::Result SkAndroidCodec::getAndroidPixels(const SkImageInfo& info, void* |
size_t rowBytes) { |
return this->getAndroidPixels(info, pixels, rowBytes, nullptr); |
} |
+ |