diff options
| author |  Hal Canary <halcanary@google.com> | 2017-01-10 12:12:45 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-10 18:01:39 +0000 |
| commit | dc11f9810c7a056b95fd7408216323a6a1eab246 (patch) | |
| tree | 91842a34f33ef38ee97f3189783de4154a484ca9 /include/core | |
| parent | 356f7c2600ef54237fb8678cf63d5953f065b7da (diff) | |
Clean up unused SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS code
Approval from https://review.skia.org/5006
TBR=reed@google.com
Change-Id: Ie630a3f45a830c8c2dc80a30e759d9481b8d60a5
Reviewed-on: https://skia-review.googlesource.com/5775
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkImage.h | 5 | ||||
| -rw-r--r-- | include/core/SkImageEncoder.h | 20 |
2 files changed, 0 insertions, 25 deletions
diff --git a/include/core/SkImage.h b/include/core/SkImage.h index 9ecfb272a6..076da331a2 100644 --- a/include/core/SkImage.h +++ b/include/core/SkImage.h @@ -280,11 +280,6 @@ public: * even if the image returns a data from refEncoded(). That data will be ignored. */ SkData* encode(SkEncodedImageFormat, int quality) const; -#ifdef SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS - SkData* encode(SkImageEncoder::Type t, int quality) const { - return this->encode((SkEncodedImageFormat)t, quality); - } -#endif /** * Encode the image and return the result as a caller-managed SkData. This will diff --git a/include/core/SkImageEncoder.h b/include/core/SkImageEncoder.h index 17d0603531..f2b0620161 100644 --- a/include/core/SkImageEncoder.h +++ b/include/core/SkImageEncoder.h @@ -44,31 +44,11 @@ inline bool SkEncodeImage(SkWStream* dst, const SkBitmap& src, SkEncodedImageFor class SkImageEncoder { public: enum Type { -#ifdef GOOGLE3 - kUnknown_Type = (int)SkEncodedImageFormat::kUnknown, -#endif - kBMP_Type = (int)SkEncodedImageFormat::kBMP, - kGIF_Type = (int)SkEncodedImageFormat::kGIF, - kICO_Type = (int)SkEncodedImageFormat::kICO, - kJPEG_Type = (int)SkEncodedImageFormat::kJPEG, kPNG_Type = (int)SkEncodedImageFormat::kPNG, - kWBMP_Type = (int)SkEncodedImageFormat::kWBMP, - kWEBP_Type = (int)SkEncodedImageFormat::kWEBP, - kKTX_Type = (int)SkEncodedImageFormat::kKTX, }; - static SkData* EncodeData(const SkBitmap& src, Type t, int quality) { - SkDynamicMemoryWStream buf; - return SkEncodeImage(&buf, src, (SkEncodedImageFormat)t, quality) - ? buf.detachAsData().release() : nullptr; - } - static bool EncodeFile(const char path[], const SkBitmap& src, Type t, int quality) { - SkFILEWStream file(path); - return SkEncodeImage(&file, src, (SkEncodedImageFormat)t, quality); - } static bool EncodeStream(SkWStream* dst, const SkBitmap& bm, Type t, int quality) { return SkEncodeImage(dst, bm, (SkEncodedImageFormat)t, quality); } }; #endif // SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS - #endif // SkImageEncoder_DEFINED |