diff options
| author |  Hal Canary <halcanary@google.com> | 2016-11-30 17:07:59 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-30 22:48:56 +0000 |
| commit | 1fcc40474f1ad1f522d0a61086e25a71ca0a6881 (patch) | |
| tree | 298d1a0b66d5d1899133c6252c877931661c5e95 /third_party/ktx/ktx.h | |
| parent | 3a7492fc04d83ed2729d2ba226d5277459536b74 (diff) | |
SkEncodeImage: no more link-time registration
Also, no more SkImageEncoder class.
SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS now only guards some
old API shims.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5006
Change-Id: I3797f584f3e8e12ade10d31e8733163453725f40
Reviewed-on: https://skia-review.googlesource.com/5006
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'third_party/ktx/ktx.h')
| -rw-r--r-- | third_party/ktx/ktx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/ktx/ktx.h b/third_party/ktx/ktx.h index f06613d71b..6772f86057 100644 --- a/third_party/ktx/ktx.h +++ b/third_party/ktx/ktx.h @@ -16,7 +16,7 @@ #include "SkString.h" #include "SkRefCnt.h" -class SkBitmap; +class SkPixmap; class SkStreamRewindable; class SkWStream; @@ -65,7 +65,7 @@ public: static bool WriteETC1ToKTX(SkWStream* stream, const uint8_t *etc1Data, uint32_t width, uint32_t height); - static bool WriteBitmapToKTX(SkWStream* stream, const SkBitmap& bitmap); + static bool WritePixmapToKTX(SkWStream* stream, const SkPixmap& bitmap); private: // The blob holding the file data. |