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 /include/codec | |
| 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 'include/codec')
| -rw-r--r-- | include/codec/SkAndroidCodec.h | 4 | ||||
| -rw-r--r-- | include/codec/SkEncodedFormat.h | 36 |
2 files changed, 2 insertions, 38 deletions
diff --git a/include/codec/SkAndroidCodec.h b/include/codec/SkAndroidCodec.h index ee9d0f36d7..a4f46f939f 100644 --- a/include/codec/SkAndroidCodec.h +++ b/include/codec/SkAndroidCodec.h @@ -9,7 +9,7 @@ #define SkAndroidCodec_DEFINED #include "SkCodec.h" -#include "SkEncodedFormat.h" +#include "SkEncodedImageFormat.h" #include "SkStream.h" #include "SkTypes.h" @@ -51,7 +51,7 @@ public: /** * Format of the encoded data. */ - SkEncodedFormat getEncodedFormat() const { return (SkEncodedFormat)fCodec->getEncodedFormat(); } + SkEncodedImageFormat getEncodedFormat() const { return fCodec->getEncodedFormat(); } /** * @param requestedColorType Color type requested by the client diff --git a/include/codec/SkEncodedFormat.h b/include/codec/SkEncodedFormat.h deleted file mode 100644 index 485bff181a..0000000000 --- a/include/codec/SkEncodedFormat.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2015 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef SkEncodedFormat_DEFINED -#define SkEncodedFormat_DEFINED - -#include "SkEncodedImageFormat.h" -#include "SkTypes.h" - -#ifdef SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS - -enum SkEncodedFormat { - kBMP_SkEncodedFormat = (int)SkEncodedImageFormat::kBMP, - kGIF_SkEncodedFormat = (int)SkEncodedImageFormat::kGIF, - kICO_SkEncodedFormat = (int)SkEncodedImageFormat::kICO, - kJPEG_SkEncodedFormat = (int)SkEncodedImageFormat::kJPEG, - kPNG_SkEncodedFormat = (int)SkEncodedImageFormat::kPNG, - kWBMP_SkEncodedFormat = (int)SkEncodedImageFormat::kWBMP, - kWEBP_SkEncodedFormat = (int)SkEncodedImageFormat::kWEBP, - kPKM_SkEncodedFormat = (int)SkEncodedImageFormat::kPKM, - kKTX_SkEncodedFormat = (int)SkEncodedImageFormat::kKTX, - kASTC_SkEncodedFormat = (int)SkEncodedImageFormat::kASTC, - kDNG_SkEncodedFormat = (int)SkEncodedImageFormat::kDNG, -}; - -#else - -typedef SkEncodedImageFormat SkEncodedFormat; - -#endif // SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS - -#endif // SkEncodedFormat_DEFINED |