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_CG.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_CG.cpp')
| -rw-r--r-- | src/ports/SkImageEncoder_CG.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/ports/SkImageEncoder_CG.cpp b/src/ports/SkImageEncoder_CG.cpp index 0c3d22d0f6..789285626c 100644 --- a/src/ports/SkImageEncoder_CG.cpp +++ b/src/ports/SkImageEncoder_CG.cpp @@ -12,7 +12,7 @@ #include "SkCGUtils.h" #include "SkColorPriv.h" #include "SkData.h" -#include "SkImageEncoderPriv.h" +#include "SkImageEncoder.h" #include "SkStream.h" #include "SkStreamPriv.h" #include "SkTemplates.h" @@ -59,13 +59,13 @@ static CGImageDestinationRef SkStreamToImageDestination(SkWStream* stream, class SkImageEncoder_CG : public SkImageEncoder { public: - SkImageEncoder_CG(SkEncodedImageFormat t) : fType(t) {} + SkImageEncoder_CG(Type t) : fType(t) {} protected: virtual bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality); private: - SkEncodedImageFormat fType; + Type fType; }; /* Encode bitmaps via CGImageDestination. We setup a DataConsumer which writes @@ -80,19 +80,19 @@ bool SkImageEncoder_CG::onEncode(SkWStream* stream, const SkBitmap& bm, CFStringRef type; switch (fType) { - case SkEncodedImageFormat::kICO: + case kICO_Type: type = kUTTypeICO; break; - case SkEncodedImageFormat::kBMP: + case kBMP_Type: type = kUTTypeBMP; break; - case SkEncodedImageFormat::kGIF: + case kGIF_Type: type = kUTTypeGIF; break; - case SkEncodedImageFormat::kJPEG: + case kJPEG_Type: type = kUTTypeJPEG; break; - case SkEncodedImageFormat::kPNG: + case kPNG_Type: // PNG encoding an ARGB_4444 bitmap gives the following errors in GM: // <Error>: CGImageDestinationAddImage image could not be converted to destination // format. @@ -127,13 +127,13 @@ bool SkImageEncoder_CG::onEncode(SkWStream* stream, const SkBitmap& bm, /////////////////////////////////////////////////////////////////////////////// #ifdef SK_USE_CG_ENCODER -static SkImageEncoder* sk_imageencoder_cg_factory(SkEncodedImageFormat t) { +static SkImageEncoder* sk_imageencoder_cg_factory(SkImageEncoder::Type t) { switch (t) { - case SkEncodedImageFormat::kICO: - case SkEncodedImageFormat::kBMP: - case SkEncodedImageFormat::kGIF: - case SkEncodedImageFormat::kJPEG: - case SkEncodedImageFormat::kPNG: + case SkImageEncoder::kICO_Type: + case SkImageEncoder::kBMP_Type: + case SkImageEncoder::kGIF_Type: + case SkImageEncoder::kJPEG_Type: + case SkImageEncoder::kPNG_Type: break; default: return nullptr; @@ -145,7 +145,7 @@ static SkImageEncoder_EncodeReg gEReg(sk_imageencoder_cg_factory); #endif SkImageEncoder* CreateImageEncoder_CG(SkImageEncoder::Type type) { - return new SkImageEncoder_CG((SkEncodedImageFormat)type); + return new SkImageEncoder_CG(type); } #endif//defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) |