diff options
| author |  reed <reed@google.com> | 2014-06-16 08:25:57 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-16 08:25:57 -0700 |
| commit | 885f2ea46e9c1dcd656287bb57a7f92548184896 (patch) | |
| tree | d1202256e315baecdec866a070440960fb32e1de | |
| parent | 9118413608e277b4500130bc2117400f9d9b0201 (diff) | |
fix legacy code path for SK_SUPPORT_LEGACY_IMAGEDECODER_CONFIG
BUG=skia:
R=scroggo@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/332223002
| -rw-r--r-- | include/core/SkImageDecoder.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/core/SkImageDecoder.h b/include/core/SkImageDecoder.h index ed17f0fbf8..c5c4c782c0 100644 --- a/include/core/SkImageDecoder.h +++ b/include/core/SkImageDecoder.h @@ -1,4 +1,3 @@ - /* * Copyright 2006 The Android Open Source Project * @@ -6,7 +5,6 @@ * found in the LICENSE file. */ - #ifndef SkImageDecoder_DEFINED #define SkImageDecoder_DEFINED @@ -355,13 +353,13 @@ public: } #ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CONFIG - bool decode(SkStream*, SkBitmap* bitmap, SkBitmap::Config pref, Mode mode) { + 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, SkBitmapConfig pref, Mode mode, + static bool DecodeFile(const char file[], SkBitmap* bitmap, SkBitmap::Config pref, Mode mode, Format* format = NULL) { return DecodeFile(file, bitmap, SkBitmapConfigToColorType(pref), mode, format); } |