diff options
| author |  msarett <msarett@google.com> | 2015-07-01 12:36:18 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-01 12:36:18 -0700 |
| commit | e9e3ee33f30c14c31afd5fc3fe4dda7f15783c75 (patch) | |
| tree | f84aeb686a4ebee25deb740208c187a3a541001e /src/codec/SkCodec.cpp | |
| parent | 928e16565f3e69cd6661e9ad300ac17e3f33c0c8 (diff) | |
Add libjpeg-turbo library (depends on yasm)
Mangle external function names to avoid conflict with libjpeg
Take advantage of direct color conversion (RGBA, BGRA, 565)
Prepare to use jpeg_skip_scanlines (when it is upstreamed)
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d
Committed: https://skia.googlesource.com/skia/+/f8bf9181d7b0463c8e371755cfbb9ece90b34fc5
Review URL: https://codereview.chromium.org/1180983002
Diffstat (limited to 'src/codec/SkCodec.cpp')
| -rw-r--r-- | src/codec/SkCodec.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/codec/SkCodec.cpp b/src/codec/SkCodec.cpp index 93db0e58ee..c24bb548ba 100644 --- a/src/codec/SkCodec.cpp +++ b/src/codec/SkCodec.cpp @@ -13,7 +13,9 @@ #include "SkCodec_libpng.h" #include "SkCodec_wbmp.h" #include "SkCodecPriv.h" +#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK #include "SkJpegCodec.h" +#endif #include "SkStream.h" #include "SkWebpCodec.h" @@ -24,7 +26,9 @@ struct DecoderProc { static const DecoderProc gDecoderProcs[] = { { SkPngCodec::IsPng, SkPngCodec::NewFromStream }, +#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK { SkJpegCodec::IsJpeg, SkJpegCodec::NewFromStream }, +#endif { SkWebpCodec::IsWebp, SkWebpCodec::NewFromStream }, { SkGifCodec::IsGif, SkGifCodec::NewFromStream }, { SkIcoCodec::IsIco, SkIcoCodec::NewFromStream }, |