diff options
| author |  Hal Canary <halcanary@google.com> | 2016-11-22 14:21:38 -0700 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-22 21:23:51 +0000 |
| commit | a2b4bdce8cfd1a91407595a25683ecff982af22e (patch) | |
| tree | 2e8fad7d92be4e8a024db784747944d110a80123 /src/svg | |
| parent | 6b77f1cf09f6a3c47a42e29dc28087ac9f9cdb25 (diff) | |
Revert 248ff023 & 2cb6cb72
Revert "SkImageEncoder: simplify API"
This reverts commit 248ff02331d7f73ee4b6c5a7eabeae1080c16cd4.
Revert "Fix bug: can't convert nullptr -> bool"
This reverts commit 2cb6cb7218171b357bb5c934f032ba69c7b78401.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5151
NOTRY=true
Change-Id: I5f6414392d6545f74db0b5bb50608d04f053a8ec
Reviewed-on: https://skia-review.googlesource.com/5151
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/svg')
| -rw-r--r-- | src/svg/SkSVGDevice.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/svg/SkSVGDevice.cpp b/src/svg/SkSVGDevice.cpp index b9f1424e6e..ffdf034ab1 100644 --- a/src/svg/SkSVGDevice.cpp +++ b/src/svg/SkSVGDevice.cpp @@ -659,14 +659,10 @@ void SkSVGDevice::drawPath(const SkDraw& draw, const SkPath& path, const SkPaint } } -static sk_sp<SkData> encode(const SkBitmap& src) { - SkDynamicMemoryWStream buf; - return SkEncodeImage(&buf, src, SkEncodedImageFormat::kPNG, 80) ? buf.detachAsData() : nullptr; -} - void SkSVGDevice::drawBitmapCommon(const SkDraw& draw, const SkBitmap& bm, const SkPaint& paint) { - sk_sp<SkData> pngData = encode(bm); + sk_sp<const SkData> pngData( + SkImageEncoder::EncodeData(bm, SkImageEncoder::kPNG_Type, SkImageEncoder::kDefaultQuality)); if (!pngData) { return; } |