diff options
author | 2015-12-08 19:02:36 -0800 | |
---|---|---|
committer | 2015-12-08 19:02:36 -0800 | |
commit | 808ce2886d732b1055f89c8fb0f1b11b47fcb0ce (patch) | |
tree | fbb1a9fcb101de69988a9550583bfdf521116ca2 /src | |
parent | e77f2daec9aefa1cb406e4572f435de68be7d43e (diff) |
default SkPixelSerializer
Add SkImageEncoder::EncodeData(const SkPixmap&, ...) function.
Add SkImageEncoder::CreatePixelSerializer() to return a
PixelSerializer that calls into SkImageEncoder::EncodeData.
SkImage::encode() make use of SkImageEncoder::CreatePixelSerializer.
Committed: https://skia.googlesource.com/skia/+/b0bd1516bff3f5afcbfd615e805867531657811b
Review URL: https://codereview.chromium.org/1507123002
Diffstat (limited to 'src')
-rw-r--r-- | src/image/SkImage.cpp | 33 | ||||
-rw-r--r-- | src/images/SkImageEncoder.cpp | 33 | ||||
-rw-r--r-- | src/ports/SkImageDecoder_empty.cpp | 17 |
3 files changed, 56 insertions, 27 deletions
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 7db5b4e0a8..338ab09130 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -9,6 +9,7 @@ #include "SkBitmapCache.h" #include "SkCanvas.h" #include "SkData.h" +#include "SkImageEncoder.h" #include "SkImageGenerator.h" #include "SkImagePriv.h" #include "SkImageShader.h" @@ -178,32 +179,14 @@ SkData* SkImage::encode(SkImageEncoder::Type type, int quality) const { return nullptr; } -namespace { - -class DefaultSerializer : public SkPixelSerializer { -protected: - bool onUseEncodedData(const void *data, size_t len) override { - return true; - } - SkData* onEncode(const SkPixmap& pixmap) override { - SkBitmap bm; - if (!bm.installPixels(pixmap.info(), - const_cast<void*>(pixmap.addr()), - pixmap.rowBytes(), - pixmap.ctable(), - nullptr, nullptr)) { - return nullptr; - } - return SkImageEncoder::EncodeData(bm, SkImageEncoder::kPNG_Type, 100); - } -}; - -} // anonymous namespace - SkData* SkImage::encode(SkPixelSerializer* serializer) const { - DefaultSerializer defaultSerializer; - SkPixelSerializer* effectiveSerializer = serializer ? serializer : &defaultSerializer; - + SkAutoTUnref<SkPixelSerializer> defaultSerializer; + SkPixelSerializer* effectiveSerializer = serializer; + if (!effectiveSerializer) { + defaultSerializer.reset(SkImageEncoder::CreatePixelSerializer()); + SkASSERT(defaultSerializer.get()); + effectiveSerializer = defaultSerializer.get(); + } SkAutoTUnref<SkData> encoded(this->refEncoded()); if (encoded && effectiveSerializer->useEncodedData(encoded->data(), encoded->size())) { return encoded.detach(); diff --git a/src/images/SkImageEncoder.cpp b/src/images/SkImageEncoder.cpp index cc1b73baa5..cea567816b 100644 --- a/src/images/SkImageEncoder.cpp +++ b/src/images/SkImageEncoder.cpp @@ -7,6 +7,8 @@ #include "SkImageEncoder.h" #include "SkBitmap.h" +#include "SkPixelSerializer.h" +#include "SkPixmap.h" #include "SkStream.h" #include "SkTemplates.h" @@ -57,6 +59,33 @@ SkData* SkImageEncoder::EncodeData(const SkImageInfo& info, const void* pixels, if (!bm.installPixels(info, const_cast<void*>(pixels), rowBytes)) { return nullptr; } - SkAutoTDelete<SkImageEncoder> enc(SkImageEncoder::Create(t)); - return enc.get() ? enc.get()->encodeData(bm, quality) : nullptr; + bm.setImmutable(); + return SkImageEncoder::EncodeData(bm, t, quality); +} + +SkData* SkImageEncoder::EncodeData(const SkPixmap& pixmap, + Type t, int quality) { + SkBitmap bm; + if (!bm.installPixels(pixmap.info(), + const_cast<void*>(pixmap.addr()), + pixmap.rowBytes(), + pixmap.ctable(), nullptr, nullptr)) { + return nullptr; + } + bm.setImmutable(); + return SkImageEncoder::EncodeData(bm, t, quality); +} + +namespace { +class ImageEncoderPixelSerializer final : public SkPixelSerializer { +protected: + bool onUseEncodedData(const void*, size_t) override { return true; } + SkData* onEncode(const SkPixmap& pmap) override { + return SkImageEncoder::EncodeData(pmap, SkImageEncoder::kPNG_Type, 100); + } +}; +} // namespace + +SkPixelSerializer* SkImageEncoder::CreatePixelSerializer() { + return new ImageEncoderPixelSerializer; } diff --git a/src/ports/SkImageDecoder_empty.cpp b/src/ports/SkImageDecoder_empty.cpp index 11c3db1afc..94d4eb51de 100644 --- a/src/ports/SkImageDecoder_empty.cpp +++ b/src/ports/SkImageDecoder_empty.cpp @@ -108,6 +108,10 @@ SkData* SkImageEncoder::EncodeData(const SkImageInfo&, const void* pixels, size_ return nullptr; } +static SkData* SkImageEncoder::EncodeData(const SkPixmap&, Type, int) { + return nullptr; +} + bool SkImageEncoder::encodeStream(SkWStream*, const SkBitmap&, int) { return false; } @@ -119,4 +123,17 @@ SkData* SkImageEncoder::encodeData(const SkBitmap&, int) { bool SkImageEncoder::encodeFile(const char file[], const SkBitmap& bm, int quality) { return false; } + +namespace { +class ImageEncoderPixelSerializer final : public SkPixelSerializer { +protected: + bool onUseEncodedData(const void*, size_t) override { return true; } + SkData* onEncode(const SkPixmap& pmap) override { return nullptr; } +}; +} // namespace + +SkPixelSerializer* SkImageEncoder::CreatePixelSerializer() { + return new ImageEncoderPixelSerializer; +} + ///////////////////////////////////////////////////////////////////////// |