diff options
author | msarett <msarett@google.com> | 2016-08-15 13:52:31 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-08-15 13:52:31 -0700 |
commit | 93963ba84eed7aca6be3fa5c5445baae0a117ee3 (patch) | |
tree | bc0b9134ffb40c5ecd67d25d8ef2a4d07594a180 /gm/encode.cpp | |
parent | b42493626763e63426a117b29a74b75af874274b (diff) |
Revert of Fix WIC encoder to support kJPEG_Type (patchset #3 id:140001 of https://codereview.chromium.org/2245453002/ )
Reason for revert:
Broken Windows bot.
Original issue's description:
> Fix WIC encoder to support kJPEG_Type
>
> (1) Add support for kJPEG to WIC
> (2) Add encoding test.
> (3) Turn on WIC jpeg encoder on Windows and CG jpeg
> encoder on Mac.
>
> A follow-up may make Skia's encoders the default on all
> platforms. But, in order to do that, I think we need
> to write better encoding unit tests for CG and WIC.
>
> BUG=skia:3969
> BUG=skia:5632
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2245453002
>
> Committed: https://skia.googlesource.com/skia/+/b3a7ef1fc0adc24859d2498aee54d3ec2cbcac3a
TBR=mtklein@google.com,mtklein@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:3969
Review-Url: https://codereview.chromium.org/2246203002
Diffstat (limited to 'gm/encode.cpp')
-rw-r--r-- | gm/encode.cpp | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/gm/encode.cpp b/gm/encode.cpp deleted file mode 100644 index 3b6d43deba..0000000000 --- a/gm/encode.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2011 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ -#include "gm.h" -#include "SkCanvas.h" -#include "SkData.h" -#include "SkImageEncoder.h" -#include "Resources.h" - -namespace skiagm { - -class EncodeGM : public GM { -public: - EncodeGM() {} - -protected: - SkString onShortName() override { - return SkString("encode"); - } - - SkISize onISize() override { - return SkISize::Make(1024, 600); - } - - void onDraw(SkCanvas* canvas) override { - SkBitmap orig; - GetResourceAsBitmap("mandrill_512_q075.jpg", &orig); - sk_sp<SkData> pngData(SkImageEncoder::EncodeData(orig, SkImageEncoder::kPNG_Type, 100)); - sk_sp<SkData> jpegData(SkImageEncoder::EncodeData(orig, SkImageEncoder::kJPEG_Type, 100)); - - sk_sp<SkImage> pngImage = SkImage::MakeFromEncoded(pngData); - sk_sp<SkImage> jpegImage = SkImage::MakeFromEncoded(jpegData); - canvas->drawImage(pngImage.get(), 0.0f, 0.0f); - canvas->drawImage(jpegImage.get(), 512.0f, 0.0f); - - SkPaint paint; - sk_tool_utils::set_portable_typeface(&paint); - const char text[] = "Images should look more-or-less the same."; - canvas->drawText(text, sizeof(text) - 1, 450.0f, 550.0f, paint); - } - -private: - typedef GM INHERITED; -}; - -DEF_GM( return new EncodeGM; ) -} |