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 /src/codec/SkRawCodec.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 'src/codec/SkRawCodec.h')
| -rw-r--r-- | src/codec/SkRawCodec.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/codec/SkRawCodec.h b/src/codec/SkRawCodec.h index 51bb234b73..75654c7e10 100644 --- a/src/codec/SkRawCodec.h +++ b/src/codec/SkRawCodec.h @@ -37,8 +37,8 @@ protected: Result onGetPixels(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes, const Options&, SkPMColor*, int*, int*) override; - SkEncodedImageFormat onGetEncodedFormat() const override { - return SkEncodedImageFormat::kDNG; + SkEncodedFormat onGetEncodedFormat() const override { + return kDNG_SkEncodedFormat; } SkISize onGetScaledDimensions(float desiredScale) const override; |