diff options
| author |  Hal Canary <halcanary@google.com> | 2016-11-22 09:03:03 -0700 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-22 18:25:55 +0000 |
| commit | 248ff02331d7f73ee4b6c5a7eabeae1080c16cd4 (patch) | |
| tree | a55e2402ef1494e2fb719bc046f1f97c8e75da53 /samplecode | |
| parent | 46e66a2bf51546a7c3b08625769899b9ead56ec6 (diff) | |
SkImageEncoder: simplify API
- Hide SkImageEncoder class in private header.
- SkImageEncoder::Type becomes SkEncodedImageFormat
- SkEncodedFormat becomes SkEncodedImageFormat
- SkImageEncoder static functions replaced with
single function EncodeImage()
- utility wrappers for EncodeImage() are in
sk_tool_utils.h
TODO: remove link-time registration mechanism.
TODO: clean up clients use of API and flip the flag.
TODO: implement EncodeImage() in chromeium/skia/ext
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4909
Change-Id: Ib48b31fdc05cf23cda7f56ebfd67c841c149ce70
Reviewed-on: https://skia-review.googlesource.com/4909
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'samplecode')
| -rw-r--r-- | samplecode/SampleApp.cpp | 4 | ||||
| -rw-r--r-- | samplecode/SampleSlides.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 8a5927fcc3..a8c2e0b113 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -1407,8 +1407,8 @@ void SampleWindow::afterChildren(SkCanvas* orig) { static int gSampleGrabCounter; SkString name; name.printf("sample_grab_%d.png", gSampleGrabCounter++); - SkImageEncoder::EncodeFile(name.c_str(), bmp, - SkImageEncoder::kPNG_Type, 100); + sk_tool_utils::EncodeImageToFile(name.c_str(), bmp, + SkEncodedImageFormat::kPNG, 100); } this->inval(nullptr); return; diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp index 43221d41a7..c1c49b4ab1 100644 --- a/samplecode/SampleSlides.cpp +++ b/samplecode/SampleSlides.cpp @@ -15,6 +15,8 @@ #include "SkPaint.h" #include "SkView.h" +#include "sk_tool_utils.h" + #define BG_COLOR 0xFFDDDDDD typedef void (*SlideProc)(SkCanvas*); @@ -681,7 +683,7 @@ public: canvas.restore(); SkString str; str.printf("/skimages/slide_" SK_SIZE_T_SPECIFIER ".png", i); - SkImageEncoder::EncodeFile(str.c_str(), bm, SkImageEncoder::kPNG_Type, 100); + sk_tool_utils::EncodeImageToFile(str.c_str(), bm, SkEncodedImageFormat::kPNG, 100); } this->setBGColor(BG_COLOR); } |