diff options
| author |  msarett <msarett@google.com> | 2016-08-15 13:19:20 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-15 13:19:20 -0700 |
| commit | b3a7ef1fc0adc24859d2498aee54d3ec2cbcac3a (patch) | |
| tree | 362691b40c13de39dd4d0e6c60845b3e43cc7ea4 /src/images | |
| parent | 8bbbb696cdc1351f615bc52ee119cfa384f77f30 (diff) | |
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
Review-Url: https://codereview.chromium.org/2245453002
Diffstat (limited to 'src/images')
| -rw-r--r-- | src/images/SkForceLinking.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/images/SkForceLinking.cpp b/src/images/SkForceLinking.cpp index e97106fdf8..2afe7192a9 100644 --- a/src/images/SkForceLinking.cpp +++ b/src/images/SkForceLinking.cpp @@ -14,7 +14,8 @@ int SkForceLinking(bool doNotPassTrue) { if (doNotPassTrue) { SkASSERT(false); -#if defined(SK_HAS_JPEG_LIBRARY) +#if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_IOS) && \ + defined(SK_HAS_JPEG_LIBRARY) CreateJPEGImageEncoder(); #endif #if defined(SK_HAS_WEBP_LIBRARY) |