From aa2a7de0ffaf8f864a7afc68bbd34ccb25876246 Mon Sep 17 00:00:00 2001 From: msarett Date: Wed, 1 Jul 2015 13:11:08 -0700 Subject: 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 --- src/codec/SkJpegDecoderMgr.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/codec/SkJpegDecoderMgr.h') 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 extern "C" { - #include "jpeglibmangler.h" #include "jpeglib.h" } -- cgit v1.2.3