diff options
| author |  reed <reed@google.com> | 2014-06-11 10:33:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-11 10:33:13 -0700 |
| commit | 5926b86b90c68bffefbdc8639e41b5bc9102cec6 (patch) | |
| tree | a20f97bc8a3c5f8224071b23c0b1112f669f05bf /src/images/SkImageDecoder_libico.cpp | |
| parent | d58a0ba9cff9fcefe5047e88ccb4a6e76c591c40 (diff) | |
hide SkImageDecoder::Chooser
BUG=skia:
R=scroggo@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/331433003
Diffstat (limited to 'src/images/SkImageDecoder_libico.cpp')
| -rw-r--r-- | src/images/SkImageDecoder_libico.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/images/SkImageDecoder_libico.cpp b/src/images/SkImageDecoder_libico.cpp index c6dd6f0836..e6ae16f0bd 100644 --- a/src/images/SkImageDecoder_libico.cpp +++ b/src/images/SkImageDecoder_libico.cpp @@ -94,6 +94,7 @@ bool SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) if (length < (size_t)(6 + count*16)) return false; +#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER int choice; Chooser* chooser = this->getChooser(); //FIXME:if no chooser, consider providing the largest color image @@ -138,6 +139,9 @@ bool SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) //you never know what the chooser is going to supply if (choice >= count || choice < 0) return false; +#else + const int choice = 0; // TODO: fold this value into the expressions below +#endif //skip ahead to the correct header //commented out lines are not used, but if i switch to other read method, need to know how many to skip |