diff options
author | Matt Sarett <msarett@google.com> | 2017-05-05 14:02:13 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-05 18:56:46 +0000 |
commit | 04c3731de81d9d204f41624dca8af071873b7a67 (patch) | |
tree | 1ee20b32e4c2b8bf75f78bd9f86c5604022f31d3 /gm/encode-srgb.cpp | |
parent | 76fcb10f47cf992255f3a53af3a4cf407052e9e6 (diff) |
SkEncoder: Rename files, change webp API, for consistency
Bug: skia:
Change-Id: I3dd6feb3d5661dcad3d2388b4d01fa9d3bbb15bb
Reviewed-on: https://skia-review.googlesource.com/15631
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'gm/encode-srgb.cpp')
-rw-r--r-- | gm/encode-srgb.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gm/encode-srgb.cpp b/gm/encode-srgb.cpp index bf9ef821ab..3369afe4dc 100644 --- a/gm/encode-srgb.cpp +++ b/gm/encode-srgb.cpp @@ -18,6 +18,7 @@ #include "SkPngEncoder.h" #include "SkPM4f.h" #include "SkSRGB.h" +#include "SkWebpEncoder.h" namespace skiagm { @@ -119,10 +120,10 @@ static sk_sp<SkData> encode_data(const SkBitmap& bitmap, SkEncodedImageFormat fo SkDynamicMemoryWStream buf; SkPngEncoder::Options pngOptions; - SkEncodeOptions options; + SkWebpEncoder::Options webpOptions; if (bitmap.colorSpace()) { pngOptions.fUnpremulBehavior = SkTransferFunctionBehavior::kRespect; - options.fUnpremulBehavior = SkTransferFunctionBehavior::kRespect; + webpOptions.fUnpremulBehavior = SkTransferFunctionBehavior::kRespect; } switch (format) { @@ -130,7 +131,7 @@ static sk_sp<SkData> encode_data(const SkBitmap& bitmap, SkEncodedImageFormat fo SkAssertResult(SkPngEncoder::Encode(&buf, src, pngOptions)); break; case SkEncodedImageFormat::kWEBP: - SkAssertResult(SkEncodeImageAsWEBP(&buf, src, options)); + SkAssertResult(SkWebpEncoder::Encode(&buf, src, webpOptions)); break; case SkEncodedImageFormat::kJPEG: SkAssertResult(SkJpegEncoder::Encode(&buf, src, SkJpegEncoder::Options())); |