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 /tests/CodecTest.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 'tests/CodecTest.cpp')
| -rw-r--r-- | tests/CodecTest.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index 43035213d9..ffaeb2b61c 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -26,6 +26,7 @@ #include "SkRandom.h" #include "SkStream.h" #include "SkStreamPriv.h" +#include "SkWebpEncoder.h" #include "Test.h" #include "png.h" @@ -1529,9 +1530,9 @@ static void encode_format(SkDynamicMemoryWStream* stream, const SkPixmap& pixmap SkTransferFunctionBehavior unpremulBehavior, SkEncodedImageFormat format) { SkPngEncoder::Options pngOptions; - SkEncodeOptions options; + SkWebpEncoder::Options webpOptions; pngOptions.fUnpremulBehavior = unpremulBehavior; - options.fUnpremulBehavior = unpremulBehavior; + webpOptions.fUnpremulBehavior = unpremulBehavior; switch (format) { case SkEncodedImageFormat::kPNG: SkPngEncoder::Encode(stream, pixmap, pngOptions); @@ -1540,7 +1541,7 @@ static void encode_format(SkDynamicMemoryWStream* stream, const SkPixmap& pixmap SkJpegEncoder::Encode(stream, pixmap, SkJpegEncoder::Options()); break; case SkEncodedImageFormat::kWEBP: - SkEncodeImageAsWEBP(stream, pixmap, options); + SkWebpEncoder::Encode(stream, pixmap, webpOptions); break; default: SkASSERT(false); |