diff options
| author |  reed <reed@google.com> | 2015-03-19 08:31:14 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-19 08:31:14 -0700 |
| commit | 3ef71e343bf075888fb50892350390b4dd47de24 (patch) | |
| tree | d4765ef144928600322cf21bdb41b37f05a55697 /include/codec | |
| parent | 647211f1243f2dc925588e75038be49cad7b5431 (diff) | |
guarded change to SkImageGenerator to make getInfo() const
BUG=skia:
Review URL: https://codereview.chromium.org/1017293002
Diffstat (limited to 'include/codec')
| -rw-r--r-- | include/codec/SkCodec.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h index 6d0557cb28..3550bb1831 100644 --- a/include/codec/SkCodec.h +++ b/include/codec/SkCodec.h @@ -58,10 +58,12 @@ protected: * initially returns a non-opaque answer, but completing the decode * reveals that the image is actually opaque. */ +#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO bool onGetInfo(SkImageInfo* info) SK_OVERRIDE { *info = fInfo; return true; } +#endif // Helper for subclasses. const SkImageInfo& getOriginalInfo() { return fInfo; } @@ -99,5 +101,7 @@ private: const SkImageInfo fInfo; SkAutoTDelete<SkStream> fStream; bool fNeedsRewind; + + typedef SkImageGenerator INHERITED; }; #endif // SkCodec_DEFINED |