diff options
| author |  msarett <msarett@google.com> | 2015-07-01 13:11:08 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-01 13:11:08 -0700 |
| commit | aa2a7de0ffaf8f864a7afc68bbd34ccb25876246 (patch) | |
| tree | b1f91995dd5988ce6188a55b723d68f3127bf9c5 /src/codec/SkJpegDecoderMgr.h | |
| parent | a760942b3579f7d863345b9d083abdc187266e08 (diff) | |
Revert of Switch SkJpegCode to libjpeg-turbo (patchset #28 id:710001 of https://codereview.chromium.org/1180983002/)
Reason for revert:
Broke iOS build.
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
>
> Committed: https://skia.googlesource.com/skia/+/f8bf9181d7b0463c8e371755cfbb9ece90b34fc5
>
> Committed: https://skia.googlesource.com/skia/+/e9e3ee33f30c14c31afd5fc3fe4dda7f15783c75
TBR=scroggo@google.com,djsollen@google.com,emmaleer@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1213093003
Diffstat (limited to 'src/codec/SkJpegDecoderMgr.h')
| -rw-r--r-- | src/codec/SkJpegDecoderMgr.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/codec/SkJpegDecoderMgr.h b/src/codec/SkJpegDecoderMgr.h index e65ef52c5a..0775dc07f0 100644 --- a/src/codec/SkJpegDecoderMgr.h +++ b/src/codec/SkJpegDecoderMgr.h @@ -18,7 +18,6 @@ #include <stdio.h> extern "C" { - #include "jpeglibmangler.h" #include "jpeglib.h" } |