diff options
author | Hal Canary <halcanary@google.com> | 2016-11-22 14:21:38 -0700 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-22 21:23:51 +0000 |
commit | a2b4bdce8cfd1a91407595a25683ecff982af22e (patch) | |
tree | 2e8fad7d92be4e8a024db784747944d110a80123 /include/core/SkEncodedImageFormat.h | |
parent | 6b77f1cf09f6a3c47a42e29dc28087ac9f9cdb25 (diff) |
Revert 248ff023 & 2cb6cb72
Revert "SkImageEncoder: simplify API"
This reverts commit 248ff02331d7f73ee4b6c5a7eabeae1080c16cd4.
Revert "Fix bug: can't convert nullptr -> bool"
This reverts commit 2cb6cb7218171b357bb5c934f032ba69c7b78401.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5151
NOTRY=true
Change-Id: I5f6414392d6545f74db0b5bb50608d04f053a8ec
Reviewed-on: https://skia-review.googlesource.com/5151
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Diffstat (limited to 'include/core/SkEncodedImageFormat.h')
-rw-r--r-- | include/core/SkEncodedImageFormat.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/include/core/SkEncodedImageFormat.h b/include/core/SkEncodedImageFormat.h deleted file mode 100644 index 8f79236689..0000000000 --- a/include/core/SkEncodedImageFormat.h +++ /dev/null @@ -1,33 +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 SkEncodedImageFormat_DEFINED -#define SkEncodedImageFormat_DEFINED - -#include <stdint.h> - -/** - * Enum describing format of encoded data. - */ -enum class SkEncodedImageFormat { -#ifdef GOOGLE3 - kUnknown, -#endif - kBMP, - kGIF, - kICO, - kJPEG, - kPNG, - kWBMP, - kWEBP, - kPKM, - kKTX, - kASTC, - kDNG, -}; - -#endif // SkEncodedImageFormat_DEFINED |