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 /src/images | |
| 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 'src/images')
| -rw-r--r-- | src/images/SkForceLinking.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/images/SkForceLinking.cpp b/src/images/SkForceLinking.cpp index 2afe7192a9..e97106fdf8 100644 --- a/src/images/SkForceLinking.cpp +++ b/src/images/SkForceLinking.cpp @@ -14,8 +14,7 @@ int SkForceLinking(bool doNotPassTrue) { if (doNotPassTrue) { SkASSERT(false); -#if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_IOS) && \ - defined(SK_HAS_JPEG_LIBRARY) +#if defined(SK_HAS_JPEG_LIBRARY) CreateJPEGImageEncoder(); #endif #if defined(SK_HAS_WEBP_LIBRARY) |