diff options
| author |  krajcevski <krajcevski@google.com> | 2014-08-07 11:18:09 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-07 11:18:09 -0700 |
| commit | 2fc05823fed4b9649338f3029cd1ba05ef49a02f (patch) | |
| tree | d0faea7d24de0e9a9a3dbc1be94ff80742c25238 /include | |
| parent | b99c4a7bf2ff8d34b6adc053071a8bafdc868c73 (diff) | |
- Add astcbitmap to gm slides
- Add additional ASTC formats
- Add astc image decoder files
R=reed@google.com, robertphillips@google.com, halcanary@google.com
Author: krajcevski@google.com
Review URL: https://codereview.chromium.org/444093002
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkImageDecoder.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/core/SkImageDecoder.h b/include/core/SkImageDecoder.h index b258afedce..2b9108025e 100644 --- a/include/core/SkImageDecoder.h +++ b/include/core/SkImageDecoder.h @@ -37,6 +37,7 @@ public: kWEBP_Format, kPKM_Format, kKTX_Format, + kASTC_Format, kLastKnownFormat = kKTX_Format, }; @@ -525,6 +526,7 @@ DECLARE_DECODER_CREATOR(WBMPImageDecoder); DECLARE_DECODER_CREATOR(WEBPImageDecoder); DECLARE_DECODER_CREATOR(PKMImageDecoder); DECLARE_DECODER_CREATOR(KTXImageDecoder); +DECLARE_DECODER_CREATOR(ASTCImageDecoder); // Typedefs to make registering decoder and formatter callbacks easier. // These have to be defined outside SkImageDecoder. :( |