diff options
| author |  mtklein <mtklein@google.com> | 2015-06-24 15:14:48 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-24 15:14:48 -0700 |
| commit | c0bdecb920a957665f66adefd3f3fb865e32e5d0 (patch) | |
| tree | 055fac27d0c76067ec1f2271dd9a5879450c0b18 /src/codec/SkJpegUtility_codec.cpp | |
| parent | b60c3f8291529303299262dba19b1a896060bd2d (diff) | |
Revert of Switch SkJpegCode to libjpeg-turbo (patchset #11 id:540001 of https://codereview.chromium.org/1180983002/)
Reason for revert:
https://uberchromegw.corp.google.com/i/client.skia.compile/builders/Build-Ubuntu-GCC-MipsDSP2-Debug-Android/builds/1136/steps/build%20most/logs/stdio
Original issue's description:
> 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
TBR=scroggo@google.com,djsollen@google.com,emmaleer@google.com,msarett@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1199253006
Diffstat (limited to 'src/codec/SkJpegUtility_codec.cpp')
| -rw-r--r-- | src/codec/SkJpegUtility_codec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/codec/SkJpegUtility_codec.cpp b/src/codec/SkJpegUtility_codec.cpp index 418c899cbb..75a562a004 100644 --- a/src/codec/SkJpegUtility_codec.cpp +++ b/src/codec/SkJpegUtility_codec.cpp @@ -73,7 +73,7 @@ skjpeg_source_mgr::skjpeg_source_mgr(SkStream* stream) init_source = sk_init_source; fill_input_buffer = sk_fill_input_buffer; skip_input_data = sk_skip_input_data; - resync_to_restart = turbo_jpeg_resync_to_restart; + resync_to_restart = jpeg_resync_to_restart; term_source = sk_term_source; } |