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/ports/SkImageEncoder_WIC.cpp | |
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/ports/SkImageEncoder_WIC.cpp')
-rw-r--r-- | src/ports/SkImageEncoder_WIC.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ports/SkImageEncoder_WIC.cpp b/src/ports/SkImageEncoder_WIC.cpp index 035359e792..6524526bdb 100644 --- a/src/ports/SkImageEncoder_WIC.cpp +++ b/src/ports/SkImageEncoder_WIC.cpp @@ -31,7 +31,7 @@ #include <wincodec.h> #include "SkAutoCoInitialize.h" #include "SkBitmap.h" -#include "SkImageEncoderPriv.h" +#include "SkImageEncoder.h" #include "SkIStream.h" #include "SkStream.h" #include "SkTScopedComPtr.h" @@ -48,13 +48,13 @@ class SkImageEncoder_WIC : public SkImageEncoder { public: - SkImageEncoder_WIC(SkEncodedImageFormat t) : fType(t) {} + SkImageEncoder_WIC(Type t) : fType(t) {} protected: virtual bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality); private: - SkEncodedImageFormat fType; + Type fType; }; bool SkImageEncoder_WIC::onEncode(SkWStream* stream @@ -63,10 +63,10 @@ bool SkImageEncoder_WIC::onEncode(SkWStream* stream { GUID type; switch (fType) { - case SkEncodedImageFormat::kJPEG: + case kJPEG_Type: type = GUID_ContainerFormatJpeg; break; - case SkEncodedImageFormat::kPNG: + case kPNG_Type: type = GUID_ContainerFormatPng; break; default: @@ -97,7 +97,7 @@ bool SkImageEncoder_WIC::onEncode(SkWStream* stream size_t rowBytes = bitmap.rowBytes(); SkAutoMalloc pixelStorage; WICPixelFormatGUID formatDesired = GUID_WICPixelFormat32bppBGRA; - if (SkEncodedImageFormat::kJPEG == fType) { + if (kJPEG_Type == fType) { formatDesired = GUID_WICPixelFormat24bppBGR; rowBytes = SkAlign4(bitmap.width() * 3); pixelStorage.reset(rowBytes * bitmap.height()); @@ -219,10 +219,10 @@ bool SkImageEncoder_WIC::onEncode(SkWStream* stream /////////////////////////////////////////////////////////////////////////////// #ifdef SK_USE_WIC_ENCODER -static SkImageEncoder* sk_imageencoder_wic_factory(SkEncodedImageFormat t) { +static SkImageEncoder* sk_imageencoder_wic_factory(SkImageEncoder::Type t) { switch (t) { - case SkEncodedImageFormat::kPNG: - case SkEncodedImageFormat::kJPEG: + case SkImageEncoder::kPNG_Type: + case SkImageEncoder::kJPEG_Type: break; default: return nullptr; @@ -234,7 +234,7 @@ static SkImageEncoder_EncodeReg gEReg(sk_imageencoder_wic_factory); #endif SkImageEncoder* CreateImageEncoder_WIC(SkImageEncoder::Type type) { - return new SkImageEncoder_WIC((SkEncodedImageFormat)type); + return new SkImageEncoder_WIC(type); } #endif // defined(SK_BUILD_FOR_WIN32) |