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 /tools/get_images_from_skps.cpp | |
| 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 'tools/get_images_from_skps.cpp')
| -rw-r--r-- | tools/get_images_from_skps.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/get_images_from_skps.cpp b/tools/get_images_from_skps.cpp index d3a2343b88..6cd35122ad 100644 --- a/tools/get_images_from_skps.cpp +++ b/tools/get_images_from_skps.cpp @@ -65,14 +65,14 @@ struct Sniffer : public SkPixelSerializer { } SkString ext; switch (codec->getEncodedFormat()) { - case SkEncodedImageFormat::kBMP: ext = "bmp"; break; - case SkEncodedImageFormat::kGIF: ext = "gif"; break; - case SkEncodedImageFormat::kICO: ext = "ico"; break; - case SkEncodedImageFormat::kJPEG: ext = "jpg"; break; - case SkEncodedImageFormat::kPNG: ext = "png"; break; - case SkEncodedImageFormat::kDNG: ext = "dng"; break; - case SkEncodedImageFormat::kWBMP: ext = "wbmp"; break; - case SkEncodedImageFormat::kWEBP: ext = "webp"; break; + case SkEncodedFormat::kBMP_SkEncodedFormat: ext = "bmp"; break; + case SkEncodedFormat::kGIF_SkEncodedFormat: ext = "gif"; break; + case SkEncodedFormat::kICO_SkEncodedFormat: ext = "ico"; break; + case SkEncodedFormat::kJPEG_SkEncodedFormat: ext = "jpg"; break; + case SkEncodedFormat::kPNG_SkEncodedFormat: ext = "png"; break; + case SkEncodedFormat::kDNG_SkEncodedFormat: ext = "dng"; break; + case SkEncodedFormat::kWBMP_SkEncodedFormat: ext = "wbmp"; break; + case SkEncodedFormat::kWEBP_SkEncodedFormat: ext = "webp"; break; default: // This should be unreachable because we cannot create a codec if we do not know // the image type. |