diff options
| author |  msarett <msarett@google.com> | 2015-08-11 13:32:54 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-11 13:32:54 -0700 |
| commit | fcaaadee711a93d601ccc9f0b47d744e22c35205 (patch) | |
| tree | c66a9c7142ed524c6596155d301312236987eb00 /src/codec/SkJpegDecoderMgr.cpp | |
| parent | 7cdfa8a3f463fb959264df75781f94e3a332b45b (diff) | |
Switching Skia to chromium's libjpeg-turbo
Compile SkJpegCodec and SkImageDecoder_libjpeg with
chromium's libjpeg-turbo. SkImageDecoder_libjpeg still uses
libjpeg on Android and the Android framework. SkJpegCodec is
still not compiled on the Android framework.
BUG=skia:
Review URL: https://codereview.chromium.org/1275773004
Diffstat (limited to 'src/codec/SkJpegDecoderMgr.cpp')
| -rw-r--r-- | src/codec/SkJpegDecoderMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/codec/SkJpegDecoderMgr.cpp b/src/codec/SkJpegDecoderMgr.cpp index b5a12297a0..769e4c1645 100644 --- a/src/codec/SkJpegDecoderMgr.cpp +++ b/src/codec/SkJpegDecoderMgr.cpp @@ -51,7 +51,7 @@ JpegDecoderMgr::JpegDecoderMgr(SkStream* stream) , fInit(false) { // Error manager must be set before any calls to libjeg in order to handle failures - fDInfo.err = turbo_jpeg_std_error(&fErrorMgr); + fDInfo.err = chromium_jpeg_std_error(&fErrorMgr); fErrorMgr.error_exit = skjpeg_err_exit; } |