diff options
author | 2014-07-07 15:54:20 -0700 | |
---|---|---|
committer | 2014-07-07 15:54:20 -0700 | |
commit | beaf62da360acf16a92ccc12e37e9e053becaeee (patch) | |
tree | 97a361238dddd1d3bb9c7ae57cd2e39555fc79a8 /include | |
parent | 6f157d914e3bf1af677615660ac837a98060a8ac (diff) |
remove unneeded flag for android
BUG=skia:
R=scroggo@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/372133003
Diffstat (limited to 'include')
-rw-r--r-- | include/core/SkImageDecoder.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/include/core/SkImageDecoder.h b/include/core/SkImageDecoder.h index 9ab32d7ce1..b73c4ff261 100644 --- a/include/core/SkImageDecoder.h +++ b/include/core/SkImageDecoder.h @@ -354,27 +354,6 @@ public: return DecodeStream(stream, bitmap, kUnknown_SkColorType, kDecodePixels_Mode, NULL); } -#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CONFIG - bool decode(SkStream* stream, SkBitmap* bitmap, SkBitmap::Config pref, Mode mode) { - return this->decode(stream, bitmap, SkBitmapConfigToColorType(pref), mode); - } - bool decodeSubset(SkBitmap* bm, const SkIRect& subset, SkBitmap::Config pref) { - return this->decodeSubset(bm, subset, SkBitmapConfigToColorType(pref)); - } - static bool DecodeFile(const char file[], SkBitmap* bitmap, SkBitmap::Config pref, Mode mode, - Format* format = NULL) { - return DecodeFile(file, bitmap, SkBitmapConfigToColorType(pref), mode, format); - } - static bool DecodeMemory(const void* buffer, size_t size, SkBitmap* bitmap, - SkBitmap::Config pref, Mode mode, Format* format = NULL) { - return DecodeMemory(buffer, size, bitmap, SkBitmapConfigToColorType(pref), mode, format); - } - static bool DecodeStream(SkStreamRewindable* stream, SkBitmap* bitmap, SkBitmap::Config pref, - Mode mode, Format* format = NULL) { - return DecodeStream(stream, bitmap, SkBitmapConfigToColorType(pref), mode, format); - } -#endif - protected: // must be overridden in subclasses. This guy is called by decode(...) virtual bool onDecode(SkStream*, SkBitmap* bitmap, Mode) = 0; |