diff options
author | 2016-11-08 14:29:46 +0000 | |
---|---|---|
committer | 2016-11-08 14:29:59 +0000 | |
commit | 294c1c41ed6497da7454ca02bcef267d72fd37e0 (patch) | |
tree | f13b97525ae87f49fb496497b93352f6cfb50a6a /gm/image_shader.cpp | |
parent | eaa862569dc91d55fc79d057df6e69b139e46888 (diff) |
Revert "Delete SkImage::encode(Type)"
This reverts commit e48b4c550de60f3c2316f31125ee305c8df280ba.
Reason for revert: This method is used in Google3. See
https://test.corp.google.com/ui#id=OCL:138505330:BASE:138505351:1478611655214:39a02f0d
Original change's description:
> Delete SkImage::encode(Type)
>
> This doesn't appear to be used (fingers crossed).
>
> We're not ready to support color correct encodes (and tagging with
> color spaces) for all of the formats included in SkImageEncoder::Type.
>
> I think it's good to restrict this for now.
>
> BUG=skia:
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4535
>
> Change-Id: I73000f3d7bff1af153786d766531a2cbc8c5b77a
> Reviewed-on: https://skia-review.googlesource.com/4535
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Matt Sarett <msarett@google.com>
>
TBR=msarett@google.com,brianosman@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I6fb880f10dcba7837647e9b5cabbc8cc2b8366f6
Reviewed-on: https://skia-review.googlesource.com/4538
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'gm/image_shader.cpp')
-rw-r--r-- | gm/image_shader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gm/image_shader.cpp b/gm/image_shader.cpp index 0c37175508..924199e6e7 100644 --- a/gm/image_shader.cpp +++ b/gm/image_shader.cpp @@ -55,7 +55,7 @@ static sk_sp<SkImage> make_encode_gen(GrContext* ctx, SkPicture* pic, const SkIm if (!src) { return nullptr; } - sk_sp<SkData> encoded(src->encode()); + sk_sp<SkData> encoded(src->encode(SkImageEncoder::kPNG_Type, 100)); if (!encoded) { return nullptr; } |